Ported Linux packaging system from Kokua.

Run "make package" in the build directory to create a tarball.

2 files changed, 74 insertions, 31 deletions

diff --git a/linden/indra/cmake/AddPackageTarget.cmake b/linden/indra/cmake/AddPackageTarget.cmake
new file mode 100644
index 0000000..66adf3e
--- /dev/null
+++ b/linden/indra/cmake/AddPackageTarget.cmake
@@ -0,0 +1,32 @@
+# This function adds a custom target named 'package', which runs
+# scripts/package.py to create an installer package.
+# 
+# By default, you must manually build the 'package' target when you
+# are ready to create the installer package. But if the global
+# AUTOPACKAGE variable is ON ("cmake -D AUTOPACKAGE:BOOL=ON"), the
+# 'package' target will be added to the default build target.
+
+
+set(AUTOPACKAGE OFF CACHE BOOL
+    "Automatically build an installer package after compiling.")
+
+
+function( add_package_target )
+
+  if (AUTOPACKAGE)
+    add_custom_target(package ALL)
+  else (AUTOPACKAGE)
+    add_custom_target(package)
+  endif (AUTOPACKAGE)
+
+  add_custom_command(
+    TARGET package POST_BUILD
+    COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${SCRIPTS_DIR}/package.py
+      --build-dir=${CMAKE_BINARY_DIR}
+      --build-type=${CMAKE_BUILD_TYPE}
+      --source-dir=${CMAKE_SOURCE_DIR}
+  )
+
+endfunction( add_package_target )
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 7ffb32b..7389075 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -3,6 +3,7 @@
 project(viewer)
 
 include(00-Common)
+include(AddPackageTarget)
 include(Boost)
 include(BuildVersion)
 include(DBusGlib)
@@ -1290,6 +1291,10 @@ add_executable(${VIEWER_BINARY_NAME}
     )
 check_message_template(${VIEWER_BINARY_NAME})
 
+
+# NOTE: This variable is DEPRECATED, and should not be used anymore.
+# The package target should always be added. The variable AUTOPACKAGE
+# (in AddPackageTarget.cmake) controls whether package is auto-built.
 set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
@@ -1431,43 +1436,49 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
 
 
 if (LINUX)
-  add_custom_command(
-      OUTPUT imprudence-stripped
-      COMMAND strip
-      ARGS --strip-debug -o imprudence-stripped ${VIEWER_BINARY_NAME}
-      DEPENDS imprudence-bin
-      )
 
-  set(product Imprudence-${ARCH}-${viewer_VERSION})
+  string(REPLACE "-bin" "-stripped"
+         VIEWER_STRIPPED_NAME ${VIEWER_BINARY_NAME})
+
+  add_dependencies(${VIEWER_BINARY_NAME}
+    SLPlugin
+    media_plugin_gstreamer010
+    media_plugin_webkit)
 
   add_custom_command(
-      OUTPUT ${product}.tar.bz2
-      COMMAND ${PYTHON_EXECUTABLE}
-      ARGS
-        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-        --standalone=${STANDALONE}
-        --buildtype=${CMAKE_BUILD_TYPE}
-        --grid=${GRID}
-        --channel=${VIEWER_CHANNEL}
-        --login_channel=${VIEWER_LOGIN_CHANNEL}
-        --installer_name=${product}
-        --arch=${ARCH}
-        --source=${CMAKE_CURRENT_SOURCE_DIR}
-        --artwork=${ARTWORK_DIR}
-        --build=${CMAKE_CURRENT_BINARY_DIR}
-        --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
-        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-      DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
-      
-  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit)
+    OUTPUT ${VIEWER_STRIPPED_NAME}
+    COMMAND strip
+    ARGS --strip-debug -o ${VIEWER_STRIPPED_NAME} ${VIEWER_BINARY_NAME}
+    DEPENDS ${VIEWER_BINARY_NAME}
+    )
+
+  add_custom_target(
+    viewer-manifest-target
+    COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      --standalone=${STANDALONE}
+      --buildtype=${CMAKE_BUILD_TYPE}
+      --grid=${GRID}
+      --channel=${VIEWER_CHANNEL}
+      --login_channel=${VIEWER_LOGIN_CHANNEL}
+      --arch=${ARCH}
+      --source=${CMAKE_CURRENT_SOURCE_DIR}
+      --artwork=${ARTWORK_DIR}
+      --build=${CMAKE_CURRENT_BINARY_DIR}
+      --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
+    DEPENDS
+      ${VIEWER_STRIPPED_NAME}
+      linux-crash-logger
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    )
+
+  add_package_target()
+  add_dependencies(package viewer-manifest-target)
 
-  if (NOT INSTALL)
-    add_custom_target(package ALL DEPENDS ${product}.tar.bz2)
-    add_dependencies(package linux-crash-logger-strip-target)
-  endif (NOT INSTALL)
 endif (LINUX)
 
+
 if (DARWIN)
   set(product "Imprudence")
   set_target_properties(