diff options
author | Jacek Antonelli | 2008-09-19 16:51:37 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-19 16:53:02 -0500 |
commit | 9bced5eac4d1928f87fdc70a51e0eb76109b52ed (patch) | |
tree | ccc7712ca26400583162d2e51016f0ad4a9c7350 /linden/indra/SConstruct | |
parent | Created ChangeLog.txt. (diff) | |
download | meta-impy-9bced5eac4d1928f87fdc70a51e0eb76109b52ed.zip meta-impy-9bced5eac4d1928f87fdc70a51e0eb76109b52ed.tar.gz meta-impy-9bced5eac4d1928f87fdc70a51e0eb76109b52ed.tar.bz2 meta-impy-9bced5eac4d1928f87fdc70a51e0eb76109b52ed.tar.xz |
VWR-2865: New SConstruct flag to (not) make tarball after compiling.
For convenience until we switch to CMake.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/SConstruct | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct index 9353317..5ca22e6 100644 --- a/linden/indra/SConstruct +++ b/linden/indra/SConstruct | |||
@@ -100,6 +100,7 @@ opts.AddOptions( | |||
100 | BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True), | 100 | BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True), |
101 | BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False), | 101 | BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False), |
102 | BoolOption('RUNTESTS', 'Run tests at end of compilation', True), | 102 | BoolOption('RUNTESTS', 'Run tests at end of compilation', True), |
103 | BoolOption('MAKE_PACKAGE', 'Create a package (tarball) after compiling "releasefordownload".', True), | ||
103 | BoolOption('OPENSOURCE', 'Build using only non-proprietary dependencies', True) # OPENSOURCE: do not edit this line | 104 | BoolOption('OPENSOURCE', 'Build using only non-proprietary dependencies', True) # OPENSOURCE: do not edit this line |
104 | ) | 105 | ) |
105 | optenv = Environment(options = opts) | 106 | optenv = Environment(options = opts) |
@@ -120,6 +121,7 @@ runtests = optenv['RUNTESTS'] | |||
120 | opensource = standalone or optenv['OPENSOURCE'] | 121 | opensource = standalone or optenv['OPENSOURCE'] |
121 | enable_fmod = not opensource and optenv['FMOD'] | 122 | enable_fmod = not opensource and optenv['FMOD'] |
122 | elfio = optenv['ELFIO'] | 123 | elfio = optenv['ELFIO'] |
124 | make_package = optenv['MAKE_PACKAGE'] | ||
123 | 125 | ||
124 | targets = [ target_param ] | 126 | targets = [ target_param ] |
125 | 127 | ||
@@ -717,6 +719,8 @@ for build_target in targets: | |||
717 | 'arch':arch} | 719 | 'arch':arch} |
718 | if login_channel: | 720 | if login_channel: |
719 | cmd += ' --login_channel=\'Second Life %s\'' % (login_channel) | 721 | cmd += ' --login_channel=\'Second Life %s\'' % (login_channel) |
722 | if not make_package: | ||
723 | cmd += ' --actions="copy"' | ||
720 | env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd) | 724 | env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd) |
721 | Depends('newview/' + package_name, output_bin + '-stripped') | 725 | Depends('newview/' + package_name, output_bin + '-stripped') |
722 | Depends('newview/' + package_name, output_crashlogger_bin + '-stripped') | 726 | Depends('newview/' + package_name, output_crashlogger_bin + '-stripped') |