[Cmake-commits] CMake branch, next, updated. v2.8.7-2717-g629cca4
Eric Noulard
eric.noulard at gmail.com
Sat Feb 18 16:35:37 EST 2012
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 629cca4518cec1781bc9bbb3bd20ec0d74a62429 (commit)
via dee0a38648195786bae0abce437ef4617ea0912e (commit)
via b4abcfecbe281373fd3c28adccf4c3002b7909c4 (commit)
via 9717727d5fa29a993b22b9437e67cc28d8eaf52c (commit)
via 7a8f44a2d6d23ec0345a1413f3a79c21f9566456 (commit)
from 48382d577d3bda377183c781096b595dc3f260ad (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=629cca4518cec1781bc9bbb3bd20ec0d74a62429
commit 629cca4518cec1781bc9bbb3bd20ec0d74a62429
Merge: 48382d5 dee0a38
Author: Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 16:35:34 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 18 16:35:34 2012 -0500
Merge topic 'CPack-dynamicDocSection' into next
dee0a38 Put CPack DMG and PackageMaker doc in separate files
b4abcfe Correct copy/paste section name mistake
9717727 Suppress unecessary (now empty) doc sections
7a8f44a Add structure documentation for CPack Bundle generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dee0a38648195786bae0abce437ef4617ea0912e
commit dee0a38648195786bae0abce437ef4617ea0912e
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 22:33:10 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 18 22:33:10 2012 +0100
Put CPack DMG and PackageMaker doc in separate files
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 8a44991..e0a5518 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -187,61 +187,6 @@
# list of patterns, e.g., /CVS/;/\\.svn/;\\.swp$;\\.#;/#;.*~;cscope.*
##end
#
-# The following variables are specific to the DragNDrop installers
-# built on Mac OS X:
-#
-# CPACK_DMG_VOLUME_NAME - The volume name of the generated disk
-# image. Defaults to CPACK_PACKAGE_FILE_NAME.
-#
-# CPACK_DMG_FORMAT - The disk image format. Common values are UDRO
-# (UDIF read-only), UDZO (UDIF zlib-compressed) or UDBZ (UDIF
-# bzip2-compressed). Refer to hdiutil(1) for more information on
-# other available formats.
-#
-# CPACK_DMG_DS_STORE - Path to a custom .DS_Store file which e.g.
-# can be used to specify the Finder window position/geometry and
-# layout (such as hidden toolbars, placement of the icons etc.).
-# This file has to be generated by the Finder (either manually or
-# through OSA-script) using a normal folder from which the .DS_Store
-# file can then be extracted.
-#
-# CPACK_DMG_BACKGROUND_IMAGE - Path to an image file which is to be
-# used as the background for the Finder Window when the disk image
-# is opened. By default no background image is set. The background
-# image is applied after applying the custom .DS_Store file.
-#
-# CPACK_COMMAND_HDIUTIL - Path to the hdiutil(1) command used to
-# operate on disk image files on Mac OS X. This variable can be used
-# to override the automatically detected command (or specify its
-# location if the auto-detection fails to find it.)
-#
-# CPACK_COMMAND_SETFILE - Path to the SetFile(1) command used to set
-# extended attributes on files and directories on Mac OS X. This
-# variable can be used to override the automatically detected
-# command (or specify its location if the auto-detection fails to
-# find it.)
-#
-# CPACK_COMMAND_REZ - Path to the Rez(1) command used to compile
-# resources on Mac OS X. This variable can be used to override the
-# automatically detected command (or specify its location if the
-# auto-detection fails to find it.)
-#
-# 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:
#
##variable
diff --git a/Modules/CPackDMG.cmake b/Modules/CPackDMG.cmake
new file mode 100644
index 0000000..08a19d9
--- /dev/null
+++ b/Modules/CPackDMG.cmake
@@ -0,0 +1,70 @@
+##section Variables specific to CPack DragNDrop generator
+##end
+##module
+# - DragNDrop CPack generator (Mac OS X).
+# The following variables are specific to the DragNDrop installers
+# built on Mac OS X:
+#end
+#
+##variable
+# CPACK_DMG_VOLUME_NAME - The volume name of the generated disk
+# image. Defaults to CPACK_PACKAGE_FILE_NAME.
+##end
+#
+##variable
+# CPACK_DMG_FORMAT - The disk image format. Common values are UDRO
+# (UDIF read-only), UDZO (UDIF zlib-compressed) or UDBZ (UDIF
+# bzip2-compressed). Refer to hdiutil(1) for more information on
+# other available formats.
+##end
+#
+##variable
+# CPACK_DMG_DS_STORE - Path to a custom .DS_Store file which e.g.
+# can be used to specify the Finder window position/geometry and
+# layout (such as hidden toolbars, placement of the icons etc.).
+# This file has to be generated by the Finder (either manually or
+# through OSA-script) using a normal folder from which the .DS_Store
+# file can then be extracted.
+##end
+#
+##variable
+# CPACK_DMG_BACKGROUND_IMAGE - Path to an image file which is to be
+# used as the background for the Finder Window when the disk image
+# is opened. By default no background image is set. The background
+# image is applied after applying the custom .DS_Store file.
+##end
+#
+##variable
+# CPACK_COMMAND_HDIUTIL - Path to the hdiutil(1) command used to
+# operate on disk image files on Mac OS X. This variable can be used
+# to override the automatically detected command (or specify its
+# location if the auto-detection fails to find it.)
+##end
+#
+##variable
+# CPACK_COMMAND_SETFILE - Path to the SetFile(1) command used to set
+# extended attributes on files and directories on Mac OS X. This
+# variable can be used to override the automatically detected
+# command (or specify its location if the auto-detection fails to
+# find it.)
+##end
+#
+##variable
+# CPACK_COMMAND_REZ - Path to the Rez(1) command used to compile
+# resources on Mac OS X. This variable can be used to override the
+# automatically detected command (or specify its location if the
+# auto-detection fails to find it.)
+##end
+
+#=============================================================================
+# Copyright 2006-2012 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
diff --git a/Modules/CPackPackageMaker.cmake b/Modules/CPackPackageMaker.cmake
new file mode 100644
index 0000000..8fe423c
--- /dev/null
+++ b/Modules/CPackPackageMaker.cmake
@@ -0,0 +1,34 @@
+##section Variables specific to CPack PackageMaker generator
+##end
+##module
+# - PackageMaker CPack generator (Mac OS X).
+# The following variable is specific to installers build on Mac OS X
+# using PackageMaker:
+#
+##variable
+# 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.
+##end
+
+#=============================================================================
+# Copyright 2006-2012 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4abcfecbe281373fd3c28adccf4c3002b7909c4
commit b4abcfecbe281373fd3c28adccf4c3002b7909c4
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 22:31:43 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 18 22:31:43 2012 +0100
Correct copy/paste section name mistake
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 093d0fc..97179d7 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -1,4 +1,4 @@
-##section Variables specific to CPack Debian (DEB) generator
+##section Variables specific to CPack NSIS generator
##end
##module
# - CPack NSIS generator specific options
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9717727d5fa29a993b22b9437e67cc28d8eaf52c
commit 9717727d5fa29a993b22b9437e67cc28d8eaf52c
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 22:30:57 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 18 22:30:57 2012 +0100
Suppress unecessary (now empty) doc sections
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 17e35d8..1fb8ab6 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -741,8 +741,6 @@ void cmDocumentation::addCPackStandardDocSections()
this->VariableSections.push_back(
"Variables common to all CPack generators");
- this->VariableSections.push_back(
- "Variables specific to a CPack generator");
}
void cmDocumentation::addAutomaticVariableSections(const std::string& section)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a8f44a2d6d23ec0345a1413f3a79c21f9566456
commit 7a8f44a2d6d23ec0345a1413f3a79c21f9566456
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 22:14:45 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 18 22:14:45 2012 +0100
Add structure documentation for CPack Bundle generator
diff --git a/Modules/CPackBundle.cmake b/Modules/CPackBundle.cmake
index 3ac4ea8..007fc04 100644
--- a/Modules/CPackBundle.cmake
+++ b/Modules/CPackBundle.cmake
@@ -1,25 +1,37 @@
+##section Variables specific to CPack Bundle generator
+##end
+##module
# - CPack Bundle generator (Mac OS X) specific options
#
# Installers built on Mac OS X using the Bundle generator use the
# aforementioned DragNDrop variables, plus the following Bundle-specific
# parameters:
+##end
#
+##variable
# CPACK_BUNDLE_NAME - The name of the generated bundle. This
# appears in the OSX finder as the bundle name. Required.
+##end
#
+##variable
# CPACK_BUNDLE_PLIST - Path to an OSX plist file that will be used
# as the Info.plist for the generated bundle. This assumes that
# the caller has generated or specified their own Info.plist file.
# Required.
+##end
#
+##variable
# CPACK_BUNDLE_ICON - Path to an OSX icns file that will be used as
# the icon for the generated bundle. This is the icon that appears
# in the OSX finder for the bundle, and in the OSX dock when the
# bundle is opened. Required.
+##end
#
+##variable
# CPACK_BUNDLE_STARTUP_SCRIPT - Path to an executable or script that
# will be run whenever an end-user double-clicks the generated bundle
# in the OSX Finder. Optional.
+##end
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
Modules/CPack.cmake | 55 ------------------------------
Modules/CPackBundle.cmake | 12 +++++++
Modules/CPackDMG.cmake | 70 +++++++++++++++++++++++++++++++++++++++
Modules/CPackNSIS.cmake | 2 +-
Modules/CPackPackageMaker.cmake | 34 +++++++++++++++++++
Source/cmDocumentation.cxx | 2 -
6 files changed, 117 insertions(+), 58 deletions(-)
create mode 100644 Modules/CPackDMG.cmake
create mode 100644 Modules/CPackPackageMaker.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list