2 files changed, 26 insertions, 11 deletions

diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index 9353317..0f9f237 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -100,6 +100,8 @@ opts.AddOptions(
     BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True),
     BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False),
     BoolOption('RUNTESTS', 'Run tests at end of compilation', True),
+    BoolOption('MAKE_PACKAGE', 'Create a package (tarball) after compiling "releasefordownload".', True),
+    PathOption('BUILD_DIR', 'Specify full path to build directory. If omitted, use default build directory.', '', PathOption.PathAccept),
     BoolOption('OPENSOURCE', 'Build using only non-proprietary dependencies', True) # OPENSOURCE: do not edit this line
 )
 optenv = Environment(options = opts)
@@ -120,6 +122,7 @@ runtests = optenv['RUNTESTS']
 opensource = standalone or optenv['OPENSOURCE']
 enable_fmod = not opensource and optenv['FMOD']
 elfio = optenv['ELFIO']
+make_package = optenv['MAKE_PACKAGE']
 
 targets = [ target_param ]
 
@@ -205,12 +208,19 @@ for build_target in targets:
         system_lib_dir += '/lib_release'
         lib_dir = './lib_release_' + build_target + '/' + system_str
 
-    try:
-        build_dir_prefix = os.environ['TEMP_BUILD_DIR']
-    except:
-        build_dir_prefix = '/tmp/' + os.environ['USER']
-        
-    build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + build_target + '-' + buildtype
+
+    build_dir = optenv['BUILD_DIR']
+    if build_dir != '':
+        # Validate directory, and create if needed.
+        # This is a hack to get around SCons' inflexibility.
+        PathOption.PathIsDirCreate("BUILD_DIR", build_dir, optenv)
+    else:
+        try:
+            build_dir_prefix = os.environ['TEMP_BUILD_DIR']
+        except:
+            build_dir_prefix = '/tmp/' + os.environ['USER'] + os.getcwd() + '/'
+
+        build_dir = build_dir_prefix + system_str + '-' + build_target + '-' + buildtype
 
     ### Base include directories ###
 
@@ -717,6 +727,8 @@ for build_target in targets:
                     'arch':arch}
                 if login_channel:
                     cmd += ' --login_channel=\'Second Life %s\'' % (login_channel)
+                if not make_package:
+                    cmd += ' --actions="copy"'
                 env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd)
                 Depends('newview/' + package_name, output_bin + '-stripped')
                 Depends('newview/' + package_name, output_crashlogger_bin + '-stripped')
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 27c12dd..ae25745 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -483,11 +483,14 @@ class LinuxManifest(ViewerManifest):
                 find %(dst)s -type f -perm 0400 | xargs chmod 0444;
                 true""" %  {'dst':self.get_dst_prefix() })
 
-                # temporarily move directory tree so that it has the right name in the tarfile
-                self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
-                # --numeric-owner hides the username of the builder for security etc.
-                self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)})
-                self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+                if("package" in self.args['actions'] or
+                   "unpacked" in self.args['actions']):
+                        # temporarily move directory tree so that it has the right name in the tarfile
+                        self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+                        # --numeric-owner hides the username of the builder for security etc.
+                        self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)})
+                        self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+
 
 class Linux_i686Manifest(LinuxManifest):
         def construct(self):