X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=e961a5dcb68d25ac8dceb9f20327f01cbac59488;hb=2c4e801183d14a2fce598caeea1b4948d0e0e1ad;hp=d2417bf71ea47ab57d68082473dd7b22f848fd19;hpb=54fd56de755a44420d906ad660b18c2d671f1057;p=ardour.git

diff --git a/wscript b/wscript
index d2417bf71e..e961a5dcb6 100644
--- a/wscript
+++ b/wscript
@@ -285,6 +285,13 @@ def create_stored_revision():
         print('Could not open libs/ardour/revision.cc for writing\n')
         sys.exit(-1)
 
+def get_depstack_rev(depstack_root):
+    try:
+        with open(depstack_root + '/../.vers', 'r') as f:
+            return f.readline()
+    except IOError:
+        return '-unknown-';
+
 def set_compiler_flags (conf,opt):
     #
     # Compiler flags and other system-dependent stuff
@@ -538,12 +545,12 @@ int main() { return 0; }''',
                 ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
                  '-mmacosx-version-min=10.7'))
 
-    elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
+    elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.8"))
 
-    elif conf.env['build_target'] in [ 'sierra' ]:
+    elif conf.env['build_target'] in ['el_capitan', 'sierra' ]:
         compiler_flags.extend(
                 ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
                  "-mmacosx-version-min=10.9"))
@@ -852,8 +859,10 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS',  [prefinclude ])
         conf.env.append_value('LINKFLAGS', [ preflib ])
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
+        conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root)
     else:
         autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
+        conf.env['DEPSTACK_REV'] = '-system-'
 
     if sys.platform == 'darwin':
         conf.define ('NEED_INTL', 1)
@@ -1221,19 +1230,18 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS'))
     write_config_text('Use External Libraries', conf.is_defined('USE_EXTERNAL_LIBS'))
     write_config_text('Library exports hidden', conf.is_defined('EXPORT_VISIBILITY_HIDDEN'))
-
+    write_config_text('Free/Demo copy',        conf.is_defined('FREEBIE'))
+    config_text.write("\\n\\\n")
     write_config_text('ALSA DBus Reservation', conf.is_defined('HAVE_DBUS'))
     write_config_text('Architecture flags',    opts.arch)
     write_config_text('Aubio',                 conf.is_defined('HAVE_AUBIO'))
     write_config_text('AudioUnits',            conf.is_defined('AUDIOUNIT_SUPPORT'))
-    write_config_text('Free/Demo copy',        conf.is_defined('FREEBIE'))
     write_config_text('Build target',          conf.env['build_target'])
     write_config_text('Canvas Test UI',        conf.is_defined('CANVASTESTUI'))
     write_config_text('CoreAudio',             conf.is_defined('HAVE_COREAUDIO'))
     write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105'))
     write_config_text('Debug RT allocations',  conf.is_defined('DEBUG_RT_ALLOC'))
     write_config_text('Debug Symbols',         conf.is_defined('debug_symbols') or conf.env['DEBUG'])
-    write_config_text('Process thread timing', conf.is_defined('PT_TIMING'))
     write_config_text('Denormal exceptions',   conf.is_defined('DEBUG_DENORMAL_EXCEPTION'))
     write_config_text('FLAC',                  conf.is_defined('HAVE_FLAC'))
     write_config_text('FPU optimization',      opts.fpu_optimization)
@@ -1245,8 +1253,10 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('LV2 support',           conf.is_defined('LV2_SUPPORT'))
     write_config_text('LV2 extensions',        conf.is_defined('LV2_EXTENDED'))
     write_config_text('LXVST support',         conf.is_defined('LXVST_SUPPORT'))
+    write_config_text('Mac VST support',       conf.is_defined('MACVST_SUPPORT'))
     write_config_text('OGG',                   conf.is_defined('HAVE_OGG'))
     write_config_text('Phone home',            conf.is_defined('PHONE_HOME'))
+    write_config_text('Process thread timing', conf.is_defined('PT_TIMING'))
     write_config_text('Program name',          opts.program_name)
     write_config_text('Samplerate',            conf.is_defined('HAVE_SAMPLERATE'))
     write_config_text('PT format',             conf.is_defined('PTFORMAT'))
@@ -1255,19 +1265,20 @@ const char* const ardour_config_info = "\\n\\
     write_config_text('Translation',           opts.nls)
 #    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
-    write_config_text('Mac i386 Architecture', opts.generic)
-    write_config_text('Mac ppc Architecture',  opts.ppc)
-    write_config_text('Mac VST support',       conf.is_defined('MACVST_SUPPORT'))
     write_config_text('Windows VST support',   opts.windows_vst)
     write_config_text('Wiimote support',       conf.is_defined('BUILD_WIIMOTE'))
     write_config_text('Windows key',           opts.windows_key)
-
+    config_text.write("\\n\\\n")
     write_config_text('PortAudio Backend',     conf.env['BUILD_PABACKEND'])
     write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA'])
     write_config_text('ALSA Backend',          conf.env['BUILD_ALSABACKEND'])
     write_config_text('Dummy backend',         conf.env['BUILD_DUMMYBACKEND'])
     write_config_text('JACK Backend',          conf.env['BUILD_JACKBACKEND'])
-
+    config_text.write("\\n\\\n")
+    write_config_text('Builstack', conf.env['DEPSTACK_REV'])
+    write_config_text('Mac i386 Architecture', opts.generic)
+    write_config_text('Mac ppc Architecture',  opts.ppc)
+    config_text.write("\\n\\\n")
     write_config_text('C compiler flags',      conf.env['CFLAGS'])
     write_config_text('C++ compiler flags',    conf.env['CXXFLAGS'])
     write_config_text('Linker flags',          conf.env['LINKFLAGS'])