ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix scons stuff broken in revision 5962. The prefix must be conditional on whether the build is global or local. Help should be shown after tests are performed so that the actual values reported are not just an echo of the default values. The bundle is separate from the destdir option. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5964 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-07-24 14:21:05 +00:00
parent 840334ad97
commit bd3f837ebf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SConstruct
View File

@ -57,9 +57,6 @@ if not sys.platform == 'win32' and not sys.platform == 'darwin':
env = Environment(ENV = os.environ, variables = vars)
Export('env')
# Generate help
Help(vars.GenerateHelpText(env))
# Die on unknown variables
unknown = vars.UnknownVariables()
if unknown:
@ -168,8 +165,11 @@ env['build_dir'] = 'Build' + os.sep + platform.system() + \
env['local_libs'] = '#' + env['build_dir'] + os.sep + 'libs' + os.sep
# Install path
env['prefix'] = 'Binary' + os.sep + platform.system() + \
'-' + platform.machine() + extra + os.sep
if sys.platform == 'linux2' and env['install'] == 'global':
env['prefix'] = os.path.join(env['prefix'] + os.sep)
else:
env['prefix'] = 'Binary' + os.sep + platform.system() + \
'-' + platform.machine() + extra + os.sep
# Configuration tests section
tests = {'CheckWXConfig' : wxconfig.CheckWXConfig,
@ -372,9 +372,9 @@ else:
env['data_dir'] = env['destdir'] + env['data_dir']
env['plugin_dir'] = env['destdir'] + env['plugin_dir']
env['prefix'] = env['destdir'] + env['prefix']
if env['bundle']:
env.Tar('dolphin-' + rev + '.tar.bz2', env['prefix'],
TARFLAGS='-cj', TARCOMSTR='Creating release tarball')
if env['bundle']:
env.Tar('dolphin-' + rev + '.tar.bz2', env['prefix'],
TARFLAGS='-cj', TARCOMSTR='Creating release tarball')
# Data install
env.InstallAs(env['data_dir'] + 'sys', 'Data/Sys')
@ -405,6 +405,9 @@ if not shared['zlib']:
env['CPPPATH'] += ['#Externals/zlib']
dirs += ['Externals/zlib']
# Generate help
Help(vars.GenerateHelpText(env))
for subdir in dirs:
SConscript(subdir + os.sep + 'SConscript',
variant_dir = env['build_dir'] + os.sep + subdir, duplicate = 0)