piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Produce usable global+destdir tarballs with pathnames relative to / .

Browse Source 
This is a bit hacky as SCons' built-in tar handling basically makes
this impossible. I should just write a "relative path" tarball Builder.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5967 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-07-24 23:09:43 +00:00
parent f99a36ccfa
commit 2d3b9860f7
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
SConstruct
View File

@ -120,16 +120,17 @@ if env['lint']:
# Verbose compile # Verbose compile
if not env['verbose']: if not env['verbose']:
env['CCCOMSTR'] = "Compiling $TARGET"
env['CXXCOMSTR'] = "Compiling $TARGET"
env['ARCOMSTR'] = "Archiving $TARGET" env['ARCOMSTR'] = "Archiving $TARGET"
env['LINKCOMSTR'] = "Linking $TARGET"
env['ASCOMSTR'] = "Assembling $TARGET" env['ASCOMSTR'] = "Assembling $TARGET"
env['ASPPCOMSTR'] = "Assembling $TARGET" env['ASPPCOMSTR'] = "Assembling $TARGET"
env['SHCCCOMSTR'] = "Compiling shared $TARGET" env['CCCOMSTR'] = "Compiling $TARGET"
env['SHCXXCOMSTR'] = "Compiling shared $TARGET" env['CXXCOMSTR'] = "Compiling $TARGET"
env['SHLINKCOMSTR'] = "Linking shared $TARGET" env['LINKCOMSTR'] = "Linking $TARGET"
env['RANLIBCOMSTR'] = "Indexing $TARGET" env['RANLIBCOMSTR'] = "Indexing $TARGET"
env['SHCCCOMSTR'] = "Compiling $TARGET"
env['SHCXXCOMSTR'] = "Compiling $TARGET"
env['SHLINKCOMSTR'] = "Linking $TARGET"
env['TARCOMSTR'] = "Creating $TARGET"
dirs = [ dirs = [
'Externals/Bochs_disasm', 'Externals/Bochs_disasm',
@ -267,7 +268,7 @@ else:
# TODO: Check the version of sfml. It should be at least version 1.5 # TODO: Check the version of sfml. It should be at least version 1.5
if env['shared_sfml']: if env['shared_sfml']:
env['shared_sfml'] = conf.CheckPKG('sfml-network') and \ env['shared_sfml'] = conf.CheckPKG('sfml-network') and \
conf.CheckCXXHeader("SFML/Network/Ftp.hpp") conf.CheckCXXHeader("SFML/Network/Ftp.hpp")
if env['shared_soil']: if env['shared_soil']:
env['shared_soil'] = conf.CheckPKG('SOIL') env['shared_soil'] = conf.CheckPKG('SOIL')
for var in env.items(): for var in env.items():
@ -279,7 +280,7 @@ else:
env['HAVE_WX'] = 0 env['HAVE_WX'] = 0
else: else:
env['HAVE_WX'] = conf.CheckWXConfig(2.8, env['HAVE_WX'] = conf.CheckWXConfig(2.8,
['aui', 'adv', 'core', 'base', 'gl'], 0) ['aui', 'adv', 'core', 'base'], 0)
conf.Define('HAVE_WX', env['HAVE_WX']) conf.Define('HAVE_WX', env['HAVE_WX'])
wxconfig.ParseWXConfig(env) wxconfig.ParseWXConfig(env)
if not env['HAVE_WX']: if not env['HAVE_WX']:
@ -350,10 +351,16 @@ else:
else: else:
print "Can't build prof without oprofile, disabling" print "Can't build prof without oprofile, disabling"
tarname = 'dolphin-' + rev
env['TARFLAGS'] = '-cj'
env['TARSUFFIX'] = '.tar.bz2'
if env['install'] == 'local': if env['install'] == 'local':
env['binary_dir'] = '#' + env['prefix'] env['binary_dir'] = '#' + env['prefix']
env['data_dir'] = '#' + env['prefix'] env['data_dir'] = '#' + env['prefix']
env['plugin_dir'] = '#' + env['prefix'] + '/plugins' env['plugin_dir'] = '#' + env['prefix'] + '/plugins'
if env['bundle']:
env.Tar(tarname, env['prefix'])
else: else:
env['prefix'] = Dir(env['prefix']).abspath env['prefix'] = Dir(env['prefix']).abspath
env['binary_dir'] = env['prefix'] + '/bin' env['binary_dir'] = env['prefix'] + '/bin'
@ -370,19 +377,17 @@ else:
env['data_dir'] = env['destdir'] + env['data_dir'] env['data_dir'] = env['destdir'] + env['data_dir']
env['plugin_dir'] = env['destdir'] + env['plugin_dir'] env['plugin_dir'] = env['destdir'] + env['plugin_dir']
env['prefix'] = env['destdir'] + env['prefix'] env['prefix'] = env['destdir'] + env['prefix']
if env['bundle']:
env.Command(tarname + env['TARSUFFIX'], env['prefix'],
'tar ' + env['TARFLAGS'] + 'C ' + env['destdir'] + \
' -f ' + tarname + env['TARSUFFIX'] + ' ' + \
env['prefix'].split(env['destdir'], 1)[1][1:])
conf.Define('USER_DIR', "\"" + env['userdir'] + "\"") conf.Define('USER_DIR', "\"" + env['userdir'] + "\"")
# After all configuration tests are done # After all configuration tests are done
conf.Finish() conf.Finish()
if env['bundle']:
if env['install'] == 'global' and not env.has_key('destdir'):
print 'Not tarring up ' + env['prefix']
else:
env.Tar('dolphin-' + rev + '.tar.bz2', env['prefix'],
TARFLAGS='-cj', TARCOMSTR='Creating release tarball')
# Data install # Data install
env.InstallAs(env['data_dir'] + '/sys', 'Data/Sys') env.InstallAs(env['data_dir'] + '/sys', 'Data/Sys')
env.InstallAs(env['data_dir'] + '/user', 'Data/User') env.InstallAs(env['data_dir'] + '/user', 'Data/User')