svn merge -r96049:96026 -r95956:95931 -r95867:95775 svn+ssh://svn/svn/linden/release

Reverting my changes to the package target. It subtly broke the windows build in a way I didn't want to try to fix in release. Will fix in another branch.

2 files changed, 34 insertions, 27 deletions

diff --git a/indra/develop.py b/indra/develop.py
index 77583b0664..a96ea0a6c9 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -605,6 +605,9 @@ If you do not specify a command, the default is "configure".
 Examples:
   Set up a viewer-only project for your system:
     develop.py configure -DSERVER:BOOL=OFF
+  
+  Set up a Visual Studio 2005 project with package target (to build installer):
+    develop.py -G vc80 configure -DPACKAGE:BOOL=ON
 '''
 
 def main(arguments):
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index dbb445a93c..8b97ef7da9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1289,6 +1289,9 @@ if (LLKDU_LIBRARY)
   add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY})
 endif (LLKDU_LIBRARY)
 
+set(PACKAGE OFF CACHE BOOL
+    "Add a package target that builds an installer package.")
+
 if (WINDOWS)
     if(MSVC71)
         set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
@@ -1362,10 +1365,10 @@ if (WINDOWS)
               --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
-
-    add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
-    add_dependencies(package windows-updater windows-crash-logger)
-    set_target_properties(package PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD ON)
+    if (PACKAGE)
+      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+      add_dependencies(package windows-updater windows-crash-logger)
+    endif (PACKAGE)
 endif (WINDOWS)
 
 target_link_libraries(${VIEWER_BINARY_NAME}
@@ -1437,9 +1440,10 @@ if (LINUX)
       DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
 
-  add_custom_target(package ALL DEPENDS ${product}.tar.bz2)
-  add_dependencies(package linux-crash-logger-stripped)
-  set_target_properties(package PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD ON)
+  if (NOT INSTALL)
+    add_custom_target(package ALL DEPENDS ${product}.tar.bz2)
+    add_dependencies(package linux-crash-logger-stripped)
+  endif (NOT INSTALL)
 endif (LINUX)
 
 if (DARWIN)
@@ -1473,26 +1477,26 @@ if (DARWIN)
     DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
-  add_custom_target(package
-    COMMAND
-      ${PYTHON_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      --grid=${GRID}
-      --configuration=${CMAKE_CFG_INTDIR}
-      --channel=${VIEWER_CHANNEL}
-      --login_channel=${VIEWER_LOGIN_CHANNEL}
-      --source=${CMAKE_CURRENT_SOURCE_DIR}
-      --artwork=${ARTWORK_DIR}
-      --build=${CMAKE_CURRENT_BINARY_DIR}
-      --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-      --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-    DEPENDS
-      ${VIEWER_BINARY_NAME}
-      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-    )
-
-  add_dependencies(package mac-updater mac-crash-logger)
-  set_target_properties(package PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD ON)
+  if (PACKAGE)
+    add_custom_target(package
+      COMMAND
+        ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        --grid=${GRID}
+        --configuration=${CMAKE_CFG_INTDIR}
+        --channel=${VIEWER_CHANNEL}
+        --login_channel=${VIEWER_LOGIN_CHANNEL}
+        --source=${CMAKE_CURRENT_SOURCE_DIR}
+        --artwork=${ARTWORK_DIR}
+        --build=${CMAKE_CURRENT_BINARY_DIR}
+        --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+      DEPENDS
+        ${VIEWER_BINARY_NAME}
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      )
+      add_dependencies(package mac-updater mac-crash-logger)
+  endif (PACKAGE)
 endif (DARWIN)
 
 if (INSTALL)