archive/blender-benchmark-bundle
Archived
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: archive:master
Branches Tags
archive:master archive:release-1.0b2
...
pull from: archive:release-1.0b2
Branches Tags
archive:master archive:release-1.0b2

4 Commits
master ... release-1.

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
3 changed files with 6 additions and 1 deletions
Expand all files Collapse all files

2
benchmark/version.py
View File

@@ -10,7 +10,7 @@ import functools
# #
# It is sent to the MyData server in the 'User Agent' HTTP header, and # It is sent to the MyData server in the 'User Agent' HTTP header, and
# it's also included in error reports. # it's also included in error reports.
version = '1.0b2.dev0' version = '1.0b2'
@functools.lru_cache(maxsize=1) @functools.lru_cache(maxsize=1)

0
bundle/bundle-windows.bat → bundle/bundle.bat
View File

5
bundle/bundle-linux.sh → bundle/bundle.sh
View File

@@ -296,6 +296,11 @@ elif [[ "${KERNEL_NAME}" == "MINGW"* ]]; then
EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -H${SOURCE_DIRECTORY} -B${BUILD_DIRECTORY}" EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -H${SOURCE_DIRECTORY} -B${BUILD_DIRECTORY}"
fi 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}" mkdir -p "${BUILD_DIRECTORY}"
cd "${BUILD_DIRECTORY}" cd "${BUILD_DIRECTORY}"
"${CMAKE}" \ "${CMAKE}" \