Extend copyright year to 2007

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 79ac56b6f028e554a2d7df0a8372a87b9660f996..7ad9dd84510f90c5c2fdf61e48bfb2ffbf6fea23 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
 SConsignFile()
 EnsureSConsVersion(0, 96)
 

-ardour_version = '2.0beta11.1'
+ardour_version = '2.0beta12'

 
 subst_dict = { }
 
 
 subst_dict = { }
 


@@ -44,6 +44,7 @@ opts.AddOptions(
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
     BoolOption('VST', 'Compile with support for VST', 0),
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
     BoolOption('VST', 'Compile with support for VST', 0),

+    BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),

     BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1)
 )
 
     BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1)
 )
 


@@ -531,7 +532,10 @@ env = conf.Finish()
 #
 
 opt_flags = []
 #
 
 opt_flags = []

-debug_flags = [ '-g' ]
+if env['GPROFILE'] == 1:
+    debug_flags = [ '-g', '-pg' ]
+else:
+    debug_flags = [ '-g' ]

 
 # guess at the platform, used to define compiler flags
 
 
 # guess at the platform, used to define compiler flags
 


@@ -597,7 +601,7 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
         if env['DIST_TARGET'] != 'i386':
             
             flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
         if env['DIST_TARGET'] != 'i386':
             
             flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]

-            x86_flags = flag_line.split (": ")[1:][0].split (' ')
+            x86_flags = flag_line.split (": ")[1:][0].split ()

             
             if "mmx" in x86_flags:
                 opt_flags.append ("-mmmx")
             
             if "mmx" in x86_flags:
                 opt_flags.append ("-mmmx")


@@ -1078,7 +1082,7 @@ subst_dict['%REVISION_STRING%'] = ''
 if os.path.exists('.svn'):
     subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn'
 
 if os.path.exists('.svn'):
     subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn'
 

-specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)
+# specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict)

 
 the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
 
 
 the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
 


@@ -1096,7 +1100,6 @@ env.Distribute (env['DISTTREE'],
                [ 'SConstruct', 'svn_revision.h',
                   'COPYING', 'PACKAGER_README', 'README',
                   'ardour.rc.in',
                [ 'SConstruct', 'svn_revision.h',
                   'COPYING', 'PACKAGER_README', 'README',
                   'ardour.rc.in',

-                  'ardour.spec',

                   'ardour_system.rc',
                   'tools/config.guess',
                   'icons/icon/ardour_icon_mac_mask.png',
                   'ardour_system.rc',
                   'tools/config.guess',
                   'icons/icon/ardour_icon_mac_mask.png',