livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try forcing use of build prefix to copy dictionaries

meow-7.2.2
Oz Linden 2012-04-19 05:55:00 -07:00
parent b02132f927
commit 9e477c595c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/viewer_manifest.py
View File

@ -52,11 +52,6 @@ class ViewerManifest(LLManifest):
self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
# add the pre-installed spell checking dictionaries
dictdir = os.path.join(os.pardir, 'packages', 'dictionaries')
print "Trying dictionaries relative to %s with %s" % (self.get_src_prefix(), dictdir)
self.path(src=dictdir, dst=os.path.join("app_settings","dictionaries"))
if self.is_packaging_viewer():
if self.prefix(src="app_settings"):
self.exclude("logcontrol.xml")
@ -96,6 +91,14 @@ class ViewerManifest(LLManifest):
# ... and the entire windlight directory
self.path("windlight")
# ... and the pre-installed spell checking dictionaries
pkgdir = os.path.join(self.get_build_prefix(), 'packages')
print "Trying to change src to %s" % (pkgdir);
if self.prefix(src=pkgdir,dst=""):
print "Trying dictionaries relative to %s with %s" % (self.get_src_prefix(), "dictionaries");
self.path("dictionaries")
self.end_prefix(pkgdir)
self.end_prefix("app_settings")
if self.prefix(src="character"):