[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3073-g186e765

Brad King brad.king at kitware.com
Thu May 8 14:14:33 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  186e765d1cda1914e942e72b3282fe791fbfe1e4 (commit)
       via  dc3c210244d93a4828423a336cf8032ab1300fe8 (commit)
      from  8e68fe77f7d446cb21cf8709f92054ceac512654 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=186e765d1cda1914e942e72b3282fe791fbfe1e4
commit 186e765d1cda1914e942e72b3282fe791fbfe1e4
Merge: 8e68fe7 dc3c210
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 8 14:14:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 8 14:14:32 2014 -0400

    Merge topic 'osx-package-DragNDrop' into next
    
    dc3c2102 OS X: Package with DragNDrop instead of PackageMaker


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc3c210244d93a4828423a336cf8032ab1300fe8
commit dc3c210244d93a4828423a336cf8032ab1300fe8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 8 13:38:33 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 8 14:13:20 2014 -0400

    OS X: Package with DragNDrop instead of PackageMaker
    
    Use the CPack DragNDrop generator instead of the deprecated PackageMaker
    tool to package CMake itself.  This provides an installation experience
    that is more consistent with other products on OS X and allows users to
    select the destination directory easily.  It also avoids installing
    "/private/var/db/receipts/com.Kitware.CMake.*" receipts that must be
    removed by "pkgutil --forget com.Kitware.CMake" before another version
    of CMake can be installed.
    
    The DragNDrop installer does not support a post-flight script, so drop
    our configuration of it.  The cmake-gui has an option for installing
    symbolic links to enable command-line use.  In practice users may simply
    add "/Applications/CMake.app/Contents/bin" to their PATH instead.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 7885a0c..8da88c1 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -154,14 +154,6 @@ if(UNIX)
 endif()
 
 if(APPLE)
-  set(CMAKE_POSTFLIGHT_SCRIPT
-    "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-  set(CMAKE_POSTUPGRADE_SCRIPT
-    "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
-  configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postflight.sh.in"
-    "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-  configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postupgrade.sh.in"
-    "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
   install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
                 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
 endif()
diff --git a/Source/QtDialog/QtDialogCPack.cmake.in b/Source/QtDialog/QtDialogCPack.cmake.in
index 3196471..7ae8605 100644
--- a/Source/QtDialog/QtDialogCPack.cmake.in
+++ b/Source/QtDialog/QtDialogCPack.cmake.in
@@ -9,9 +9,6 @@ if(CMAKE_PACKAGE_QTGUI)
     # / and then install
     # cmake into the bundle for cmake-gui and must use DESTDIR
     set(CPACK_SET_DESTDIR TRUE)
-    # we also want to run post install stuff to setup command line
-    set(CPACK_POSTFLIGHT_SCRIPT "@CMAKE_POSTFLIGHT_SCRIPT@")
-    set(CPACK_POSTUPGRADE_SCRIPT "@CMAKE_POSTUPGRADE_SCRIPT@")
   endif()
 endif()
 
diff --git a/Source/QtDialog/postflight.sh.in b/Source/QtDialog/postflight.sh.in
deleted file mode 100755
index 0b96889..0000000
--- a/Source/QtDialog/postflight.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-"$2 at CMAKE_INSTALL_SUBDIR@/CMake.app/Contents/MacOS/CMake" --mac-install
-exit 0
diff --git a/Source/QtDialog/postupgrade.sh.in b/Source/QtDialog/postupgrade.sh.in
deleted file mode 100755
index 06bd986..0000000
--- a/Source/QtDialog/postupgrade.sh.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exit 0
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 89c99bc..6a27119 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -5,7 +5,7 @@ set(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
-set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
+set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index f777718..16a30b3 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -5,7 +5,7 @@ set(INSTALL_PREFIX /)
 set(HOST dashmacmini5)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j5")
-set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
+set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(CPACK_SOURCE_GENERATORS "TGZ TZ")
 set(INITIAL_CACHE "
 CMAKE_USE_OPENSSL:BOOL=ON
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 7a1652d..4c4dd8a 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -99,7 +99,7 @@ foreach(gen ${generators})
   if("${gen}" STREQUAL "STGZ")
     set(SUFFIXES ${SUFFIXES} "*.sh")
   endif()
-  if("${gen}" STREQUAL "PackageMaker")
+  if("${gen}" STREQUAL "DragNDrop")
     set(SUFFIXES ${SUFFIXES} "*.dmg")
   endif()
   if("${gen}" STREQUAL "TBZ2")

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeLists.txt               |    8 --------
 Source/QtDialog/QtDialogCPack.cmake.in       |    3 ---
 Source/QtDialog/postflight.sh.in             |    3 ---
 Source/QtDialog/postupgrade.sh.in            |    2 --
 Utilities/Release/dashmacmini2_release.cmake |    2 +-
 Utilities/Release/dashmacmini5_release.cmake |    2 +-
 Utilities/Release/release_cmake.cmake        |    2 +-
 7 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100755 Source/QtDialog/postflight.sh.in
 delete mode 100755 Source/QtDialog/postupgrade.sh.in


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list