Commit Graph

290 Commits

Author SHA1 Message Date
Eric NOULARD 654683adc7 CPackArchiveGenerator add component supports 2010-08-24 21:42:21 +02:00
Eric NOULARD 36a550ae7a CPackArchiveGenerator use cmArchiveWrite wrapper 2010-08-24 21:41:32 +02:00
Eric NOULARD 6a521f8604 CPack Enable better handling of absolute installed files
The idea of the patch is to let the install generator define
CPACK_ABSOLUTE_INSTALL_FILES then when CMake is installing
project he will concatenate the list of files and give
it to specific CPack Generator by defining CPACK_ABSOLUTE_INSTALL_FILES
to be the list of ALL files that were installed using absolute destination.
An example of use has been applied to RPM generator which now
tries to automatically build a relocatable package.
2010-08-23 17:38:33 +02:00
Eric NOULARD 40dc97dc73 CPack Backward-compatibly enforce DESTDIR for DEB and RPM 2010-08-23 16:14:40 +02:00
Brad King cc2ba7f9c2 Merge topic 'CPack-APIredesign'
bd510fe CPack: Avoid member shadowing after API refactor (part2)
31a313d CPack: Avoid member shadowing after API refactor
cd7b8a0 CPack: Refactor API in order to handle multi-file packages
2010-08-17 15:12:42 -04:00
Eric NOULARD bd510fe4ea CPack: Avoid member shadowing after API refactor (part2)
After converting method arguments to members we need to avoid use of the
same names as local variables and other method arguments. One more fix.
2010-08-12 20:18:46 +02:00
Brad King 31a313d470 CPack: Avoid member shadowing after API refactor
After converting method arguments to members we need to avoid use of the
same names as local variables and other method arguments.
2010-08-11 16:17:09 -04:00
Eric NOULARD cd7b8a03f5 CPack: Refactor API in order to handle multi-file packages
The multi-argument CompressFiles(...) method has been replace by the
no-argument PackageFiles() method and 3 more member variables.  This
will enable implemention of multi-package generators.  Now each specific
generator (which overloads PackageFiles()) may decide to change the name
and/or the number of generated package files.
2010-08-11 14:09:52 -04:00
Brad King ac267371e6 Merge branch 'system-libarchive-include' into libarchive-wrapper 2010-08-05 17:12:42 -04:00
Brad King 3296e6ad90 Include headers from chosen libarchive (#10923)
When CMAKE_USE_SYSTEM_LIBARCHIVE is on we must include the system
libarchive headers to match the library that will be linked.
2010-08-05 17:06:10 -04:00
Brad King 1820a05cb2 Merge topic 'CPackDEB-auto-dependency-support'
ded3a15 CPackDeb  optionally generates auto-dependency list part fix of bug 10292
2010-08-03 16:12:37 -04:00
Eric NOULARD ded3a1585b CPackDeb optionally generates auto-dependency list part fix of bug 10292
The default behavior is not to activate this option because it may break
DEB package building for project who does not use INSTALL RPATH.
2010-07-28 18:24:20 +02:00
Eric NOULARD 5495a6d975 CPackDEB: merge wrong installed size patch. see bugs 10296 (and 10292) 2010-07-28 17:03:14 +02:00
Brad King e1a4c02bac Merge topic 'resolve/doc-spelling/CPackRPM'
7739d78 Merge CPackRPM changes into doc-spelling
9203e91 Fix spelling errors reported by Lintian.
2010-07-20 16:00:29 -04:00
Brad King 7739d786a4 Merge CPackRPM changes into doc-spelling
Conflicts:
	Modules/CPackRPM.cmake
2010-07-13 09:46:52 -04:00
Kai Wasserbäch 9203e9187e Fix spelling errors reported by Lintian.
During a Lintian run on the binary packages of CMake in Debian I was
notified of many spelling mistakes.
2010-07-13 09:41:37 -04:00
Brad King 54b1dc4161 Merge branch 'fix-cmake-conversion-warnings' 2010-07-06 10:20:50 -04:00
Brad King 050af165bb Fix integer conversions in cpack
These were revealed by GCC's -Wconversion option.
2010-06-30 09:57:07 -04:00
David Cole 415900ba77 Eliminate -Wconversion warnings.
Change types of local variables, or casting, or re-arrange
expressions to get rid of "conversion may alter value" warnings
as seen on recent dashboard submissions from londinium.kitware.
2010-06-27 11:22:05 -04:00
Brad King fdb5f78705 CPack: Try harder to remove temporary dir (#10793)
Windows filesystems sometimes lock files temporarily.  Try removing the
CPack temp install folder multiple times before giving up.
2010-06-04 14:32:08 -04:00
David Cole 10a4abddfd Add missing archive_read_finish calls to fix some of the presently reported valgrind memory leaks. 2009-12-28 13:15:19 -05:00
Bill Hoffman 22fb266d06 use different tar format to handle longer file names 2009-11-14 08:48:32 -05:00
Bill Hoffman 70dbbcc542 add better error checking and run from correct directory. 2009-11-09 09:58:03 -05:00
Bill Hoffman 4fd75f959a add better error checking and support for symlinks to cpack's use of libarchive 2009-11-08 20:54:13 -05:00
Bill Hoffman b0d43475c6 Fix warning 2009-11-03 17:21:25 -05:00
Bill Hoffman 5f41fe03ca Fix warnings for unused variables 2009-11-03 16:50:49 -05:00
Bill Hoffman 78b2d5097c Fix cygwin package stuff to work with libarchive 2009-11-03 09:40:57 -05:00
Bill Hoffman d4b8945301 Fix for hpux... 2009-11-02 09:20:53 -05:00
Bill Hoffman fb51d98562 Switch to using libarchive from libtar for cpack and cmake -E tar
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers.  The cmake -E tar xf should be
able to handle all compression types now as well.
2009-10-30 13:10:56 -04:00
David Cole 43d07f6620 Fix more mismatched new[] / delete[] (eliminate invalid auto_ptr use) to correct valgrind reported memory issues. 2009-10-30 10:31:54 -04:00
David Cole e0bbaa889a Correct one of the valgrind errors from the CPackTestAllGenerators test. Do not use auto_ptr on a new [] allocation because auto_ptr does not use delete []. 2009-10-26 13:49:20 -04:00
Bill Hoffman a9fa71a47c Try to avoid cronic random failures on some Macs. 2009-10-04 09:54:55 -04:00
Bill Hoffman 78f68ef1b7 Try to avoid cronic random failures on some Macs. 2009-10-04 09:32:48 -04:00
Alexander Neundorf eb91859d6f remove unused variables, reported by icpc
Alex
2009-10-03 08:35:57 -04:00
David Cole 44bcba7461 Fix warnings in CMake source code. Suppress rampant warnings emanating from Qt files. 2009-10-01 16:47:08 -04:00
Brad King f40406ed6b Fix default install prefix on Haiku
Since Haiku does not have /usr (and therefore /usr/local), this commit
changes the default install prefix to the equivalent directory of
/boot/common.

See issue #9607.
2009-09-30 08:31:53 -04:00
David Cole a091e99cb9 Fix issue #8818 - escape quotes in the license file when using the DragNDrop cpack generator. Thanks to Clinton Stimpson for the patch. 2009-09-28 17:14:53 -04:00
Brad King 96afb12087 Convert CMake to OSI-approved BSD License
This converts the CMake license to a pure 3-clause OSI-approved BSD
License.  We drop the previous license clause requiring modified
versions to be plainly marked.  We also update the CMake copyright to
cover the full development time range.
2009-09-28 11:43:28 -04:00
Brad King b41a548d86 Add parentheses around '&&' between '||' for gcc
The GNU compiler warns about possible operator precedence mistakes and
asks for explicit parentheses (-Wparentheses).  We add the parentheses
to silence the warning.  This also fixes one real logic error in the
find_package() implementation by correcting expression evaluation order.
2009-09-11 08:18:15 -04:00
Brad King e9d7ebb3ec BUG: Do not double-initialize local generators
All global generator CreateLocalGenerator methods automatically
initialize the local generator instances with SetGlobalGenerator.  In
several places we were calling SetGlobalGenerator again after receiving
the return value from CreateLocalGenerator.  The double-initializations
leaked the resources allocated by the first call to SetGlobalGenerator.
This fix removes the unnecessary calls.
2009-07-28 10:47:02 -04:00
David Cole 42c033ccd6 BUG: Fix issue #8759 - add support for setting dmg volume name and compression type by CPack variables. Also add custom .DS_Store and background image support. Thanks to Mike Arthur for the patches. 2009-04-03 13:12:53 -04:00
David Cole 60a46ca76e STYLE: Fix line length violation. 2009-02-24 09:34:03 -05:00
David Cole c148714b82 ENH: Add license file presentation to the Drag-N-Drop dmg file CPack generator. Fixes issue #8442. Thanks to Clinton Stimpson for the patch. 2009-02-23 13:25:18 -05:00
David Cole c6051d7ad0 STYLE: Fix style line-too-long violations. 2009-02-20 10:14:40 -05:00
David Cole 1bf669207b BUG: A little bit more refactoring from BundleGenerator to DragNDropGenerator. See issue #8556. Thanks for Clinton Stimpson for the patch. 2009-02-19 10:39:08 -05:00
Brad King dc13914cd6 ENH: Create cmXMLSafe to help escapes in XML
This class provides easy syntax to efficiently insert blocks of data
into XML documents with proper escapes.  It replaces the old
cmCTest::MakeXMLSafe and cmSystemTools::MakeXMLSafe methods which
allocated extra memory instead of directly streaming the data.
2009-02-05 16:31:37 -05:00
David Cole 2914b740c2 BUG: Forgot to change parent class in cmCPackTypeMacro when I added cmCPackDragNDropGenerator. Fix it now that it really matters. (The BundleGenerator test started failing after the last commit. This fixes it.) 2009-01-22 14:23:44 -05:00
David Cole 6bf31875ce BUG: Fix issue #8383. Avoid crashing when using the Bundle CPack generator and CPACK_BUNDLE_NAME is not set. Instead, fail gracefully giving an informative error message and non-zero exit code. 2009-01-22 13:56:13 -05:00
David Cole 3a4f76949a BUG: Fix issue #8402. Add a drag and drop bundle generator to the Mac build of CPack. Add a test of it in the CPackComponents test. Thanks to Clinton Stimpson for the patch. 2009-01-22 12:12:44 -05:00
David Cole 36c228814b BUG: Fix issue #7523: Analyze output of 'hdiutil attach' to get the name of the volume that was mounted. Eliminates the need to use the -mountpoint arg of hdiutil which has a silly 90 character limit on the name of the mount point. Also add a custom volume icon to the BundleGeneratorTest to cover this code. 2009-01-21 13:39:22 -05:00
David Cole c647ed54d9 BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch. 2009-01-21 11:54:30 -05:00
David Cole 03c940aeb3 BUG: Fix for issue #7470. Allow spaces in the path names of installed files with the NSIS CPack generator and component-based installs. Add an installed file to the CPackComponents test: it failed before the fix; now it passes. 2009-01-20 14:29:41 -05:00
Bill Hoffman 81515ba8a5 ENH: allow startup command to be optional 2008-12-04 09:09:55 -05:00
David Cole cc51ddd34b BUG: Use the DESTDIR prefix when creating the directory in CPack when CPACK_SET_DESTDIR is ON. Thanks to Petri Hodju for reporting this regression to the CMake mailing list: http://www.cmake.org/pipermail/cmake/2008-October/024563.html. 2008-10-15 09:35:27 -04:00
David Cole c3976b0283 BUG: Fix issue #7800. Enable CPack to find the NSIS installer on Windows 2000. 2008-10-10 17:08:00 -04:00
Bill Hoffman 71fee8522e STYLE: fix line length issues 2008-10-02 09:18:47 -04:00
Bill Hoffman ecf312ccc8 STYLE: fix line length stuff for KWStyle 2008-10-01 09:04:27 -04:00
Bill Hoffman d31c890220 ENH: missed one 2008-09-24 10:01:32 -04:00
Bill Hoffman 302aadadb3 STYLE: fix compiler warning 2008-09-24 09:57:52 -04:00
Bill Hoffman 7fd080d695 STYLE: fix warning and rename method 2008-09-23 10:15:13 -04:00
Bill Hoffman 52e6733fbc BUG: fix 7669, cpack did not work with symlinks 2008-09-22 18:12:54 -04:00
Bill Hoffman 7e5222165d ENH: add installed size to deb package 2008-09-11 10:48:49 -04:00
David Cole b2f041f6a8 BUG: Fix issue #7414 - do not crash when given components with circular dependencies. Thanks to Doug Gregor for the patch. 2008-07-30 13:28:17 -04:00
David Cole b3752abc8d ENH: Improvements to the bundle cpack generator from second patch attached to feature request #7170. Thanks to Tim Shead. 2008-07-18 16:12:36 -04:00
David Cole d7b9041516 COMP: Fix HP continuous. Pull stl headers into CMake header files using cmStandardIncludes.h 2008-07-09 16:30:53 -04:00
David Cole 71f61636b6 ENH: One more patch from Doug Gregor including PackageMaker functionality for componentized-for-the-end-user and download-some-bit-on-demand installers. 2008-07-09 13:38:56 -04:00
David Cole 83ec8c3593 ENH: Further refinement of the CPack components functionality from Doug Gregor.
Details:
==========

 - New cpack_add_component, cpack_add_component_group, and
cpack_add_install_type "commands" defined as macros in the CPack
module.
 - Documentation for all of the variables and commands in the CPack module.
 - Added get_cmake_property(... COMPONENTS) to CMake to ask for the
names of all components. Used in the CPack module to automatically
build component-based installers. (Set CPACK_MONOLITHIC_INSTALL to
turn off component-based installation).
 - A group can declare its PARENT_GROUP, to build an arbitrary
hierarchy of groups.
 - New CPack command cpack_configure_downloads, which creates an
installer that downloads only the selected components on-the-fly.
Those components marked DOWNLOADED will be separate packages
downloaded on-the-fly (or, all packages can be marked as such with the
ALL option to cpack_configure_downloads). Individual components are
compressed with ZIP at installer-creation time and
downloaded/uncompressed by the installer as needed. This feature is
only available on Windows with NSIS at the moment.
 - NSIS installers can install themselves and enable the "Change"
button in Add/Remove programs, allowing users to go back and install
or remove components. This can be disabled through
cpack_configure_downloads, because it's only really useful is most of
the application's functionality is in downloaded components.
 - Bug fix: automatically install everything whose COMPONENT was not
specified (it's a hidden, required group)
 - Bug fix: fixed removal of components when re-running the NSIS
installer and unchecking components
 - Bug fix: NSIS installers now only install/remove the minimal
number of files when re-run to update the installation (or by clicking
"Change" in Add/Remove programs)
2008-07-08 11:52:25 -04:00
David Cole 01a93bbb3e COMP: Eliminate unreferenced variable warning 2008-06-19 06:17:01 -04:00
David Cole 974feca643 COMP: Eliminate compiler warning on 64-bit build. 2008-06-18 16:00:05 -04:00
David Cole 0fe9afdf5e BUG: Always look for the NSIS reg value in the 32-bit hive even in 64-bit builds of CPack. 2008-06-18 14:25:57 -04:00
David Cole 79e255a7d3 ENH: Apply patch for feature request #7170. Thanks to Tim Shead for contributing... 2008-06-18 09:53:29 -04:00
David Cole e8825d320b BUG: Workaround PackageMaker 3.0 issue for new CPack components feature. Thanks again to Doug Gregor for the patch. 2008-06-18 07:08:33 -04:00
David Cole 5cd8c61db3 COMP: Use cmOStringStream instead of std::ostringstream for the HP compiler. 2008-06-17 14:07:15 -04:00
David Cole 9a98928bd9 COMP: Fix errors and warnings from continuous dashboards running different compilers... 2008-06-17 12:44:18 -04:00
David Cole 80714fb42f COMP: Include full class definitions of classes used in std::map data members. 2008-06-17 12:09:42 -04:00
David Cole 1105a86c52 ENH: Add patch for feature request #6847 - CPack components for NSIS and PackageMaker installers. Thanks to Doug Gregor for all the hard work involved with implementing this patch! Also added new test CPackComponents that is conditionally executed only when NSIS or PackageMaker installer builders are available. 2008-06-17 11:39:26 -04:00
David Cole e7948f89f9 COMP: auto_ptr will not compile without including memory on some platforms 2008-04-18 10:55:04 -04:00
David Cole 968706b29e BUG: Fix mem leak. Thanks, Mathieu. 2008-04-17 12:06:20 -04:00
Bill Hoffman 2efad09d92 ENH: add CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA variable 2008-04-01 17:51:10 -04:00
Alexander Neundorf 12ba1e9b20 BUG: fix packaging of files installed to absolute paths, works only when
used with SET(CPACK_SET_DESTDIR "ON")

Alex
2008-03-28 20:23:01 -04:00
Bill Hoffman 042f4c334d ENH: fix crash in cpack when CPACK_CYGWIN_PATCH_NUMBER not specified 2008-03-12 21:54:27 -04:00
Bill Hoffman 497779d4b3 ENH: fix crash in cygwin package stuff 2008-03-07 11:06:44 -05:00
Bill Hoffman ee2a13b11f ENH: install working with symlink qt tool 2008-02-19 14:26:20 -05:00
Bill Hoffman ef537ffec7 ENH: have cpack work with DESTDIR install and ingest qt framework libs into cmake-gui 2008-02-18 10:26:28 -05:00
Bill Hoffman 337c1f0b72 ENH: fix DESTDIR install 2008-02-16 13:02:57 -05:00
Bill Hoffman 6ea4eea183 BUG: fix for bug 6294, correct url for nsis 2008-02-15 10:40:55 -05:00
Brad King f5d86035f2 COMP: Add include of <limits.h> to get USHRT_MAX constant. 2008-01-24 07:31:59 -05:00
Bill Hoffman 4c108d2a24 ENH: try to fix dashboard 2007-12-17 15:27:30 -05:00
Bill Hoffman ad75cb7195 BUG: fix for 6086 uninstall icon not set right 2007-12-14 14:58:27 -05:00
Brad King 9f61e2a235 ENH: Centralized and globalized computation of CMake program locations. This eliminates startup paths that failed to produce this information. 2007-12-13 17:56:50 -05:00
Bill Hoffman 87c22309b8 ENH: change CPACK_CREATE_DESKTOP_LINKS to something that can handle spaces in the name of the exectuable 2007-11-07 13:11:58 -05:00
Bill Hoffman 33478faeb6 ENH: changne ProcessGenertor to DoPackage 2007-11-06 08:28:26 -05:00
Bill Hoffman cfd308ce43 STYLE: fix line length issue 2007-11-06 08:27:43 -05:00
Bill Hoffman 743cec67d5 ENH: change name 2007-11-05 16:55:45 -05:00
Bill Hoffman 62decc533b ENH: change name of class 2007-11-05 16:33:19 -05:00
Brad King f410f8578e COMP: Fix warnings on 64-bit Mac OS X build. Patch from issue #3697. 2007-11-05 14:34:36 -05:00
Bill Hoffman e65c40f94a ENH: add CPACK_PROJECT_CONFIG_FILE option to CPack 2007-10-31 12:55:04 -04:00
Bill Hoffman 771997c556 ENH: fix line length 2007-10-31 09:03:40 -04:00
David Cole 5beb1da7f7 ENH: Add CPACK_SET_DESTDIR handling to enable packaging of installed files in absolute locations. With this setting on, cpack will set the DESTDIR env var when building the package so that files end up in their intended locations. Default behavior is not to set DESTDIR for backwards compatibility. Helps address issue #4993 and issue #5257. Also, remove unused CPACK_USE_DESTDIR variable. ENH: Add variable CPACK_PACKAGING_INSTALL_PREFIX to allow overriding the CPack GetPackagingInstallPrefix from a project's CMakeLists file if necessary. Could be used to remove the annoying /usr prefix still used by default in the Mac PackageMaker generator. 2007-10-31 08:50:17 -04:00
Bill Hoffman eb14543939 ENH: cpack changes, remove the escape variable stuff as it is not needed if you provide a config file for cpack 2007-10-30 23:02:43 -04:00