diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-29 16:57:02 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-29 16:57:02 -0800 |
| commit | 00e19205e94d416a353712ca6e3d83f84981d318 (patch) | |
| tree | b08d518a48b3f2c22d041c42c048074765d45931 /indra | |
| parent | ece58a9dc0682968b425b5f316078ddb4dba8020 (diff) | |
| parent | ee981dd58103f7ee332ff264031b4cca0c85e759 (diff) | |
CHOP-223 : Pull into viewer-beta
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/scripts/darwin/update_install | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/scripts/linux/update_install | 0 |
3 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1bc118139f..6c77f8ec38 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -711,6 +711,11 @@ class DarwinManifest(ViewerManifest): self.run_command('strip -S %(viewer_binary)r' % { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')}) + 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 'Contents/MacOS/update_install',: + self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own @@ -866,6 +871,12 @@ class LinuxManifest(ViewerManifest): self.path("featuretable_linux.txt") + 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': + self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) + def package_finish(self): if 'installer_name' in self.args: installer_name = self.args['installer_name'] diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install index b174b3570a..b174b3570a 100644..100755 --- a/indra/viewer_components/updater/scripts/darwin/update_install +++ b/indra/viewer_components/updater/scripts/darwin/update_install diff --git a/indra/viewer_components/updater/scripts/linux/update_install b/indra/viewer_components/updater/scripts/linux/update_install index fef5ef7d09..fef5ef7d09 100644..100755 --- a/indra/viewer_components/updater/scripts/linux/update_install +++ b/indra/viewer_components/updater/scripts/linux/update_install |