Fix buildstack revision report

diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh
index d778e921b574af64fac8947202b0fc1db83bb2db..643e3d84e68e71b674f83e465b7431f655022235 100755 (executable)
--- a/tools/x-win/compile.sh
+++ b/tools/x-win/compile.sh
@@ -75,6 +75,7 @@ fi
 CFLAGS="-mstackrealign$OPT" \
 CXXFLAGS="-mstackrealign$OPT" \
 LDFLAGS="-L${PREFIX}/lib" ./waf configure \
+DEPSTACK_ROOT="$PREFIX" \
        --keepflags \
        --dist-target=mingw \
        --also-include=${PREFIX}/include \

diff --git a/wscript b/wscript
index bfe133aa291b73a155590491c6a33539b2d280c8..6d1324ab96458a3e8d09e56d7164c1daebae58bd 100644 (file)
--- a/wscript
+++ b/wscript
@@ -307,7 +307,7 @@ def create_stored_revision():
 def get_depstack_rev(depstack_root):
     try:
         with open(depstack_root + '/../.vers', 'r') as f:
-            return f.readline()
+            return f.readline().decode('utf-8').strip()[:7]
     except IOError:
         return '-unknown-';
 
@@ -874,7 +874,9 @@ def configure(conf):
     pkg_config_path = os.getenv('PKG_CONFIG_PATH')
     user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst')
 
-    if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0:
+    if os.getenv('DEPSTACK_ROOT') is not None and os.path.exists (os.getenv('DEPSTACK_ROOT') + '/lib'):
+        conf.env['DEPSTACK_REV'] = get_depstack_rev (os.getenv('DEPSTACK_ROOT') + '/lib')
+    elif pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0:
         # told to search user_gtk_root
         prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
         preflib = ''.join ([ '-L', user_gtk_root + '/lib'])