SConsignFile()
EnsureSConsVersion(0, 96)
-ardour_version = '2.5'
+ardour_version = '2.6.1'
subst_dict = { }
if os.path.exists('.svn'):
rev = fetch_svn_revision ('.');
try:
- text = "#ifndef __ardour_svn_revision_h__\n"
- text += "#define __ardour_svn_revision_h__\n"
- text += "static const char* ardour_svn_revision = \"" + rev + "\";\n";
- text += "#endif\n"
- print '============> writing svn revision info to svn_revision.h\n'
- o = file ('svn_revision.h', 'w')
+ text = "#include <ardour/svn_revision.h>\n"
+ text += "namespace ARDOUR {\n";
+ text += "extern const char* svn_revision = \"" + rev + "\";\n";
+ text += "}\n";
+ print '============> writing svn revision info to libs/ardour/svn_revision.cc\n'
+ o = file ('libs/ardour/svn_revision.cc', 'w')
o.write (text)
o.close ()
except IOError:
- print "Could not open svn_revision.h for writing\n"
+ print "Could not open libs/ardour/svn_revision.cc for writing\n"
sys.exit (-1)
else:
- print "You cannot use \"scons revision\" on without using a checked out"
- print "copy of the Ardour source code repository"
- sys.exit (-1)
+ if not os.path.exists('libs/ardour/ardour/svn_revision.h'):
+ print "This release of ardour is missing libs/ardour/ardour/svn_revision.h. Blame the packager."
+ sys.exit (-1)
#
# A generic builder for version.cc files
'lrdf' : '0.4.0',
'jack' : '0.109.0',
'libgnomecanvas-2.0' : '2.0',
- 'aubio' : '0.3.2'
}
def DependenciesRequiredMessage():
build_host_supports_sse = 0
- debug_flags.append ("-DARCH_X86")
- opt_flags.append ("-DARCH_X86")
+ if (re.search ("i[0-9]86", config[config_cpu]) != None):
+ debug_flags.append ("-DARCH_X86")
+ opt_flags.append ("-DARCH_X86")
if config[config_kernel] == 'linux' :
#
# rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default.
# All libraries needed should be built against this location
+ # However.. now jhbuild installs to ~/gtk/inst by default.. changed to accomodate this
if topenv['GTKOSX']:
- gtkroot = os.path.expanduser ("~");
- libinfo.Append(CPPPATH="$GTKROOT/include", LIBPATH="$GTKROOT/lib")
- libinfo.Append(CXXFLAGS="-I$GTKROOT/include", LINKFLAGS="-L$GTKROOT/lib")
- libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
- libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
+ GTKROOT = os.path.expanduser ('~/gtk/inst')
+ libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib")
+ libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib")
+ #libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
+ #libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
prep_libcheck(env, env)
Precious (env['DISTTREE'])
env.Distribute (env['DISTTREE'],
- [ 'SConstruct', 'svn_revision.h',
+ [ 'SConstruct',
'COPYING', 'PACKAGER_README', 'README',
'ardour.rc.in',
'tools/config.guess',
env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE']))))
env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
+#
+# Update revision info before going into subdirs
+#
+
+create_stored_revision()
+
#
# the subdirs
#