From a167b551843d64e9765075100fb278c2a5e8809c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 18 Apr 2012 22:32:35 -0700
Subject: [PATCH] rearrange dictionary copying
---
indra/newview/viewer_manifest.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c88dbd97b13..5f687f3ac77 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -51,6 +51,11 @@ def construct(self):
self.exclude("*.svn*")
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 dictionary 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"):
@@ -91,11 +96,6 @@ def construct(self):
# ... and the entire windlight directory
self.path("windlight")
- # ... and the pre-installed spell checking dictionaries
- dictdir = os.path.join(os.pardir, os.pardir, self.args['configuration'], 'packages/dictionaries')
- print "Trying dictionary relative to %s with %s" % (self.get_build_prefix(), dictdir);
- self.path(src=dictdir,
- dst="dictionaries")
self.end_prefix("app_settings")
if self.prefix(src="character"):
--
GitLab