summaryrefslogtreecommitdiffstats
path: root/Source/CPack
Commit message (Collapse)AuthorAgeFilesLines
* CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.Fraser Hutchison2012-05-281-2/+2
| | | | | | This was a pull request: https://github.com/Kitware/CMake/pull/5 Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* Merge topic 'CPack-activateRPM-DEB-onMacOS'David Cole2012-05-244-30/+108
|\ | | | | | | | | | | 801ea70 Calm down Borland compiler warning about "always true" 2a34b57 CPack allow RPM and DEB generator to be used on OSX.
| * Calm down Borland compiler warning about "always true"Eric NOULARD2012-05-211-0/+4
| |
| * CPack allow RPM and DEB generator to be used on OSX.Eric NOULARD2012-05-204-30/+104
| | | | | | | | | | | | | | | | | | More generally add the check for possible generator "activation" at runtime depending on a generator specific check. The dynamic behavior is currently implemented only for MacOS and should be fully backward compatible for other system. Inspired-By Tom Hughes <tomtheengineer@gmail.com>
* | Merge topic 'CPackNSIS-warnDESTDIRandABSOLUTE'David Cole2012-05-245-1/+143
|\ \ | | | | | | | | | | | | | | | | | | | | | 4986d52 Use CPACK_xxx and CMAKE_xxx in a consistent way. f90223c Fix KWStyle warning 47f0dbd CPack add necessary check to detect/warns/error on ABSOLUTE DESTINATION 6ba055b CPack add easy possibility to warn about CPACK_SET_DESTDIR
| * | Use CPACK_xxx and CMAKE_xxx in a consistent way.Eric NOULARD2012-05-202-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_xxx vars are now used in the CMake-generated cmake_install.cmake script while CPACK_xxx equivalent vars are used from within CPack. CPack is responsible for getting/forwarding definitions of CPACK_xxxx var corresponding to CMAKE_xxxx when invoking CMake-generated install scripts. As a consequence: CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION may be used from outside CPack as well. e.g. cmake -DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=1 -P cmake_install.cmake works as expected.
| * | CPack add necessary check to detect/warns/error on ABSOLUTE DESTINATIONEric NOULARD2012-05-145-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [usually] wrong usage of absolute DESTINATION in INSTALL rules keeps popping-up on the ML. We shall have some way to: 1) easily detect it. 2) forbids this for some CPack generator like NSIS In fact it should certainly be forbidden for *any* generators when used on Windows but we may implements that on top of the current patch. The patch ask the task to the generated cmake_install.cmake scripts. Those scripts are a little bit more complicated with that but iff there are absolute DESTINATION. This cost nothing if relative DESTINATION are used. Two new vars are introduced (and documented to handle that): CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION and CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
| * | CPack add easy possibility to warn about CPACK_SET_DESTDIREric NOULARD2012-05-144-1/+63
| | | | | | | | | | | | CPackNSIS will only warn but sooner or later it should error out
* | | CPack - preserve timestamp for CPACK_INSTALLED_DIRECTORIES. fixes: #0013193Eric NOULARD2012-05-091-2/+5
|/ /
* | Use fakeroot for control.tar.gz as wellEric NOULARD2012-04-171-5/+10
|/
* Merge topic 'CPack-fixCPACK_MONOLITHIC_INSTALL-handling'Brad King2012-03-195-3/+23
|\ | | | | | | | | 805c1b2 Handle CPACK_MONOLITHIC_INSTALL in some rare use cases.
| * Handle CPACK_MONOLITHIC_INSTALL in some rare use cases.Eric NOULARD2012-03-185-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | For example, when CPACK_<GEN>_COMPONENT_INSTALL and CPACK_MONOLITHIC_INSTALL are both set. Previously, this combination of variable settings produced an error without any explanation. Now, in this case CPACK_MONOLITHIC_INSTALL wins without trouble. This is useful for when e.g. CPACK_ARCHIVE_COMPONENT_INSTALL is globally on and one wants MONOLITHIC install for STGZ (but not other generators). The same behavior may be obtained by re-setting CPACK_ARCHIVE_COMPONENT_INSTALL to 0 but in any case the 'both set' case should have been handled without error.
* | Merge topic 'CPack-fixSTGZpermission-bug13046'Brad King2012-03-191-7/+18
|\ \ | | | | | | | | | | | | 4576f40 CPack STGZ put execute permission on all packages files (component case)
| * | CPack STGZ put execute permission on all packages files (component case)Eric NOULARD2012-03-181-7/+18
| |/
* | Merge topic 'fix-12621-xcode43'Brad King2012-03-192-25/+72
|\ \ | |/ |/| | | | | | | 0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621) 4693cf8 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)
| * CPack: Use real path to PackageMaker to find its version file (#12621)David Cole2012-03-131-0/+3
| | | | | | | | | | | | | | On machines where a usr/bin/packagemaker symlink is found, we were unable to find the version.plist file relative to the symlink. Resolve the symlink first, so we can find it relative to the real PackageMaker.
| * Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)David Cole2012-03-092-25/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 4.3 installs into "/Applications" by default, from the Mac App Store. Also, the paths to the available SDKs changed: they are now within the Xcode.app bundle. PackageMaker is installed as a separate program, and may be installed anywhere. It is not installed with Xcode 4.3 by default anymore. Download the "Auxiliary Tools for Xcode" to get PackageMaker. Put PackageMaker inside the Xcode.app bundle, in its nested Applications folder, or put it alongside Xcode in "/Applications" and CMake will find it. Update references to "find" paths: add new possible locations for finding Xcode.app and PackageMaker.app. Prefer the most recent version's locations first, but keep the old locations as fallback search paths, too. Thanks to all the contributors who provided and tested out various patches for fixing this issue. Especially, but by no means limited to: Francisco Requena Espí, Jamie Kirkpatrick and drfrogsplat.
* | CPack: Fix retry logic when calls to hdiutil failDavid Cole2012-03-092-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The long-standing sporadic failures of CPack tests on the Mac dashboards are caused by an occasional problem running hdiutil. To compensate for this, a retry loop was added in the code in a previous commit: a9fa71a4 ... but the logic for breaking out of the retry loop was flawed, breaking out of the loop (and not retrying) when the hdiutil command returns an error instead of when it returns success. This commit fixes the flawed logic, bumps up the number of retries from 4 to 10, and adds a half-second delay in between retries. The delay is specifically added in case a virus checker or spotlight indexer is temporarily causing the hdiutil failure by hanging onto a newly created file longer than hdiutil expects it to. As with all sporadically occurring issues, we'll never know if this is really fixed all the way. But I'll be happy even if we can only get it to happen just a bit less often.
* | Fix some typos in CPACK_SET_DESTDIR docEric NOULARD2012-03-061-4/+4
|/
* Merge topic 'dragndrop-sla'David Cole2012-03-021-5/+4
|\ | | | | | | | | 5663e43 DragNDrop: Fix problem with relocated files in Xcode 4.3
| * DragNDrop: Fix problem with relocated files in Xcode 4.3Clinton Stimpson2012-02-291-5/+4
| | | | | | | | | | | | Remove dependency on /Developer/Headers/FlatCarbon when creating SLAs for DMG images. Instead, of adding those .r files on the command line, include the necessary .r files from the generated .r file.
* | Review and update CPack variable documentation.Eric NOULARD2012-02-251-8/+56
|/ | | | | | | This concerns all variables common to all CPack generators. Variables mainly used and/or set in CPack.cmake are documented therein. C++ built-in variables are documented in cmCPackDocumentVariables.cxx.
* Dynamically add documentation section specified in documented script.Eric NOULARD2012-02-181-2/+1
| | | | Modify CPackDeb and CPackRPM as an example
* Merge topic 'ImproveCPackDoc-reloaded'David Cole2012-02-145-6/+179
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b77eb Avoid discovering system infos for documentation. Adding some path is enough. 9002f73 Fix non existent std::string::clear on VS6 02ccb32 Create getDocumentedModulesListInDir which may be used in other context. 24fbc28 Add missing section markup for CPackComponent bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code). 543f1ad Make the load of script documentation more efficient and dynamic. cdbd1a9 Fix another compiler warning due to a typo 52c53de Really avoid compiler warning about unused vars 37f90ed Calm down compiler warning about unused var 7c82b7f Fix potential bad memory access, thanks to Eike 62b589b Suppress unused var, beautify code, avoid 1 extra newline. 751713f Update bash completion file in order to handle new CPack doc options. 1629615 CPack Documentation extraction from CMake script begins to work 83e34dd Implement simple CMake script comment markup language. c6a0169 CPack begin the implementation of --help-command* and --help-variables*
| * Avoid discovering system infos for documentation. Adding some path is enough.Eric NOULARD2012-02-141-19/+20
| |
| * Create getDocumentedModulesListInDir which may be used in other context.Eric NOULARD2012-02-141-55/+12
| | | | | | | | | | This should makes it easier to use the same "documented module" techniques for CTest, CMake or user module.
| * Example of builtin variable documentation (i.e. only used in C++ source code).Eric NOULARD2012-02-141-7/+15
| |
| * Make the load of script documentation more efficient and dynamic.Eric NOULARD2012-02-141-13/+47
| | | | | | | | | | | | | | | | CPack help will be searched in any CPack*.cmake file located near to CPack.cmake file. The script files is parsed iff the first line begin with ##section. Moreover the documentation section name is specified on the remaining part of the line minus the space immediately following ##section.
| * Really avoid compiler warning about unused varsEric NOULARD2012-02-142-6/+2
| |
| * Calm down compiler warning about unused varEric NOULARD2012-01-312-0/+4
| |
| * CPack Documentation extraction from CMake script begins to workEric NOULARD2012-01-223-132/+75
| | | | | | | | | | | | | | | | | | | | - Enhance extract doc parser. Seems robust now. The legacy module documentation parser works as before ignoring the new markup. - Proof of concept for CPack (generic), CPack RPM and CPack Deb generator for macro and variables. Try cpack --help-command and cpack --help-variables
| * Implement simple CMake script comment markup language.Eric NOULARD2012-01-223-9/+33
| | | | | | | | | | | | | | | | | | The language is very simple. It use ##<keyword> special comment which opens a structured documentation block and ##end closes it. This may be used to extract documentation for macro as 'command' and 'variables' such that cpack --help-command and --help-variable does parse builtin modules files (CPack.cmake, CPackComponent.cmake, ...) in order to extract the corresponding doc.
| * CPack begin the implementation of --help-command* and --help-variables*Eric NOULARD2012-01-225-5/+211
| | | | | | | | | | | | This modifications set tries to keep the unified doc for cmake/ctest/cpack while introducing tool specific documentation separated. Some documentation sections for CMake do not fit well to CPack.
* | Merge topic 'CPackNSIS-fixIgnore-INCLUDE_TOPLEVEL'David Cole2012-02-141-3/+3
|\ \ | | | | | | | | | | | | 6a74eb1 CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.
| * | CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.Eric NOULARD2012-02-051-3/+3
| |/
* | CPackArchive restore default behavior and provide new variable.Eric NOULARD2012-02-012-2/+2
| | | | | | | | | | | | | | CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY should be set by the user in order to get the toplevel directory included in the archive whenever a componentized archive is requested. This solves bug #12129 and keeps fully backward compatible behavior.
* | CPack Add top level directory in component install for Archive GeneratorsDaniel Nelson2012-01-132-2/+14
|/ | | | | This patch fixes bug #0012129 Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* Document undocumented (but existing) cpack options (fix #0010134)Eric NOULARD2012-01-031-0/+23
|
* Usage: Print help, version and copyright options in usage information.Nicolas Despres2011-10-231-1/+1
| | | | There were missing for ctest, cpack and ccmake.
* Doxygen: Fix warnings.Nicolas Despres2011-10-231-1/+1
|
* Remove trailing white-spaces.Nicolas Despres2011-10-232-11/+11
|
* Merge topic 'CPackDeb-fakeroot'David Cole2011-09-211-1/+4
|\ | | | | | | | | 49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
| * CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is foundEric NOULARD2011-09-051-1/+4
| |
* | CPack: Do not recurse through directory symlinks (#12284)Johan Björk2011-09-061-0/+1
|/ | | | | | | | ...when building CPack archive-based packages (.tar.gz and similar) Rather, put the symlinks-to-directories into the archive as files, and expect/trust that the things the symlinks point to are also in the archive.
* Merge topic 'cpack-nsis-multi-installs'David Cole2011-08-021-4/+0
|\ | | | | | | | | e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
| * CPack/NSIS: Fix reinstall and multiple install issues when using components.Clinton Stimpson2011-07-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY. This allows different versions of software to have a separate sections in the registry to keep track of things (installed components, and uninstall stuff). Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another installation, the proper registry entries are more likely to be overwritten. Fix CPack/NSIS generator to not insert code in the NSIS template to skip installation of already installed components. This enables a repair like behavior and also enables installing patch releases on top of an older installation.
* | RunSingleCommand: Replace verbose boolean with enumJohan Björk2011-07-283-4/+8
|/ | | | | No behaviour change, this prepares for adding a flag to skip the merging of output streams.
* Ensure executable files have executable permissions.Wesley Turner2011-05-161-0/+27
| | | | | Fix the OSX X11 CPack generator to make sure the installer that it generates contains executable files.
* CPackRPM Fix #12096: handle absolute install path with component installEric NOULARD2011-04-171-0/+22
|
* CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging componentsMartin Konrad2011-04-091-1/+1
| | | | | | Copy the files specified in CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA to the right directory when packaging components. This fixes #12061. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>