diff options
| author | McCabe Maxsted | 2011-09-23 20:06:24 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-09-23 20:06:24 -0700 |
| commit | b97bcdd6aa3aecb530a9af0cc9d150d969096883 (patch) | |
| tree | 437c5b92e5a2b3ac595ab97b5b0f4355dffe60c5 /linden | |
| parent | Fixed the script editor constantly searching for an update that doesn't exist... (diff) | |
| download | meta-impy-b97bcdd6aa3aecb530a9af0cc9d150d969096883.zip meta-impy-b97bcdd6aa3aecb530a9af0cc9d150d969096883.tar.gz meta-impy-b97bcdd6aa3aecb530a9af0cc9d150d969096883.tar.bz2 meta-impy-b97bcdd6aa3aecb530a9af0cc9d150d969096883.tar.xz | |
Fixed packaging script not finding the right .exe for a congiguration
Diffstat (limited to 'linden')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 11f9098..a0b9d77 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -234,7 +234,17 @@ class WindowsManifest(ViewerManifest): | |||
| 234 | super(WindowsManifest, self).construct() | 234 | super(WindowsManifest, self).construct() |
| 235 | # the final exe is complicated because we're not sure where it's coming from, | 235 | # the final exe is complicated because we're not sure where it's coming from, |
| 236 | # nor do we have a fixed name for the executable | 236 | # nor do we have a fixed name for the executable |
| 237 | self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) | 237 | # Actually, we know on both counts -- MC |
| 238 | if self.configuration().lower() == "release": | ||
| 239 | self.path(self.find_existing_file('release/imprudence-bin.exe'), dst=self.final_exe()) | ||
| 240 | elif self.configuration().lower() == "releasesse2": | ||
| 241 | self.path(self.find_existing_file('releasesse2/imprudence-bin.exe'), dst=self.final_exe()) | ||
| 242 | elif self.configuration().lower() == "relwithdebinfo": | ||
| 243 | self.path(self.find_existing_file('relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) | ||
| 244 | elif self.configuration().lower() == "debug": | ||
| 245 | self.path(self.find_existing_file('debug/imprudence-bin.exe'), dst=self.final_exe()) | ||
| 246 | else: | ||
| 247 | self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe'), dst=self.final_exe()) | ||
| 238 | 248 | ||
| 239 | # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied | 249 | # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied |
| 240 | symbol_ver = '.'.join(self.args['version']) | 250 | symbol_ver = '.'.join(self.args['version']) |