Update FP8: new controllables, clarify 32C bell-shape labels

[ardour.git] / wscript

diff --git a/wscript b/wscript
index a7c3e1d26f0c8ca349a98267bc4d1da66e66c014..86fcc53d5e9859f297ed6e258faa790112d371a0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -239,7 +239,6 @@ children = [
         'libs/fst',
         'libs/vfork',
         'libs/ardouralsautil',
-        'cfgtool',
         'tools/luadevel',
 ]
 
@@ -285,6 +284,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 +544,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 +858,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)
@@ -1266,6 +1274,7 @@ const char* const ardour_config_info = "\\n\\
     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")