Benchmark submodule checkout after libs update

Otherwise on Darwin make update will switch it back to master.
Rename bundle-linux.sh and bundle-windows.bat → bundle.{sh,bat}
2018-08-17 12:29:07 +02:00 · 2018-08-17 11:52:25 +02:00 · 2018-08-17 11:50:52 +02:00 · 2018-08-17 11:13:40 +02:00
3 changed files with 6 additions and 1 deletions
--- a/benchmark/version.py
+++ b/benchmark/version.py
@@ -10,7 +10,7 @@ import functools
 #
 # It is sent to the MyData server in the 'User Agent' HTTP header, and
 # it's also included in error reports.
-version = '1.0b2.dev0'
+version = '1.0b2'


@functools.lru_cache(maxsize=1)
--- a/bundle/bundle-windows.bat
+++ b/bundle/bundle-windows.bat
--- a/bundle/bundle-linux.sh
+++ b/bundle/bundle-linux.sh
@@ -296,6 +296,11 @@ elif [[ "${KERNEL_NAME}" == "MINGW"* ]]; then
  EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -H${SOURCE_DIRECTORY} -B${BUILD_DIRECTORY}"
 fi

+# The release/scripts/benchmark submodule should be on the correct branch (usually release-xxx)
+BM_BRANCH=$(${GIT} -C ${SCRIPTPATH} rev-parse --abbrev-ref HEAD)
+echo "Forcing release/scripts/benchmark to $BM_BRANCH branch..."
+${GIT} -C ${SOURCE_DIRECTORY}/release/scripts/benchmark checkout ${BM_BRANCH}
+
 mkdir -p "${BUILD_DIRECTORY}"
 cd "${BUILD_DIRECTORY}"
 "${CMAKE}" \
Author	SHA1	Message	Date
Francesco Siddi	806601e1f4	Benchmark submodule checkout after libs update Otherwise on Darwin make update will switch it back to master.	2018-08-17 12:29:07 +02:00
Sybren A. Stüvel	57d4bff854	Rename bundle-linux.sh and bundle-windows.bat → bundle.{sh,bat} The shell script is also used by macOS and Windows builds, so calling it 'linux' is a bit silly.	2018-08-17 11:52:25 +02:00
Sybren A. Stüvel	6b07763daf	Blender's benchmark submodule should be on the correct branch This forces the release/scripts/benchmark submodule to be on the same branch as the working directory of the bundle script (usually release-xxx).	2018-08-17 11:50:52 +02:00
Sybren A. Stüvel	3a4280e8a6	Bumped version to 1.0b2	2018-08-17 11:13:40 +02:00