Merge pull request #1661 from SCIInstitute/package_fix

Package fix

Author: dcwhite

src/CMake/Modules/CPack.Description.plist.in

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <title>@CPACK_PACKAGE_NAME@</title>
+    <allowed-os-versions>
+        <os-version min="@OSX_MINIMUM_OS_VERSION@"/>
+    </allowed-os-versions>
+    <license file="@CPACK_RESOURCE_FILE_LICENSE@" mime-type="text/plain"/>
+    <welcome file="@CPACK_RESOURCE_FILE_WELCOME@" mime-type="text/plain"/>
+    <pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="edu.utah.sci.@CPACK_PACKAGE_NAME@" visible="false">
+        <pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@"/>
+    </choice>
+    <pkg-ref id="edu.utah.sci.@CPACK_PACKAGE_NAME@" version="0" onConclusion="none">@[email protected]</pkg-ref>
+</installer-gui-script>

src/CMake/Modules/CPack.Distribution.dist.in

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+scirunbuild_dir=@CMAKE_BINARY_DIR@
+productbuild_dir=@PKG_BUILD_DIR@
+productroot_dir=@PKG_ROOT_DIR@
+
+if [[ ! -e $productroot_dir ]]; then
+  echo "$productroot_dir does not exist"
+  exit 1
+fi
+
+@PKGBUILD_EXE@ --analyze --root $productroot_dir $scirunbuild_dir/@[email protected]
+@PKGBUILD_EXE@ --identifier edu.utah.sci.@CPACK_PACKAGE_NAME@ --root $productroot_dir \
+    --component-plist $scirunbuild_dir/@[email protected] \
+    --install-location /Applications $scirunbuild_dir/@[email protected]
+@PRODUCTBUILD_EXE@ --distribution $scirunbuild_dir/CPack.Distribution.dist \
+    --package-path $productroot_dir $productbuild_dir/tmp.pkg
+# Tip: pkgutil --expand can be used to debug package building
+@PKGUTIL_EXE@ --expand $productbuild_dir/tmp.pkg $productbuild_dir/tmp
+@PKGUTIL_EXE@ --flatten $productbuild_dir/tmp $scirunbuild_dir/@[email protected]
+rm -f $scirunbuild_dir/@[email protected] $scirunbuild_dir/@[email protected]
+rm -Rf $productbuild_dir/tmp

src/CMake/scripts/repair_package.sh.in

@@ -948,26 +948,36 @@ SET(CPACK_RESOURCE_FILE_WELCOME ${PACKAGING_WELCOME})
 SET(CPACK_PACKAGE_VERSION_MAJOR "${SCIRUN_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${SCIRUN_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${SCIRUN_VERSION_PATCH}")
+SET(CPACK_PACKAGE_VERSION "${SCIRUN_VERSION_MAJOR}.${SCIRUN_VERSION_MINOR}.${SCIRUN_VERSION_PATCH}")
 
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${APPLICATION_NAME} ${SCIRUN_VERSION_MAJOR}.${SCIRUN_VERSION_MINOR}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${APPLICATION_NAME}_${SCIRUN_VERSION_MAJOR}.${SCIRUN_VERSION_MINOR}")
 
 
 # other platform settings will be built up from here
 IF(APPLE)
-
- SET(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications/")
- SET(CPACK_TOPLEVEL_TAG "")
-
- IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  SET(CPACK_GENERATOR "productbuild;TGZ")
+  SET(CPACK_TOPLEVEL_TAG "")
+  IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    SET(CPACK_INSTALL_PREFIX "/" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
    SET(CMAKE_INSTALL_PREFIX "/" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
- ENDIF()
-
- SET(CPACK_PACKAGING_INSTALL_PREFIX "/")
- SET(CPACK_STRIP_FILES TRUE)
- SET(CPACK_SOURCE_STRIP_FILES TRUE)
- SET(CPACK_PACKAGE_EXECUTABLES "${APPLICATION_NAME}.app" "${APPLICATION_NAME}")
-
+  ENDIF()
+  # productbuild packaging repair hack
+  # call repair_package.sh after running package target in build
+  # Tip: can inspect packages using the pkgutil --expand command
+  IF(CPACK_GENERATOR MATCHES "productbuild")
+    # make sure there are paths to packaging tools
+    FIND_PROGRAM(PKGBUILD_EXE pkgbuild)
+    FIND_PROGRAM(PRODUCTBUILD_EXE productbuild)
+    FIND_PROGRAM(PKGUTIL_EXE pkgutil)
+    SET(PKG_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Darwin")
+    SET(PKG_BUILD_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/productbuild/${PKG_FILE_NAME}")
+    SET(PKG_ROOT_DIR "${PKG_BUILD_DIR}/Applications")
+
+    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMake/Modules/CPack.Distribution.dist.in
+                   ${CMAKE_BINARY_DIR}/CPack.Distribution.dist)
+    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMake/scripts/repair_package.sh.in
+                   ${CMAKE_BINARY_DIR}/repair_package.sh)
+  ENDIF()
 ELSEIF(WIN32 AND NOT UNIX)
 
   # There is a bug in NSIS that does not handle full unix paths properly. Make

src/CMakeLists.txt

@@ -189,9 +189,11 @@ IF(APPLE)
                         "Interface_Modules_Render"
                         "Interface_Modules_Python"
                         "Interface_Modules_Visualization"
+                        "Interface_Modules_Math"
                         "Core_ConsoleApplication"
                         "Modules_Factory"
                         "Modules_Python"
+                        "Modules_Math"
         )
 
         FOREACH(lib ${SCIRUN_LIBS})