[Bf-blender-cvs] [09ecfc3] master: Fixes for buildinfo of exported source tree

[Sergey Sharybin]

Commit: 09ecfc318cb808a578d5211e44051d28e1de0706
Author: Sergey Sharybin
Date:   Sun Nov 17 00:00:02 2013 +0600
http://developer.blender.org/rB09ecfc318cb808a578d5211e44051d28e1de0706

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.

===================================================================

M	build_files/cmake/buildinfo.cmake
M	build_files/scons/tools/Blender.py

===================================================================

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 0a299af..3893866 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 8715c23..fac8195 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"