From 8840e40ed017d88eb9a3b830cfca818b0627b65b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 9 Sep 2009 12:14:15 -0500
Subject: Commented out Linux tarball building.

It's a waste of time to package after every compile.
---
 ChangeLog.txt                           |  8 +++++++
 linden/indra/newview/viewer_manifest.py | 42 +++++++++++++++++----------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index bb88684..76e06ed 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2009-09-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* Commented out Linux tarball building.
+	  It's a waste of time to package after every compile.
+
+		modified:   linden/indra/newview/viewer_manifest.py
+
+
 2009-09-08  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* Created my own version of Emerald's chat channel tool. 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 5da0256..6ae5b80 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -746,26 +746,28 @@ class LinuxManifest(ViewerManifest):
 
         self.package_file = installer_name + '.tar.bz2'
 
-        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)})
+        # Disabled for now. It's a waste of time to package every compile.
+
+        # 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):
-- 
cgit v1.1