From a630008d05e813d1fe5ceda5f8511b7aed8b543a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 30 Nov 2008 16:32:43 -0600 Subject: Package up README.txt, etc. on Linux. --- linden/indra/newview/viewer_manifest.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/viewer_manifest.py') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index be28809..bf2c5be 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -525,7 +525,7 @@ class DarwinManifest(ViewerManifest): class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() - self.path("licenses-linux.txt","licenses.txt") + self.path("res/imprudence_icon.png","imprudence_icon.png") if self.prefix("linux_tools", dst=""): self.path("client-readme.txt","README-linux.txt") @@ -535,6 +535,29 @@ class LinuxManifest(ViewerManifest): self.path("register_secondlifeprotocol.sh") self.end_prefix("linux_tools") + # Top level directory (imprudence) + if self.prefix("../../..", dst=""): + self.path("README.txt", "README-Imprudence.txt") + self.path("MANIFESTO.txt") + self.path("CONTRIBUTE.txt") + self.path("ChangeLog.txt") + self.end_prefix("../../..") + + # linden directory + if self.prefix("../..", dst="doc"): + self.path("LICENSE-source.txt") + self.path("LICENSE-logos.txt","LICENSE-artwork.txt") + self.path("LICENSE-libraries-linux.txt") + self.end_prefix("../..") + + # linden/doc directory + if self.prefix("../../doc", dst="doc"): + self.path("contributions.txt") + self.path("GPL-license.txt", "GPL.txt") + self.path("FLOSS-exception.txt") + self.end_prefix("../../doc") + + # Create an appropriate gridargs.dat for this package, denoting required grid. self.put_in_file(self.flags_list(), 'gridargs.dat') -- cgit v1.1 From 8bc8c5f25823a33cef1a46fbd6fd61410f87c74d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 1 Dec 2008 17:34:32 -0600 Subject: Doc packaging moved to platform-independent manifest. --- linden/indra/newview/viewer_manifest.py | 61 ++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 20 deletions(-) (limited to 'linden/indra/newview/viewer_manifest.py') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index bf2c5be..f0b0b8d 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -99,6 +99,31 @@ class ViewerManifest(LLManifest): self.path("lsl_guide.html") self.path("gpu_table.txt") + + # Gather up the README file, etc. + def gather_documents(self): + # From the top level directory (imprudence) + if self.prefix("../../..", dst=""): + self.path("README.txt", "README-Imprudence.txt") + self.path("MANIFESTO.txt") + self.path("CONTRIBUTE.txt") + self.path("ChangeLog.txt") + self.end_prefix("../../..") + + # From the linden directory + if self.prefix("../..", dst="doc"): + self.path("LICENSE-source.txt") + self.path("LICENSE-logos.txt", "LICENSE-artwork.txt") + self.end_prefix("../..") + + # From the linden/doc directory + if self.prefix("../../doc", dst="doc"): + self.path("contributions.txt") + self.path("GPL-license.txt", "GPL.txt") + self.path("FLOSS-exception.txt") + self.end_prefix("../../doc") + + def login_channel(self): """Channel reported for login and upgrade purposes ONLY; used for A/B testing""" @@ -161,7 +186,13 @@ class WindowsManifest(ViewerManifest): #'../llkdu/relwithdebinfo/llkdu.dll', #'../../libraries/i686-win32/lib/release/llkdu.dll'), # dst='llkdu.dll') - self.path(src="licenses-win32.txt", dst="licenses.txt") + + self.gather_documents() + + if self.prefix("../..", dst="doc"): + self.path("LICENSE-libraries-win32.txt") + self.end_prefix("../..") + self.path("featuretable.txt") @@ -386,7 +417,13 @@ class DarwinManifest(ViewerManifest): self.path("*.tif") self.end_prefix("cursors_mac") - self.path("licenses-mac.txt", dst="licenses.txt") + # From the linden directory + if self.prefix("../..", dst="doc"): + self.path("LICENSE-libraries-mac.txt") + self.end_prefix("../..") + + self.gather_documents() + self.path("featuretable_mac.txt") self.path("SecondLife.nib") @@ -535,29 +572,13 @@ class LinuxManifest(ViewerManifest): self.path("register_secondlifeprotocol.sh") self.end_prefix("linux_tools") - # Top level directory (imprudence) - if self.prefix("../../..", dst=""): - self.path("README.txt", "README-Imprudence.txt") - self.path("MANIFESTO.txt") - self.path("CONTRIBUTE.txt") - self.path("ChangeLog.txt") - self.end_prefix("../../..") + self.gather_documents() - # linden directory + # From the linden directory if self.prefix("../..", dst="doc"): - self.path("LICENSE-source.txt") - self.path("LICENSE-logos.txt","LICENSE-artwork.txt") self.path("LICENSE-libraries-linux.txt") self.end_prefix("../..") - # linden/doc directory - if self.prefix("../../doc", dst="doc"): - self.path("contributions.txt") - self.path("GPL-license.txt", "GPL.txt") - self.path("FLOSS-exception.txt") - self.end_prefix("../../doc") - - # Create an appropriate gridargs.dat for this package, denoting required grid. self.put_in_file(self.flags_list(), 'gridargs.dat') -- cgit v1.1 From 567586af40a1683a3c89863c9dbedd2b3cc90897 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 1 Dec 2008 18:17:08 -0600 Subject: Fixed indentation for 'skins' prefix. --- linden/indra/newview/viewer_manifest.py | 46 ++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'linden/indra/newview/viewer_manifest.py') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index f0b0b8d..749cced 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -75,27 +75,31 @@ class ViewerManifest(LLManifest): self.path("*.txt") self.end_prefix("fonts") - # skins - if self.prefix(src="skins"): - self.path("paths.xml") - # include the entire textures directory recursively - if self.prefix(src="*/textures"): - self.path("*.tga") - self.path("*.j2c") - self.path("*.jpg") - self.path("*.png") - self.path("textures.xml") - self.end_prefix("*/textures") - self.path("*/xui/*/*.xml") - self.path("*/*.xml") - - # Local HTML files (e.g. loading screen) - if self.prefix(src="*/html"): - self.path("*.png") - self.path("*/*/*.html") - self.path("*/*/*.gif") - self.end_prefix("*/html") - self.end_prefix("skins") + # skins + if self.prefix(src="skins"): + self.path("paths.xml") + + # include the entire textures directory recursively + if self.prefix(src="*/textures"): + self.path("*.tga") + self.path("*.j2c") + self.path("*.jpg") + self.path("*.png") + self.path("textures.xml") + self.end_prefix("*/textures") + + self.path("*/xui/*/*.xml") + self.path("*/*.xml") + + # Local HTML files (e.g. loading screen) + if self.prefix(src="*/html"): + self.path("*.png") + self.path("*/*/*.html") + self.path("*/*/*.gif") + self.end_prefix("*/html") + + self.end_prefix("skins") + self.path("lsl_guide.html") self.path("gpu_table.txt") -- cgit v1.1 From c42d9f8c6fe91b890b7cb4a0001a585f09f932ca Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 17:12:22 -0600 Subject: README.txt will stay that name; README-linux.txt removed. --- linden/indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview/viewer_manifest.py') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 749cced..b0777f4 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -108,7 +108,7 @@ class ViewerManifest(LLManifest): def gather_documents(self): # From the top level directory (imprudence) if self.prefix("../../..", dst=""): - self.path("README.txt", "README-Imprudence.txt") + self.path("README.txt") self.path("MANIFESTO.txt") self.path("CONTRIBUTE.txt") self.path("ChangeLog.txt") @@ -569,7 +569,7 @@ class LinuxManifest(ViewerManifest): self.path("res/imprudence_icon.png","imprudence_icon.png") if self.prefix("linux_tools", dst=""): - self.path("client-readme.txt","README-linux.txt") + #self.path("client-readme.txt","README-linux.txt") #self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("wrapper.sh","imprudence") self.path("handle_secondlifeprotocol.sh") -- cgit v1.1 From 76e573fa54157ea89c0fbce8d45cfe64fea149e0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 23:11:23 -0600 Subject: Added release notes. --- linden/indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linden/indra/newview/viewer_manifest.py') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index b0777f4..62c9537 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -111,6 +111,7 @@ class ViewerManifest(LLManifest): self.path("README.txt") self.path("MANIFESTO.txt") self.path("CONTRIBUTE.txt") + self.path("RELEASE_NOTES.txt") self.path("ChangeLog.txt") self.end_prefix("../../..") -- cgit v1.1