diff options
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index abd3b269f6..c7d2cb7318 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -409,7 +409,7 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create "%(sparse)s" -volname "%(channel)s" -fs HFS+ -type SPARSE -megabytes 300' % { + self.run_command('hdiutil create "%(sparse)s" -volname "%(channel)s" -fs HFS+ -type SPARSE -megabytes 300 -layout SPUD' % { 'sparse':sparsename, 'channel':channel_standin}) @@ -523,13 +523,14 @@ class Linux_x86_64Manifest(LinuxManifest): super(Linux_x86_64Manifest, self).construct() self.path("secondlife-x86_64-bin-stripped","bin/do-not-directly-run-secondlife-bin") self.path("../linux_crash_logger/linux-crash-logger-x86_64-bin-stripped","linux-crash-logger.bin") - # TODO: I get the sense that this isn't fully fleshed out - if self.prefix("../../libraries/x86_64-linux/lib_release_client", "lib"): - self.path("libkdu_v42R.so") - self.path("libxmlrpc.so.0") - # self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason - self.end_prefix("lib") + self.path("linux_tools/launch_url.sh","launch_url.sh") + if self.prefix("res-sdl"): + self.path("*") + # recurse + self.end_prefix("res-sdl") + self.path("featuretable_linux.txt") + self.path("secondlife-i686.supp") if __name__ == "__main__": main(srctree=viewer_dir, dsttree=os.path.join(viewer_dir, "packaged")) |