[Cmake-commits] [cmake-commits] david.cole committed CPack.Info.plist.in 1.6 1.7 CPack.cmake 1.39 1.40
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jul 9 13:38:57 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv4392/Modules
Modified Files:
CPack.Info.plist.in CPack.cmake
Log Message:
ENH: One more patch from Doug Gregor including PackageMaker functionality for componentized-for-the-end-user and download-some-bit-on-demand installers.
Index: CPack.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.Info.plist.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** CPack.Info.plist.in 17 Jun 2008 15:39:25 -0000 1.6
--- CPack.Info.plist.in 9 Jul 2008 17:38:55 -0000 1.7
***************
*** 33,37 ****
<real>0.10000000149011612</real>
<key>CFBundleIdentifier</key>
! <string>com. at CPACK_PACKAGE_VENDOR@. at CPACK_PACKAGE_NAME@. at CPACK_PACKAGE_VERSION@@CPACK_MODULE_VERSION_SUFFIX@</string>
</dict>
</plist>
--- 33,37 ----
<real>0.10000000149011612</real>
<key>CFBundleIdentifier</key>
! <string>com. at CPACK_PACKAGE_VENDOR@. at CPACK_PACKAGE_NAME@@CPACK_MODULE_VERSION_SUFFIX@</string>
</dict>
</plist>
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.39
retrieving revision 1.40
diff -C 2 -d -r1.39 -r1.40
*** CPack.cmake 8 Jul 2008 15:52:22 -0000 1.39
--- CPack.cmake 9 Jul 2008 17:38:55 -0000 1.40
***************
*** 108,112 ****
# list of patterns, e.g., /CVS/;/\\.svn/;\\.swp$;\\.#;/#;.*~;cscope.*
#
! # The following variables are specific to the graphical installers build
# on Windows using the Nullsoft Installation System.
#
--- 108,112 ----
# list of patterns, e.g., /CVS/;/\\.svn/;\\.swp$;\\.#;/#;.*~;cscope.*
#
! # The following variables are specific to the graphical installers built
# on Windows using the Nullsoft Installation System.
#
***************
*** 158,161 ****
--- 158,177 ----
# uninstall start menu shortcuts.
#
+ # The following variable is specific to installers build on Mac OS X
+ # using PackageMaker:
+ #
+ # CPACK_OSX_PACKAGE_VERSION - The version of Mac OS X that the
+ # resulting PackageMaker archive should be compatible
+ # with. Different versions of Mac OS X support different
+ # features. For example, CPack can only build component-based
+ # installers for Mac OS X 10.4 or newer, and can only build
+ # installers that download component son-the-fly for Mac OS X 10.5
+ # or newer. If left blank, this value will be set to the minimum
+ # version of Mac OS X that supports the requested features. Set this
+ # variable to some value (e.g., 10.4) only if you want to guarantee
+ # that your installer will work on that version of Mac OS X, and
+ # don't mind missing extra features available in the installer
+ # shipping with later versions of Mac OS X.
+ #
# The following variables are for advanced uses of CPack:
#
***************
*** 252,258 ****
# command.
#
! # ARCHIVE_FILE provides a name for the ZIP file created by CPack to
! # be used for downloaded components. If not supplied, CPack will
! # create ZIP file with some name based on CPACK_PACKAGE_FILE_NAME and
# the name of the component. See cpack_configure_downloads for more
# information.
--- 268,274 ----
# command.
#
! # ARCHIVE_FILE provides a name for the archive file created by CPack
! # to be used for downloaded components. If not supplied, CPack will
! # create a file with some name based on CPACK_PACKAGE_FILE_NAME and
# the name of the component. See cpack_configure_downloads for more
# information.
***************
*** 331,358 ****
# The cpack_configure_downloads command configures installation-time
# downloads of selected components. For each downloadable component,
! # CPack will create a ZIP file containing the contents of that component,
! # which should be uploaded to the given site. When the user selects that
! # component for installation, the installer will download and extract
! # the component in place. This feature is useful for creating small
! # installers that only download the requested components, saving
! # bandwidth. Additionally, the installers are small enough that they
! # will be installed as part of the normal installation process, and the
! # "Change" button in Windows Add/Remove Programs control panel will
! # allow one to add or remove parts of the application after the original
! # installation. The downloaded-components functionality is currently
! # only available with the NSIS generator on Windows. It requires the
! # ZipDLL plug-in for NSIS, available at:
#
# http://nsis.sourceforge.net/ZipDLL_plug-in
#
! # The site argument is a URL where the ZIP files for downloadable
# components will reside, e.g., http://www.cmake.org/files/2.6.1/installer/
! # All of the ZIP files produced by CPack should be uploaded to that location.
#
# UPLOAD_DIRECTORY is the local directory where CPack will create the
! # various .ZIP archives for each of the components. The contents of this
# directory should be uploaded to a location accessible by the URL given
# in the site argument. If omitted, CPack will use the directory CPackUploads
! # inside the CMake binary directory to store the generated ZIP files.
#
# The ALL flag indicates that all components be downloaded. Otherwise, only
--- 347,378 ----
# The cpack_configure_downloads command configures installation-time
# downloads of selected components. For each downloadable component,
! # CPack will create an archive containing the contents of that
! # component, which should be uploaded to the given site. When the
! # user selects that component for installation, the installer will
! # download and extract the component in place. This feature is
! # useful for creating small installers that only download the
! # requested components, saving bandwidth. Additionally, the
! # installers are small enough that they will be installed as part of
! # the normal installation process, and the "Change" button in
! # Windows Add/Remove Programs control panel will allow one to add or
! # remove parts of the application after the original
! # installation. On Windows, the downloaded-components functionality
! # requires the ZipDLL plug-in for NSIS, available at:
#
# http://nsis.sourceforge.net/ZipDLL_plug-in
#
! # On Mac OS X, installers that download components on-the-fly can
! # only be built and installed on system using Mac OS X 10.5 or
! # later.
! #
! # The site argument is a URL where the archives for downloadable
# components will reside, e.g., http://www.cmake.org/files/2.6.1/installer/
! # All of the archives produced by CPack should be uploaded to that location.
#
# UPLOAD_DIRECTORY is the local directory where CPack will create the
! # various archives for each of the components. The contents of this
# directory should be uploaded to a location accessible by the URL given
# in the site argument. If omitted, CPack will use the directory CPackUploads
! # inside the CMake binary directory to store the generated archives.
#
# The ALL flag indicates that all components be downloaded. Otherwise, only
***************
*** 364,368 ****
# that can be called from Windows' Add/Remove Programs dialog (via the
# "Modify" button) to change the set of installed components. NO_ADD_REMOVE
! # turns off this behavior.
--- 384,388 ----
# that can be called from Windows' Add/Remove Programs dialog (via the
# "Modify" button) to change the set of installed components. NO_ADD_REMOVE
! # turns off this behavior. This option is ignored on Mac OS X.
More information about the Cmake-commits
mailing list