summaryrefslogtreecommitdiffstats
path: root/Source/CPack
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CPack-BugFixesSet'Brad King2012-11-131-1/+0
|\ | | | | | | | | b6f7881 Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.
| * Remove seemingly bogus duplicate CPACK_PACKAGE_FILE_NAME call.Andreas Mohr2012-11-111-1/+0
| | | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | Correct string literal typo (have "(NULL)" like all other cases).Andreas Mohr2012-11-101-1/+1
|/ | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* Merge topic 'deb-rpm-all_components_in_one'Brad King2012-11-062-4/+20
|\ | | | | | | | | e7e2694 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"
| * CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"Clinton Stimpson2012-11-062-4/+20
| |
* | Merge topic 'packagemaker-component-postflight'David Cole2012-10-313-36/+97
|\ \ | | | | | | | | | | | | 4374441 PackageMaker: Enable postflight script in component mode (#12375)
| * | PackageMaker: Enable postflight script in component mode (#12375)Clinton Stimpson2012-10-313-36/+97
| |/ | | | | | | | | | | | | | | | | | | | | Previously, setting CPACK_POSTFLIGHT_SCRIPT had no effect in component mode, when CPACK_COMPONENTS_ALL was set. In component mode, a .mpkg is created that contains multiple .pkg's. Because postflight scripts only work in a .pkg, add another .pkg to the .mpkg and put the postflight script in that. This is the same approach taken by the PackageMaker GUI when adding a postflight script to a metapackage.
* | Merge topic 'cpack-rez-error'David Cole2012-10-311-1/+16
|\ \ | | | | | | | | | | | | 14561e3 Fix for possible Rez errors when creating dmg.
| * | Fix for possible Rez errors when creating dmg.Clinton Stimpson2012-10-231-1/+16
| |/ | | | | | | | | Rez appears to have a limit on the length of lines it processes. Break up long lines from a license file to avoid the error.
* | Merge topic 'fix-9629-add-unicode-nsis-reg-key'David Cole2012-10-311-7/+19
|\ \ | |/ |/| | | | | 668dda0 CPack: Add automatic detection of the Unicode makensis (#9629)
| * CPack: Add automatic detection of the Unicode makensis (#9629)David Cole2012-10-171-7/+19
| |
* | Merge topic 'CPack-ArchiveGen-andDESTIR_ON'David Cole2012-10-171-1/+1
|\ \ | | | | | | | | | | | | ddec053 Make CPACK_SET_DESTDIR work with archive generator + component-based packaging
| * | Make CPACK_SET_DESTDIR work with archive generator + component-based packagingEric NOULARD2012-10-141-1/+1
| |/ | | | | | | Fix bug #13004. The patch is from Stanislaw Szymczyk.
* | Merge topic 'fix-some-CPackDoc-typos'David Cole2012-10-171-4/+14
|\ \ | | | | | | | | | | | | 2aad678 Document CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY and fix some typo.
| * | Document CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY and fix some typo.Eric NOULARD2012-10-141-4/+14
| |/
* | CPACK_XX_ON_ABSOLUTE_INSTALL_DESTINATION is now properly checked for ON/OFFEric NOULARD2012-10-141-2/+2
|/ | | | This fixes bug #0013490
* Enhance DESTDIR documentation. Fixes #0012374.Eric NOULARD2012-08-141-3/+4
|
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-1321-216/+216
| | | | | | | | | | | | | | | | | Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
* Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests'David Cole2012-07-242-1/+7
|\ | | | | | | | | | | | | b47cffa CPack: Use bin subdir when looking for dpkg and rpmbuild a8c659c Find dpkg and rpmbuild in usual Fink and MacPort paths 848f220 Do not run cpack at CMake time it is not available.
| * CPack: Use bin subdir when looking for dpkg and rpmbuildDavid Cole2012-07-202-4/+4
| |
| * Find dpkg and rpmbuild in usual Fink and MacPort pathsEric NOULARD2012-07-022-1/+7
| |
* | Merge topic 'CPack-honorCPACK_XXX-valuesInScriptFile'David Cole2012-07-091-3/+16
|\ \ | | | | | | | | | | | | 05a8630 Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.
| * | Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.Eric NOULARD2012-07-041-3/+16
| |/ | | | | | | This fixes bug #0012906.
* | CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.Eric NOULARD2012-07-031-2/+6
|/ | | | | | | | In 2.8.7 running cpack with no arguments would run the packaging iff a CPackConfig.cmake file is found whereas In 2.8.8 it displays the help. This commit restore the 2.8.7. We should add a test for this but this is not included in this commit.
* 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.