diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-16 22:00:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-16 22:02:27 +0400 |
| commit | 09ecfc318cb808a578d5211e44051d28e1de0706 (patch) | |
| tree | 0ee3127e37784f2b898ab8659d84dd21e32577c4 | |
| parent | e8bd916ba5e6d65c8bcf246f3fa3fba5e0e7bdb1 (diff) | |
Fixes for buildinfo of exported source tree
- Better to set branch/hash to "unknown" so
it's clear build is done from exported tree.
- SCons used to reference undefined variable.
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 0a299af88ee..389386629db 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -3,8 +3,8 @@ # Extract working copy information for SOURCE_DIR into MY_XXX variables # with a default in case anything fails, for examble when using git-svn -set(MY_WC_HASH "") -set(MY_WC_BRANCH "") +set(MY_WC_HASH "unknown") +set(MY_WC_BRANCH "unknown") set(MY_WC_COMMIT_TIMESTAMP 0) # Guess if this is a SVN working copy and then look up the revision diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 8715c2367e4..fac81953476 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -415,9 +415,9 @@ def buildinfo(lenv, build_type): build_hash = os.popen('git rev-parse --short HEAD').read().strip() build_branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip() else: - build_hash = '' - build_change = 'unknown' - build_branch = '' + build_hash = 'unknown' + build_commit_timestamp = '0' + build_branch = 'unknown' if lenv['BF_DEBUG']: build_type = "Debug" |