Improve svn revision handling and make srctar "work". (The tarball is created, but it doesn't build...)
git-svn-id: svn://localhost/ardour2/branches/3.0@4298 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
72f55cd8b6
commit
6974dbdcd2
|
@ -281,9 +281,12 @@ def create_stored_revision (target = None, source = None, env = None):
|
|||
rev = fetch_svn_revision ('.');
|
||||
elif os.path.exists('.git'):
|
||||
rev = fetch_git_revision ('.');
|
||||
elif os.path.exists('libs/ardour/svn_revision.cc'):
|
||||
print "Using packaged svn revision"
|
||||
return
|
||||
else:
|
||||
print "You cannot use \"scons revision\" on without using a checked out"
|
||||
print "copy of the Ardour source code repository"
|
||||
print "Your source does not include revision information."
|
||||
print "Please check out the code from a repository or use a properly packaged version!"
|
||||
sys.exit (-1)
|
||||
|
||||
try:
|
||||
|
@ -1366,7 +1369,7 @@ Default (sysrcbuild)
|
|||
Precious (env['DISTTREE'])
|
||||
|
||||
env.Distribute (env['DISTTREE'],
|
||||
[ 'SConstruct', 'svn_revision.h',
|
||||
[ 'SConstruct',
|
||||
'COPYING', 'PACKAGER_README', 'README',
|
||||
'ardour.rc.in',
|
||||
'tools/config.guess',
|
||||
|
|
|
@ -24,8 +24,8 @@ env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
|||
'cairomm/cairomm.h',
|
||||
'configure',
|
||||
'Makefile.in',
|
||||
'cairomm/cairomm-1.0.pc.in',
|
||||
'cairomm/Makefile.in'
|
||||
'cairomm-1.0.pc.in',
|
||||
'Makefile.in'
|
||||
] +
|
||||
cairomm_files +
|
||||
glob.glob('cairomm/*.h')
|
||||
|
|
|
@ -37,7 +37,7 @@ env.Alias('install',
|
|||
libclearlooks))
|
||||
|
||||
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||
[ 'SConscript', 'bits.c'] +
|
||||
[ 'SConscript' ] +
|
||||
libclearlooks_files +
|
||||
glob.glob('*.h')
|
||||
))
|
||||
|
|
|
@ -132,15 +132,18 @@ Default([config_h,header_dir,libtaglib])
|
|||
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libtaglib))
|
||||
|
||||
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||
[ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',
|
||||
[ 'AUTHORS',
|
||||
'configure',
|
||||
'config.h.in',
|
||||
'acinclude.m4',
|
||||
'Makefile.am',
|
||||
'SConscript',
|
||||
'taglib.pc.in'
|
||||
'config.sub',
|
||||
'config.guess',
|
||||
'install-sh'
|
||||
'taglib.pc.in',
|
||||
'admin/config.sub',
|
||||
'admin/config.guess',
|
||||
'admin/conf.change.pl',
|
||||
'admin/install-sh'
|
||||
] +
|
||||
taglib_files +
|
||||
headers
|
||||
))
|
||||
|
||||
|
|
Loading…
Reference in New Issue