aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-09 12:14:15 -0500
committerJacek Antonelli2009-09-09 12:14:15 -0500
commit8840e40ed017d88eb9a3b830cfca818b0627b65b (patch)
tree6c78353fe6a60a4c24090ac842cf1d0f838f664a /linden/indra
parentMerge remote branch 'mccabe/1.2.0-next' into next (diff)
downloadmeta-impy-8840e40ed017d88eb9a3b830cfca818b0627b65b.zip
meta-impy-8840e40ed017d88eb9a3b830cfca818b0627b65b.tar.gz
meta-impy-8840e40ed017d88eb9a3b830cfca818b0627b65b.tar.bz2
meta-impy-8840e40ed017d88eb9a3b830cfca818b0627b65b.tar.xz
Commented out Linux tarball building.
It's a waste of time to package after every compile.
Diffstat (limited to 'linden/indra')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py42
1 files changed, 22 insertions, 20 deletions
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):
746 746
747 self.package_file = installer_name + '.tar.bz2' 747 self.package_file = installer_name + '.tar.bz2'
748 748
749 if("package" in self.args['actions'] or 749 # Disabled for now. It's a waste of time to package every compile.
750 "unpacked" in self.args['actions']): 750
751 751 # if("package" in self.args['actions'] or
752 # temporarily move directory tree so that it has the right 752 # "unpacked" in self.args['actions']):
753 # name in the tarfile 753 #
754 self.run_command("mv %(dst)s %(inst)s" % { 754 # # temporarily move directory tree so that it has the right
755 'dst': self.get_dst_prefix(), 755 # # name in the tarfile
756 'inst': self.build_path_of(installer_name)}) 756 # self.run_command("mv %(dst)s %(inst)s" % {
757 try: 757 # 'dst': self.get_dst_prefix(),
758 # --numeric-owner hides the username of the builder for 758 # 'inst': self.build_path_of(installer_name)})
759 # security etc. 759 # try:
760 self.run_command('tar -C %(dir)s --numeric-owner -cjf ' 760 # # --numeric-owner hides the username of the builder for
761 '%(inst_path)s.tar.bz2 %(inst_name)s' % { 761 # # security etc.
762 'dir': self.get_build_prefix(), 762 # self.run_command('tar -C %(dir)s --numeric-owner -cjf '
763 'inst_name': installer_name, 763 # '%(inst_path)s.tar.bz2 %(inst_name)s' % {
764 'inst_path':self.build_path_of(installer_name)}) 764 # 'dir': self.get_build_prefix(),
765 finally: 765 # 'inst_name': installer_name,
766 self.run_command("mv %(inst)s %(dst)s" % { 766 # 'inst_path':self.build_path_of(installer_name)})
767 'dst': self.get_dst_prefix(), 767 # finally:
768 'inst': self.build_path_of(installer_name)}) 768 # self.run_command("mv %(inst)s %(dst)s" % {
769 # 'dst': self.get_dst_prefix(),
770 # 'inst': self.build_path_of(installer_name)})
769 771
770 772
771class Linux_i686Manifest(LinuxManifest): 773class Linux_i686Manifest(LinuxManifest):