From af7a2a3b6a08bdbe99d295e593e770af165eb0e6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 28 Nov 2013 02:25:09 +0600 Subject: Fix buildinfo hash for cases there's no upstream set for the branch --- build_files/cmake/buildinfo.cmake | 9 +++++++++ build_files/scons/tools/Blender.py | 3 +++ 2 files changed, 12 insertions(+) (limited to 'build_files') diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 9d315c2518f..c31a7cfacb0 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -19,6 +19,15 @@ if(EXISTS ${SOURCE_DIR}/.git) OUTPUT_VARIABLE MY_WC_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) + if (MY_WC_HASH STREQUAL "") + # Local branch, not set to upstream. + # Well, let's use HEAD for now + execute_process(COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY ${SOURCE_DIR} + OUTPUT_VARIABLE MY_WC_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() + execute_process(COMMAND git rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_BRANCH diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 9d1a6390774..0f02502db60 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -422,6 +422,9 @@ def buildinfo(lenv, build_type): build_hash = os.popen('git rev-parse --short @{u}').read().strip() build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip() + if build_hash == '': + build_hash = os.popen('git rev-parse --short HEAD').read().strip() + # ## Check for local modifications has_local_changes = False -- cgit v1.2.3