SConsignFile()
EnsureSConsVersion(0, 96)
-version = '2.0beta6'
+version = '2.0beta6.2'
subst_dict = { }
PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
BoolOption('SURFACES', 'Build support for control surfaces', 0),
BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
- BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0),
+ BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
BoolOption('VST', 'Compile with support for VST', 0)
)
# note: requires that DOMAIN, MAJOR, MINOR, MICRO are set in the construction environment
# note: assumes one source files, the header that declares the version variables
#
-#def version_builder (target, source, env):
-# text = "int " + env['DOMAIN'] + "_major_version = " + str (env['MAJOR']) + ";\n"
-# text += "int " + env['DOMAIN'] + "_minor_version = " + str (env['MINOR']) + ";\n"
-# text += "int " + env['DOMAIN'] + "_micro_version = " + str (env['MICRO']) + ";\n"
-#
-# try:
-# o = file (target[0].get_path(), 'w')
-# o.write (text)
-# o.close ()
-# except IOError:
-# print "Could not open", target[0].get_path(), " for writing\n"
-# sys.exit (-1)
-#
-# text = "#ifndef __" + env['DOMAIN'] + "_version_h__\n"
-# text += "#define __" + env['DOMAIN'] + "_version_h__\n"
-# text += "extern int " + env['DOMAIN'] + "_major_version;\n"
-# text += "extern int " + env['DOMAIN'] + "_minor_version;\n"
-# text += "extern int " + env['DOMAIN'] + "_micro_version;\n"
-# text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n"
-#
-# try:
-# o = file (target[1].get_path(), 'w')
-# o.write (text)
-# o.close ();
-# except IOError:
-# print "Could not open", target[1].get_path(), " for writing\n"
-# sys.exit (-1)
-#
-# return None
def version_builder (target, source, env):
cmd = "svn info "
#
def versioned_builder(target,source,env):
- # build ID is composed of a representation of the date of the last CVS transaction
- # for this (SConscript) file
+ w, r = os.popen2( "svn info | awk '/^Revision:/ { print $2}'")
- try:
- o = file (source[0].get_dir().get_path() + '/CVS/Entries', "r")
- except IOError:
- print "Could not CVS/Entries for reading"
- return -1
-
- last_date = ""
- lines = o.readlines()
- for line in lines:
- if line[0:12] == '/SConscript/':
- parts = line.split ("/")
- last_date = parts[3]
- break
- o.close ()
-
- if last_date == "":
- print "No SConscript CVS update info found - versioned executable cannot be built"
+ last_revision = r.readline().strip()
+ w.close()
+ r.close()
+ if last_revision == "":
+ print "No SVN info found - versioned executable cannot be built"
return -1
- tag = time.strftime ('%Y%M%d%H%m', time.strptime (last_date))
- print "The current build ID is " + tag
+ print "The current build ID is " + last_revision
- tagged_executable = source[0].get_path() + '-' + tag
+ tagged_executable = source[0].get_path() + '-' + last_revision
if os.path.exists (tagged_executable):
print "Replacing existing executable with the same build tag."
libraries['boost'] = LibraryInfo ()
conf = Configure (libraries['boost'])
-if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == 0:
+if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
print "Boost header files do not appear to be installed."
sys.exit (1)
subst_dict['%MIDITAG%'] = "ardour"
subst_dict['%MIDITYPE%'] = "coremidi"
else:
- print "It appears you don't have the required MIDI libraries installed."
+ print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
sys.exit (1)
env = conf.Finish()
# cannot use system one for the time being
#
- libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
+ libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
LIBPATH='#libs/libsndfile',
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
LIBPATH='#libs/soundtouch',
CPPPATH=['#libs', '#libs/soundtouch'])
- libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
+ libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
LIBPATH='#libs/libsndfile',
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
# libraries['libglademm'] = LibraryInfo(LIBS='libglademm',