diff options
| author | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
| commit | d57cb15edd7fc0b12945629aef518f0d340c2f5d (patch) | |
| tree | 867c4a793128976daf207a7d3624d25eaba76d72 /linden/indra/newview/viewer_manifest.py | |
| parent | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into next (diff) | |
| parent | Removed viewerversion.xml, since it's not used anymore. (diff) | |
| download | meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.zip meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.gz meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.bz2 meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.xz | |
Merge branch 'viewerinfo' into next
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 0f129dd..5e1e816 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -585,7 +585,8 @@ class DarwinManifest(ViewerManifest): | |||
| 585 | 585 | ||
| 586 | if self.prefix(src="", dst="Contents"): # everything goes in Contents | 586 | if self.prefix(src="", dst="Contents"): # everything goes in Contents |
| 587 | 587 | ||
| 588 | self.path("Info-Imprudence.plist", dst="Info.plist") | 588 | # Info.plist goes directly in Contents |
| 589 | self.path("packaging/mac/Info.plist", dst="Info.plist") | ||
| 589 | 590 | ||
| 590 | # copy additional libs in <bundle>/Contents/MacOS/ | 591 | # copy additional libs in <bundle>/Contents/MacOS/ |
| 591 | if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): | 592 | if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): |
| @@ -653,27 +654,27 @@ class DarwinManifest(ViewerManifest): | |||
| 653 | self.gather_documents() | 654 | self.gather_documents() |
| 654 | 655 | ||
| 655 | self.path("featuretable_mac.txt") | 656 | self.path("featuretable_mac.txt") |
| 656 | self.path("SecondLife.nib") | ||
| 657 | |||
| 658 | self.path("viewer.icns") | 657 | self.path("viewer.icns") |
| 659 | 658 | ||
| 660 | # Translations | 659 | if self.prefix(src="packaging/mac", dst=""): |
| 661 | self.path("English.lproj") | 660 | self.path("SecondLife.nib") |
| 662 | self.path("German.lproj") | 661 | self.path("English.lproj") |
| 663 | self.path("Japanese.lproj") | 662 | self.path("German.lproj") |
| 664 | self.path("Korean.lproj") | 663 | self.path("Japanese.lproj") |
| 665 | self.path("da.lproj") | 664 | self.path("Korean.lproj") |
| 666 | self.path("es.lproj") | 665 | self.path("da.lproj") |
| 667 | self.path("fr.lproj") | 666 | self.path("es.lproj") |
| 668 | self.path("hu.lproj") | 667 | self.path("fr.lproj") |
| 669 | self.path("it.lproj") | 668 | self.path("hu.lproj") |
| 670 | self.path("nl.lproj") | 669 | self.path("it.lproj") |
| 671 | self.path("pl.lproj") | 670 | self.path("nl.lproj") |
| 672 | self.path("pt.lproj") | 671 | self.path("pl.lproj") |
| 673 | self.path("ru.lproj") | 672 | self.path("pt.lproj") |
| 674 | self.path("tr.lproj") | 673 | self.path("ru.lproj") |
| 675 | self.path("uk.lproj") | 674 | self.path("tr.lproj") |
| 676 | self.path("zh-Hans.lproj") | 675 | self.path("uk.lproj") |
| 676 | self.path("zh-Hans.lproj") | ||
| 677 | self.end_prefix("packaging/mac") | ||
| 677 | 678 | ||
| 678 | 679 | ||
| 679 | # if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"): | 680 | # if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"): |