diff options
| author | Robin Cornelius | 2010-10-09 10:22:23 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-09 15:58:14 +0100 |
| commit | 1924ac57d991dc00ef7eb7c121ac7e7064b29717 (patch) | |
| tree | e44dc50434f329b37d2144fe42c7e7f13da87a8f | |
| parent | Fix some STL errors highlighted by MSVC debug (diff) | |
| download | meta-impy-1924ac57d991dc00ef7eb7c121ac7e7064b29717.zip meta-impy-1924ac57d991dc00ef7eb7c121ac7e7064b29717.tar.gz meta-impy-1924ac57d991dc00ef7eb7c121ac7e7064b29717.tar.bz2 meta-impy-1924ac57d991dc00ef7eb7c121ac7e7064b29717.tar.xz | |
Add a fall back to find NSIS on win64
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 7563268..f01cd7a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -517,8 +517,12 @@ class WindowsManifest(ViewerManifest): | |||
| 517 | 517 | ||
| 518 | # We use the Unicode version of NSIS, available from | 518 | # We use the Unicode version of NSIS, available from |
| 519 | # http://www.scratchpaper.com/ | 519 | # http://www.scratchpaper.com/ |
| 520 | NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe' | 520 | try: |
| 521 | self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) | 521 | NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe' |
| 522 | self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) | ||
| 523 | except: | ||
| 524 | NSIS_path = 'C:\\Program Files (x86)\\NSIS\\Unicode\\makensis.exe' | ||
| 525 | self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) | ||
| 522 | # self.remove(self.dst_path_of(tempfile)) | 526 | # self.remove(self.dst_path_of(tempfile)) |
| 523 | # If we're on a build machine, sign the code using our Authenticode certificate. JC | 527 | # If we're on a build machine, sign the code using our Authenticode certificate. JC |
| 524 | sign_py = 'C:\\buildscripts\\code-signing\\sign.py' | 528 | sign_py = 'C:\\buildscripts\\code-signing\\sign.py' |