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/newview/viewer_manifest.py | |
| 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 'linden/indra/newview/viewer_manifest.py')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 13 |
1 files changed, 8 insertions, 5 deletions
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): | |||
| 483 | find %(dst)s -type f -perm 0400 | xargs chmod 0444; | 483 | find %(dst)s -type f -perm 0400 | xargs chmod 0444; |
| 484 | true""" % {'dst':self.get_dst_prefix() }) | 484 | true""" % {'dst':self.get_dst_prefix() }) |
| 485 | 485 | ||
| 486 | # temporarily move directory tree so that it has the right name in the tarfile | 486 | if("package" in self.args['actions'] or |
| 487 | self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) | 487 | "unpacked" in self.args['actions']): |
| 488 | # --numeric-owner hides the username of the builder for security etc. | 488 | # temporarily move directory tree so that it has the right name in the tarfile |
| 489 | 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)}) | 489 | self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) |
| 490 | self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) | 490 | # --numeric-owner hides the username of the builder for security etc. |
| 491 | 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)}) | ||
| 492 | self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) | ||
| 493 | |||
| 491 | 494 | ||
| 492 | class Linux_i686Manifest(LinuxManifest): | 495 | class Linux_i686Manifest(LinuxManifest): |
| 493 | def construct(self): | 496 | def construct(self): |