cmd += " | awk '/^Revision:/ { print $2}'"
return commands.getoutput (cmd)
-def recreate_stored_revision(target = None, source = None, env = None):
- os.unlink ('svn_revision.h')
- print "===========> Forcing recreation of svn_revision.h"
- create_stored_revision ()
-
-def create_stored_revision(target = None, source = None, env = None):
+def create_stored_revision (target = None, source = None, env = None):
if os.path.exists('.svn'):
rev = fetch_svn_revision ('.');
try:
print "Could not open svn_revision.h for writing\n"
sys.exit (-1)
else:
- if os.path.exists ('svn_revision.h') == False:
- print "\n\nYou are missing svn_revision.h, which should have been included."
- print "This is caused either by a packaging error, "
- print " or a configuration error with your system."
- print "Please report this issue to the ardour-dev mailing list."
- print "(See http://ardour.org/support for details)\n\n"
- sys.exit (-1)
+ print "You cannot use \"scons revision\" on without using a checked out"
+ print "copy of the Ardour source code repository"
+ sys.exit (-1)
-#
-# if it exists, do not remove it
-#
-
-Precious('svn_revision.h')
-
#
# A generic builder for version.cc files
#
#
if env['VST']:
- sys.stdout.write ("Are you building Ardour for personal use (rather than distributiont to others)? [no]: ")
+ sys.stdout.write ("Are you building Ardour for personal use (rather than distribution to others)? [no]: ")
answer = sys.stdin.readline ()
answer = answer.rstrip().strip()
if answer != "yes" and answer != "y":
gtk_subdirs = [
# 'libs/flowcanvas',
'libs/gtkmm2ext',
- 'gtk2_ardour'
+ 'gtk2_ardour',
+ 'libs/clearlooks'
]
else:
'libs/gtkmm2/gtk',
'libs/libgnomecanvasmm',
# 'libs/flowcanvas',
- 'libs/gtkmm2ext',
- 'gtk2_ardour'
+ 'libs/gtkmm2ext',
+ 'gtk2_ardour',
+ 'libs/clearlooks'
]
#
rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict)
-#
-# making this into an Alias directly prevents scons from understanding how to build
-# svn_revision.h
-#
-
-the_revision = env.Command ('svn_revision.h', [], create_stored_revision)
+the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
+env.Alias('revision', the_revision)
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.rc'))
Precious (env['DISTTREE'])
env.Distribute (env['DISTTREE'],
- [ 'SConstruct', 'svn_revision.h',
+ [ 'SConstruct', 'svn_revision.h',
'COPYING', 'PACKAGER_README', 'README',
'ardour.rc.in',
'ardour_system.rc',
glob.glob ('DOCUMENTATION/README*')
)
-srcdist = env.Tarball(env['TARBALL'], env['DISTTREE'])
+srcdist = env.Tarball(env['TARBALL'], [ env['DISTTREE'], the_revision ])
env.Alias ('srctar', srcdist)
#
#
env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE']))))
-env.AddPreAction (srcdist, Action (recreate_stored_revision))
env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
#