From 27d5708ade21ff8ea2bb90d3b4866c269dce6369 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Tue, 28 Sep 2010 03:19:43 +0200
Subject: RED-565: Building the package/ directory fails for standalone.

See http://redmine.imprudenceviewer.org/issues/565
This patch also reorders the "help" text of llmanifest.py to be
alphabetical, next to adding the option --standalone with help text.
indra/newview/CMakeLists.txt is changed to pass --standalone to
the python script. Finally, viewer_manifest.py, which inherits
from llmanifest.py uses it to skip the sections that don't make
sense when building standalone, and which fail with errors
without this patch.

This patch is not 100% tested: I don't have a Mac or windows.
However, it ONLY touches 'standalone', and before my patches
standalone was broken anyway. So, even if this doesn't fix it
completely for Mac and/or windows, then it can't hurt to commit,
or even release. Even if this fails, the errors are not fatal:
the packaging fails, but the viewer is already compiled at
this point. I'd advise against holding this back until it could
be tested by a Mac or windows developer that can build standalone:
that might never happen to begin with!

When time comes, some other developer will test it and when
there are still problems, fix it, on the other operating systems.
---
 linden/indra/lib/python/indra/util/llmanifest.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'linden/indra/lib')

diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 7a2505d..3444a15 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -119,7 +119,11 @@ ARGUMENTS=[
         Example use: %(name)s --arch=i686
         On Linux this would try to use Linux_i686Manifest.""",
          default=""),
+    dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE),
     dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE),
+    dict(name='channel',
+         description="""The channel to use for updates, packaging, settings name, etc.""",
+         default=get_channel),
     dict(name='configuration',
          description="""The build configuration used. Only used on OS X for
         now, but it could be used for other platforms as well.""",
@@ -130,16 +134,13 @@ ARGUMENTS=[
         though it's not strictly a grid, 'firstlook' is also an acceptable
         value for this parameter.""",
          default=""),
-    dict(name='channel',
-         description="""The channel to use for updates, packaging, settings name, etc.""",
-         default=get_channel),
-    dict(name='login_channel',
-         description="""The channel to use for login handshake/updates only.""",
-         default=None),
     dict(name='installer_name',
          description=""" The name of the file that the installer should be
         packaged up into. Only used on Linux at the moment.""",
          default=None),
+    dict(name='login_channel',
+         description="""The channel to use for login handshake/updates only.""",
+         default=None),
     dict(name='login_url',
          description="""The url that the login screen displays in the client.""",
          default=None),
@@ -150,7 +151,9 @@ ARGUMENTS=[
     dict(name='source',
          description='Source directory.',
          default=DEFAULT_SRCTREE),
-    dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE),
+    dict(name='standalone',
+         description='Set to ON if this is a standalone build.',
+         default="OFF"),
     dict(name='touch',
          description="""File to touch when action is finished. Touch file will
         contain the name of the final package in a form suitable
-- 
cgit v1.1