diff options
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 104 |
1 files changed, 71 insertions, 33 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index c13cf1a..01e422f 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -232,21 +232,15 @@ class WindowsManifest(ViewerManifest): | |||
232 | 232 | ||
233 | def construct(self): | 233 | def construct(self): |
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 | # Come out, come out, where ever you are. |
236 | # nor do we have a fixed name for the executable | 236 | executable = self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', './imprudence-bin.exe') |
237 | # Actually, we know on both counts -- MC | 237 | nmake = False |
238 | if self.configuration().lower() == "release": | 238 | self.path(executable, dst=self.final_exe()) |
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()) | ||
248 | 239 | ||
249 | # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied | 240 | # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied |
241 | # Don't think this ever worked, the destination seems bogus. | ||
242 | # It's trying to copy a built file outside of the source tree, a file we have anyway. | ||
243 | # TODO - do we even need this? | ||
250 | symbol_ver = '.'.join(self.args['version']) | 244 | symbol_ver = '.'.join(self.args['version']) |
251 | symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration']) | 245 | symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration']) |
252 | symbol_path = '../../../../../pdb_files/%s' % (symbol_file) | 246 | symbol_path = '../../../../../pdb_files/%s' % (symbol_file) |
@@ -255,26 +249,28 @@ class WindowsManifest(ViewerManifest): | |||
255 | else: | 249 | else: |
256 | #print "%s doesn't exist yet" % (os.getcwd() + symbol_path) | 250 | #print "%s doesn't exist yet" % (os.getcwd() + symbol_path) |
257 | try: | 251 | try: |
258 | self.path(self.find_existing_file('release/imprudence-bin.pdb'), dst="../%s" % (symbol_path)) | 252 | self.path(self.find_existing_file(executable.split('/', 1)[0] % '/imprudence-bin.pdb'), dst="../%s" % (symbol_path)) |
259 | pass | 253 | pass |
260 | except: | 254 | except: |
261 | print "Can't save symbol file %s, skipping" % (symbol_path) | 255 | print "Can't save symbol file %s, skipping" % (symbol_path) |
262 | pass | 256 | pass |
263 | 257 | ||
264 | self.gather_documents() | 258 | self.gather_documents() |
265 | 259 | ||
266 | if self.prefix("../..", dst="doc"): | 260 | if self.prefix("../..", dst="doc"): |
267 | self.path("LICENSE-libraries.txt") | 261 | self.path("LICENSE-libraries.txt") |
268 | self.end_prefix("../..") | 262 | self.end_prefix("../..") |
269 | 263 | ||
270 | |||
271 | self.path("imprudence.url") | 264 | self.path("imprudence.url") |
272 | 265 | ||
273 | # Plugin host application | 266 | # Plugin host application |
274 | self.path(os.path.join(os.pardir, | 267 | try: |
275 | 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), | 268 | self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe") |
276 | "SLPlugin.exe") | 269 | except: |
277 | 270 | # Probably an nmake build, which is not putting exe's into the configuration folders. | |
271 | self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', "SLPlugin.exe"), "SLPlugin.exe") | ||
272 | # Propogate our wild guess. | ||
273 | nmake = True | ||
278 | 274 | ||
279 | self.path("featuretable.txt") | 275 | self.path("featuretable.txt") |
280 | 276 | ||
@@ -283,17 +279,17 @@ class WindowsManifest(ViewerManifest): | |||
283 | 279 | ||
284 | # For using FMOD for sound... DJS | 280 | # For using FMOD for sound... DJS |
285 | #self.path("fmod.dll") | 281 | #self.path("fmod.dll") |
286 | 282 | ||
287 | # For spellchecking | 283 | # For spellchecking |
288 | if self.prefix(src=self.args['configuration'], dst=""): | 284 | if self.prefix(self.args['configuration'], dst=""): |
289 | self.path("libhunspell.dll") | 285 | self.path("libhunspell.dll") |
290 | self.end_prefix() | 286 | self.end_prefix() |
291 | 287 | ||
292 | # Copy the llkdu DSO .config | 288 | # Copy the llkdu DSO .config |
293 | self.path("llkdu.dll.2.config") | 289 | self.path("llkdu.dll.2.config") |
294 | 290 | ||
295 | # Get llcommon and deps. | 291 | # Get llcommon and deps. |
296 | if self.prefix(src=self.args['configuration'], dst=""): | 292 | if self.prefix(self.args['configuration'], dst=""): |
297 | self.path('libapr-1.dll') | 293 | self.path('libapr-1.dll') |
298 | self.path('libaprutil-1.dll') | 294 | self.path('libaprutil-1.dll') |
299 | self.path('libapriconv-1.dll') | 295 | self.path('libapriconv-1.dll') |
@@ -309,23 +305,28 @@ class WindowsManifest(ViewerManifest): | |||
309 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): | 305 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): |
310 | self.path("openal32.dll") | 306 | self.path("openal32.dll") |
311 | self.path("alut.dll") | 307 | self.path("alut.dll") |
312 | self.end_prefix() | 308 | self.end_prefix() |
313 | 309 | ||
310 | # TODO - Yes, I know, would be better if nmake builds put stuff in the right place, track that down and fix it later. | ||
311 | if nmake: | ||
312 | config = '' | ||
313 | else: | ||
314 | config = self.args['configuration'] | ||
314 | # Media plugins - QuickTime | 315 | # Media plugins - QuickTime |
315 | if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): | 316 | if self.prefix(src='../media_plugins/quicktime/%s' % config, dst="llplugin"): |
316 | self.path("media_plugin_quicktime.dll") | 317 | self.path("media_plugin_quicktime.dll") |
317 | self.end_prefix() | 318 | self.end_prefix() |
318 | 319 | ||
319 | # Media plugins - WebKit/Qt | 320 | # Media plugins - WebKit/Qt |
320 | if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): | 321 | if self.prefix(src='../media_plugins/webkit/%s' % config, dst="llplugin"): |
321 | self.path("media_plugin_webkit.dll") | 322 | self.path("media_plugin_webkit.dll") |
322 | self.end_prefix() | 323 | self.end_prefix() |
323 | 324 | ||
324 | # Media plugins - GStreamer | 325 | # Media plugins - GStreamer |
325 | if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"): | 326 | if self.prefix(src='../media_plugins/gstreamer010/%s' % config, dst="llplugin"): |
326 | self.path("media_plugin_gstreamer010.dll") | 327 | self.path("media_plugin_gstreamer010.dll") |
327 | self.end_prefix() | 328 | self.end_prefix() |
328 | 329 | ||
329 | # For WebKit/Qt plugin runtimes | 330 | # For WebKit/Qt plugin runtimes |
330 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): | 331 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): |
331 | self.path("libeay32.dll") | 332 | self.path("libeay32.dll") |
@@ -476,13 +477,15 @@ class WindowsManifest(ViewerManifest): | |||
476 | sse_string = "-(SSE2-optimized)" | 477 | sse_string = "-(SSE2-optimized)" |
477 | 478 | ||
478 | version = '.'.join(self.args['version']) | 479 | version = '.'.join(self.args['version']) |
479 | base_filename = self.installer_prefix() + version + sse_string | 480 | version_number = version.split('-', 1)[0] |
481 | base_filename = self.installer_prefix() + version + "-Windows-x86" + sse_string | ||
480 | app_name = self.channel() | 482 | app_name = self.channel() |
481 | app_ver_name="%s %s" % (app_name, version) | 483 | app_ver_name="%s %s" % (app_name, version) |
482 | 484 | ||
483 | new_script = base_filename + ".iss" | 485 | new_script = base_filename + ".iss" |
484 | self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, { | 486 | self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, { |
485 | "%%VERSION%%":version, | 487 | "%%VERSION%%":version, |
488 | "%%VERSIONNUMBER%%":version_number, | ||
486 | "%%INSTALLERFILENAME%%":base_filename, | 489 | "%%INSTALLERFILENAME%%":base_filename, |
487 | "%%PACKAGEFILES%%":self.args['dest'], | 490 | "%%PACKAGEFILES%%":self.args['dest'], |
488 | "%%APPNAME%%":app_name, | 491 | "%%APPNAME%%":app_name, |
@@ -1020,9 +1023,27 @@ class Linux_i686Manifest(LinuxManifest): | |||
1020 | #self.path("libgstvolume.so") | 1023 | #self.path("libgstvolume.so") |
1021 | #self.path("libgstvorbis.so") | 1024 | #self.path("libgstvorbis.so") |
1022 | #self.path("libgstwavparse.so") | 1025 | #self.path("libgstwavparse.so") |
1023 | 1026 | ||
1024 | #self.end_prefix("gstreamer-plugins") | 1027 | #self.end_prefix("gstreamer-plugins") |
1025 | 1028 | ||
1029 | # Wish I could kill it with fire. lol | ||
1030 | self.path("libboost_date_time-mt.so") | ||
1031 | self.path("libboost_date_time-mt.so.1.52.0") | ||
1032 | self.path("libboost_filesystem-mt.so") | ||
1033 | self.path("libboost_filesystem-mt.so.1.52.0") | ||
1034 | self.path("libboost_iostreams-mt.so") | ||
1035 | self.path("libboost_iostreams-mt.so.1.52.0") | ||
1036 | self.path("libboost_program_options-mt.so") | ||
1037 | self.path("libboost_program_options-mt.so.1.52.0") | ||
1038 | self.path("libboost_regex-mt.so") | ||
1039 | self.path("libboost_regex-mt.so.1.52.0") | ||
1040 | self.path("libboost_signals-mt.so") | ||
1041 | self.path("libboost_signals-mt.so.1.52.0") | ||
1042 | self.path("libboost_system-mt.so") | ||
1043 | self.path("libboost_system-mt.so.1.52.0") | ||
1044 | self.path("libboost_thread-mt.so") | ||
1045 | self.path("libboost_thread-mt.so.1.52.0") | ||
1046 | |||
1026 | self.end_prefix("lib") | 1047 | self.end_prefix("lib") |
1027 | 1048 | ||
1028 | # Vivox runtimes and libs | 1049 | # Vivox runtimes and libs |
@@ -1123,6 +1144,23 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
1123 | #self.path("libgsttag-0.10.so.0") | 1144 | #self.path("libgsttag-0.10.so.0") |
1124 | #self.path("libgstvideo-0.10.so.0") | 1145 | #self.path("libgstvideo-0.10.so.0") |
1125 | 1146 | ||
1147 | # Wish I could kill it with fire. lol | ||
1148 | self.path("libboost_date_time-mt.so") | ||
1149 | self.path("libboost_date_time-mt.so.1.52.0") | ||
1150 | self.path("libboost_filesystem-mt.so") | ||
1151 | self.path("libboost_filesystem-mt.so.1.52.0") | ||
1152 | self.path("libboost_iostreams-mt.so") | ||
1153 | self.path("libboost_iostreams-mt.so.1.52.0") | ||
1154 | self.path("libboost_program_options-mt.so") | ||
1155 | self.path("libboost_program_options-mt.so.1.52.0") | ||
1156 | self.path("libboost_regex-mt.so") | ||
1157 | self.path("libboost_regex-mt.so.1.52.0") | ||
1158 | self.path("libboost_signals-mt.so") | ||
1159 | self.path("libboost_signals-mt.so.1.52.0") | ||
1160 | self.path("libboost_system-mt.so") | ||
1161 | self.path("libboost_system-mt.so.1.52.0") | ||
1162 | self.path("libboost_thread-mt.so") | ||
1163 | self.path("libboost_thread-mt.so.1.52.0") | ||
1126 | 1164 | ||
1127 | self.end_prefix("lib64") | 1165 | self.end_prefix("lib64") |
1128 | 1166 | ||