From 36799ad201151c99872c2e8e2a3080404dafd5b1 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Sun, 27 Mar 2011 00:53:32 +1000
Subject: Turn on the linux tarball generation again.  Add a comment that we
 need a way to turn that on and off.

---
 linden/indra/newview/viewer_manifest.py | 41 +++++++++++++++++----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 81811a9..7eb2c7f 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -973,27 +973,28 @@ class LinuxManifest(ViewerManifest):
         self.package_file = installer_name + '.tar.bz2'
 
         # Disabled for now. It's a waste of time to package every compile.
+        # Hmm, need a way to turn this on and off.
 
-        # 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.build_path_of(installer_name)})
-        #     try:
-        #         # --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_build_prefix(),
-        #             'inst_name': installer_name,
-        #             'inst_path':self.build_path_of(installer_name)})
-        #     finally:
-        #         self.run_command("mv %(inst)s %(dst)s" % {
-        #             'dst': self.get_dst_prefix(),
-        #             'inst': self.build_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.build_path_of(installer_name)})
+             try:
+                 # --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_build_prefix(),
+                     'inst_name': installer_name,
+                     'inst_path':self.build_path_of(installer_name)})
+             finally:
+                 self.run_command("mv %(inst)s %(dst)s" % {
+                     'dst': self.get_dst_prefix(),
+                     'inst': self.build_path_of(installer_name)})
 
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):
-- 
cgit v1.1