diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-01-11 12:24:44 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-01-11 12:24:44 -0500 |
| commit | 83f625445b87b8c5cb53c1a152f03402c0606dee (patch) | |
| tree | 71e471cca2522ae6bec4885d9278934a6551aac8 /indra/newview/viewer_manifest.py | |
| parent | 6e9782f79f6d3cac2bfeb72c6cd43b409020c76e (diff) | |
MAINT-1481: Remove xmenity script and viewer_manifest.py references.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bc623aee00..e7108141ee 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -970,7 +970,6 @@ class LinuxManifest(ViewerManifest): self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin") self.path2basename("../llplugin/slplugin", "SLPlugin") self.path2basename("../viewer_components/updater/scripts/linux", "update_install") - self.path2basename("../viewer_components/updater/scripts/linux", "xmenity") self.end_prefix("bin") if self.prefix("res-sdl"): @@ -1001,7 +1000,7 @@ class LinuxManifest(ViewerManifest): def copy_finish(self): # Force executable permissions to be set for scripts # see CHOP-223 and http://mercurial.selenic.com/bts/issue1802 - for script in 'secondlife', 'bin/update_install', 'bin/xmenity': + for script in 'secondlife', 'bin/update_install': self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): @@ -1055,7 +1054,7 @@ class LinuxManifest(ViewerManifest): def strip_binaries(self): if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer(): print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" - self.run_command(r"find %(d)r/bin %(d)r/lib -type f \! \( -name update_install -o -name xmenity \) | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure + self.run_command(r"find %(d)r/bin %(d)r/lib -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure class Linux_i686Manifest(LinuxManifest): def construct(self): |