From 9c66ac87fd46db3987e60ae50989b2497099480b Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 20 Jan 2012 18:06:32 +0100 Subject: STORM-276 Basic spellchecking framework --- indra/newview/viewer_manifest.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0931c4ec9b..1b732676e4 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -91,6 +91,8 @@ class ViewerManifest(LLManifest): # ... and the entire windlight directory self.path("windlight") + # ... and the pre-installed spell checking dictionaries + self.path("dictionaries") self.end_prefix("app_settings") if self.prefix(src="character"): @@ -393,6 +395,9 @@ class WindowsManifest(ViewerManifest): self.path("ssleay32.dll") self.path("libeay32.dll") + # Hunspell + self.path("libhunspell.dll") + # For google-perftools tcmalloc allocator. try: if self.args['configuration'].lower() == 'debug': @@ -659,6 +664,7 @@ class DarwinManifest(ViewerManifest): # copy additional libs in /Contents/MacOS/ self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib") + self.path("../packages/lib/release/libhunspell-1.3.dylib", dst="Resources/libhunspell-1.3.dylib") self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install") @@ -1053,6 +1059,8 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenjpeg.so.1.4.0") self.path("libopenjpeg.so.1") self.path("libopenjpeg.so") + self.path("libhunspell-1.3.so") + self.path("libhunspell-1.3.so.0") self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname -- cgit v1.2.3 From 15ec54b1daef88881b0dc9acb0e14290be8e9e5d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 27 Jan 2012 11:04:13 -0500 Subject: Fix for linux build failure when tcmalloc disabled --- indra/newview/viewer_manifest.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) mode change 100644 => 100755 indra/newview/viewer_manifest.py (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py old mode 100644 new mode 100755 index 0931c4ec9b..43abae63f1 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1057,9 +1057,15 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname self.path("libfontconfig.so.1.4.4") - self.path("libtcmalloc.so", "libtcmalloc.so") #formerly called google perf tools - self.path("libtcmalloc.so.0", "libtcmalloc.so.0") #formerly called google perf tools - self.path("libtcmalloc.so.0.1.0", "libtcmalloc.so.0.1.0") #formerly called google perf tools + try: + self.path("libtcmalloc.so", "libtcmalloc.so") #formerly called google perf tools + self.path("libtcmalloc.so.0", "libtcmalloc.so.0") #formerly called google perf tools + self.path("libtcmalloc.so.0.1.0", "libtcmalloc.so.0.1.0") #formerly called google perf tools + pass + except: + print "tcmalloc files not found, skipping" + pass + try: self.path("libfmod-3.75.so") pass -- cgit v1.2.3 From 3af3d5e83c81ecfa77735e6811470d1aa0f705da Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 30 Mar 2012 15:07:46 -0400 Subject: move all dictionaries to the prebuilt package, and install from there --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1b732676e4..a59b763910 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -92,7 +92,7 @@ class ViewerManifest(LLManifest): # ... and the entire windlight directory self.path("windlight") # ... and the pre-installed spell checking dictionaries - self.path("dictionaries") + self.path("../../packages/dictionaries", dst="dictionaries") self.end_prefix("app_settings") if self.prefix(src="character"): -- cgit v1.2.3 From f28ee5bd4f6c82e8113c4cb413f163594c047fee Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 13 Apr 2012 16:23:22 -0400 Subject: try a different path for the dictionaries package? --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a59b763910..5c9c7395c8 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -92,7 +92,7 @@ class ViewerManifest(LLManifest): # ... and the entire windlight directory self.path("windlight") # ... and the pre-installed spell checking dictionaries - self.path("../../packages/dictionaries", dst="dictionaries") + self.path("../packages/dictionaries", dst="dictionaries") self.end_prefix("app_settings") if self.prefix(src="character"): -- cgit v1.2.3 From 83717183c57121167b671f7bdcc4ab3122b95846 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 13 Apr 2012 17:25:52 -0400 Subject: yet another path for the dictionaries package... --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5c9c7395c8..f6245fedfb 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -92,7 +92,7 @@ class ViewerManifest(LLManifest): # ... and the entire windlight directory self.path("windlight") # ... and the pre-installed spell checking dictionaries - self.path("../packages/dictionaries", dst="dictionaries") + self.path("../../../packages/dictionaries", dst="dictionaries") self.end_prefix("app_settings") if self.prefix(src="character"): -- cgit v1.2.3 From 1055edb9ea67d645325fc5bbc01a9ec1e0238ed0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 18 Apr 2012 19:25:25 -0700 Subject: add logging to diagnose path problem --- indra/newview/viewer_manifest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f6245fedfb..d2cd644175 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -92,7 +92,10 @@ class ViewerManifest(LLManifest): # ... and the entire windlight directory self.path("windlight") # ... and the pre-installed spell checking dictionaries - self.path("../../../packages/dictionaries", dst="dictionaries") + dictdir = os.path.join(os.pardir, os.pardir, self.args['configuration'], 'packages/dictionaries') + print "Trying dictionary relative to %s with %s" % (get_build_prefix(), dictdir); + self.path(src=dictdir, + dst="dictionaries") self.end_prefix("app_settings") if self.prefix(src="character"): -- cgit v1.2.3 From df38250c3c6bae08b36fac7b12a8238a805e46a3 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 18 Apr 2012 20:17:07 -0700 Subject: fix logging to diagnose path problem --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d2cd644175..c88dbd97b1 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -93,7 +93,7 @@ class ViewerManifest(LLManifest): 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" % (get_build_prefix(), dictdir); + print "Trying dictionary relative to %s with %s" % (self.get_build_prefix(), dictdir); self.path(src=dictdir, dst="dictionaries") self.end_prefix("app_settings") -- cgit v1.2.3 From a167b551843d64e9765075100fb278c2a5e8809c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 18 Apr 2012 22:32:35 -0700 Subject: rearrange dictionary copying --- indra/newview/viewer_manifest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c88dbd97b1..5f687f3ac7 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -51,6 +51,11 @@ class ViewerManifest(LLManifest): 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 @@ class ViewerManifest(LLManifest): # ... 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"): -- cgit v1.2.3 From b02132f927c29187e1031f38ef8884f86f115132 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 19 Apr 2012 05:08:19 -0700 Subject: missing paren in dictionary copying --- indra/newview/viewer_manifest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5f687f3ac7..7c0358311b 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -51,11 +51,11 @@ class ViewerManifest(LLManifest): 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") + 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"): -- cgit v1.2.3 From 9e477c595c893b4bfe1f84cf0f5ef426eb751555 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 19 Apr 2012 05:55:00 -0700 Subject: try forcing use of build prefix to copy dictionaries --- indra/newview/viewer_manifest.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7c0358311b..cc55e1512b 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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"): -- cgit v1.2.3 From c6e095a32630aa2554f7e63cc9688bb063f9461a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 19 Apr 2012 06:53:26 -0700 Subject: use build directory argument directly --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cc55e1512b..86d542029a 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -92,8 +92,8 @@ 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') + # ... and the included spell checking dictionaries + pkgdir = os.path.join(self.args['build'], '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"); -- cgit v1.2.3 From 2862efc36791855d002d75039905c83a8e0b7236 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 19 Apr 2012 07:55:39 -0700 Subject: reference packages relative to newview --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 86d542029a..fb1c88340f 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -93,7 +93,7 @@ class ViewerManifest(LLManifest): self.path("windlight") # ... and the included spell checking dictionaries - pkgdir = os.path.join(self.args['build'], 'packages') + pkgdir = os.path.join(self.args['build'], os.pardir(), '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"); -- cgit v1.2.3 From 3dfa725c5bdf16da75d3820422d2ce5263df19a8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 19 Apr 2012 08:31:09 -0700 Subject: grumble relative grumble python grumble --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index fb1c88340f..7a3619ccd8 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -93,7 +93,7 @@ class ViewerManifest(LLManifest): self.path("windlight") # ... and the included spell checking dictionaries - pkgdir = os.path.join(self.args['build'], os.pardir(), 'packages') + pkgdir = os.path.join(self.args['build'], os.pardir, '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"); -- cgit v1.2.3 From 01cd6614484a38b974c2bbd692ccd3e0b1b2fc58 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 15:52:15 -0400 Subject: remove debugging prints around packaging the dictionaries --- indra/newview/viewer_manifest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7a3619ccd8..56933bbd21 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -94,11 +94,10 @@ class ViewerManifest(LLManifest): # ... and the included spell checking dictionaries pkgdir = os.path.join(self.args['build'], os.pardir, '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"): -- cgit v1.2.3 From b93c9d8ba0792b6f63776301dc60a2ac8a4453ca Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 16:01:45 -0400 Subject: correct mac hunspell lib name, try simpler reference to dictionaries --- indra/newview/viewer_manifest.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 56933bbd21..8fe39bafdd 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -93,10 +93,11 @@ class ViewerManifest(LLManifest): self.path("windlight") # ... and the included spell checking dictionaries - pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') - if self.prefix(src=pkgdir,dst=""): - self.path("dictionaries") - self.end_prefix(pkgdir) + #pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') + #if self.prefix(src=pkgdir,dst=""): + # self.path("dictionaries") + # self.end_prefix(pkgdir) + self.path(src="../packages/dictionaries", dst="dictionaries") self.end_prefix("app_settings") @@ -669,7 +670,7 @@ class DarwinManifest(ViewerManifest): # copy additional libs in /Contents/MacOS/ self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib") - self.path("../packages/lib/release/libhunspell-1.3.dylib", dst="Resources/libhunspell-1.3.dylib") + self.path("../packages/lib/release/libhunspell-1.3.0.dylib", dst="Resources/libhunspell-1.3.0.dylib") self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install") -- cgit v1.2.3 From 22d84a68335528d00ce61ec84583eb55f32a3545 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 16:39:09 -0400 Subject: go back to the more elaborate way to find dictionaries (the way that works) --- indra/newview/viewer_manifest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8fe39bafdd..58522c091d 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -93,11 +93,10 @@ class ViewerManifest(LLManifest): self.path("windlight") # ... and the included spell checking dictionaries - #pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') - #if self.prefix(src=pkgdir,dst=""): - # self.path("dictionaries") - # self.end_prefix(pkgdir) - self.path(src="../packages/dictionaries", dst="dictionaries") + pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') + if self.prefix(src=pkgdir,dst=""): + self.path("dictionaries") + self.end_prefix(pkgdir) self.end_prefix("app_settings") -- cgit v1.2.3 From 8a7fa77f23b94f9ba2cb6da1942e4f86da314b5a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 25 Jun 2012 22:56:58 -0400 Subject: correct linux packaging for hunspell library --- indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f0a63a009d..7c6b5403e1 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1058,6 +1058,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdirect-1.4.so.5") self.path("libhunspell-1.3.so") self.path("libhunspell-1.3.so.0") + self.path("libhunspell-1.3.so.0.0.0") self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname -- cgit v1.2.3