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

Benchmark submodule checkout after libs update

Browse Source 
Otherwise on Darwin make update will switch it
back to master.
This commit is contained in:
Francesco Siddi
2018-08-17 12:16:59 +02:00
parent 36be4df607
commit e6d300a219
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bundle/bundle.sh
View File

@@ -278,13 +278,6 @@ ${GIT_C} pull
echo "Updatying submodules to the latest version..." echo "Updatying submodules to the latest version..."
${GIT_C} submodule update --remote --init --recursive ${GIT_C} submodule update --remote --init --recursive
# 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}
if [ "${KERNEL_NAME}" == "Darwin" ]; then if [ "${KERNEL_NAME}" == "Darwin" ]; then
# Get precompiled libs # Get precompiled libs
cd "${SOURCE_DIRECTORY}" cd "${SOURCE_DIRECTORY}"
@@ -303,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}" \