kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,191 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

126 Commits

Author SHA1 Message Date
Rolf Eike Beer 5bd48ac534 Replace string(REGEX REPLACE) with string(REPLACE) where possible 
The simple replacement is much faster.
 2014-04-14 18:17:05 +02:00
Kitware Robot a77e308693 CPack: Replace #<type> markup with reStructuredText equivalent 
Drop #end and #module.  Convert #section to a subsection header.
Convert #variable to the cmake domain "variable" directive.
Convert #macro to the cmake domain "command" directive.
Perform minor formatting fixes in text near these changes.
 2013-10-16 09:22:39 -04:00
Kitware Robot f051814ed0 Convert builtin help to reStructuredText source files 
Run the convert-help.bash script to convert documentation:

 ./convert-help.bash "/path/to/CMake-build/bin"

Then remove it.
 2013-10-15 14:12:03 -04:00
Brad King 3b216d19f8 Merge topic 'CPack-fixGeneratedChangelogFormat' 
976e51d CPackRPM make the changelog line conform to expected format
 2013-07-15 09:30:45 -04:00
Eric NOULARD 976e51d3a9 CPackRPM make the changelog line conform to expected format 2013-07-08 10:32:53 +02:00
Eric NOULARD 1703e069a9 CPackRPM protect '@' character in filename processed in the spec file. 2013-07-05 18:52:36 +02:00
Brad King 7e7b7fe4b3 Merge topic 'CPackRPM-avoidOwningSystemDirs' 
f055c99 CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path
bac5772 CPackRPM add mechanism to remove path from generated list of file in RPM spec.
 2013-05-16 14:36:00 -04:00
Eric NOULARD f055c997a5 CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path 2013-04-05 12:53:47 +02:00
Eric NOULARD bac5772b39 CPackRPM add mechanism to remove path from generated list of file in RPM spec. 
This fixes bug #0013609, and is a possible solution to #0012864 as well.
The later will be completely fixed in another way. Both approaches
needs to be implemented because the current one is more automatic.

Inspired-By: Ari
 2013-04-05 12:43:50 +02:00
Eric NOULARD 2ef908f911 Add support for componentized USER spec file 
CPACK_RPM_USER_BINARY_SPECFILE can now be specified on a per-component
basis using CPACK_RPM_<componentName>_USER_BINARY_SPECFILE.

Inspired-By: Theodore Papadopoulo with its patch proposal.
 2013-04-01 16:06:22 +02:00
Eric NOULARD 9be3da1c80 CPackRPM fix #13898 uses IF(DEFINED var) to avoid wrong var value logic 2013-02-09 13:42:05 +01:00
Clinton Stimpson e7e2694823 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE" 2012-11-06 11:50:07 -05:00
Eric NOULARD d8a1dd5865 Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly. 
This triggered an unknown secondary bug when there is
no ABSOLUTE INSTALL file. This is fixed as well.

This is based on a fix of bug #0013468 from Viktor Dubrovsky.
 2012-09-10 22:35:02 +02:00
Rolf Eike Beer 637207e62a do not escape spaces in regular expressions 
The space has no special meaning in regular expressions so it doesn't need to
be escaped.
 2012-08-19 11:49:56 +02:00
Kitware Robot 9db3116226 Remove CMake-language block-end command arguments 
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
 2012-08-13 14:19:16 -04:00
Kitware Robot 77543bde41 Convert CMake-language commands to lower case 
Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
 2012-08-13 14:19:16 -04:00
Andy Piper 822c1eaf9e Do not include directories which are part of the package install prefix. 
This fix bug #0013451. The bug prevents theorerically relocatable RPM package
to be installed properly.
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2012-08-07 19:15:19 +02:00
Eric NOULARD 7321c94e59 CPackRPM: avoid leakage of RPM directive from one component to another. 
Fixes #0013248
Inspired-By: Sergei Golubchik
 2012-06-05 10:20:43 +02:00
Tom Hughes 3a0c60d3bf Override topdir from rpm command line seems necessary on Amazon linux. 
This modification should be harmless on other distro.
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2012-03-27 21:43:35 +02:00
David Cole 7d02020d68 Merge topic 'CPack-dynamicDocSection' 
9a8103e Try to fix compile error on Win32-vs70
4da2223 Fix typo in end markup
cfac874 More documentation concerning CPack Components
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
b8a274c Add structured documentation for NSIS
a6bce55 Dynamically add documentation section specified in documented script.
 2012-02-21 15:57:17 -05:00
Eric NOULARD a6bce55aef Dynamically add documentation section specified in documented script. 
Modify CPackDeb and CPackRPM as an example
 2012-02-18 22:07:39 +01:00
Modestas Vainius d36d29f1f0 various typo and formatting fixes in manual pages (#12975) 
The patch fixes the following lintian warnings:

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2728: warning: macro `..' not defined
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz explicitely explicitly
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz jave java
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakeprops.1.gz 1040: warning [p 25, 3.7i]: can't break line
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 4233: warning [p 85, 1.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explicitely explicitly
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz jave java
 2012-02-18 16:12:45 +01:00
Eric NOULARD 543f1adfa4 Make the load of script documentation more efficient and dynamic. 
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.
 2012-02-14 16:05:23 -05:00
Eric NOULARD 1629615a10 CPack Documentation extraction from CMake script begins to work 
- 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
 2012-01-22 13:31:24 +01:00
Deborah Pickett ae250d5cfa CPackRPM flag direcories with %dir in the generated spec file 
This fix bug #12863 whose symptom was a lot of "warning: File listed twice"
printed out by rpmbuild when processing the spec file.

Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2012-01-13 21:35:41 +01:00
Eric NOULARD 121c29553f CPackRPM fix #0012608 and unoticed related bug 
The User may now specific a list of file that shouldn't be
automatically handled by CPack but specified by the user.
Like %config(noreplace) or specific %attr.
The concerned files/dir lines will be removed from the set
automatically handled by CPack.
 2011-12-12 23:11:02 +01:00
Eric NOULARD 9066886f9b CPackRPM fix #12556 and enhance documentation 
Inspired-By: Chip Christian
 2011-11-05 11:40:47 +01:00
Eric NOULARD e20c59ae50 CPackRPM support component specific variables for spec files 
This is a modified version of a user patch
Inspired-By: informant
 2011-10-30 20:13:20 +01:00
Eric NOULARD cc26a0614a CPackRPM authorize per-component pre/post-[un]install scripts (#0012063) 
Merged patch from Chip Christian previously based on the one from winfriedd
with some small pruning editing by commiter
 2011-09-20 20:21:01 +02:00
David Cole c80cbad152 Merge topic 'CPackRPM-includeDir' 
f9e5277 CPackRPM fix #12305, include directories in RPM package
 2011-09-07 15:38:50 -04:00
Eric NOULARD f9e5277941 CPackRPM fix #12305, include directories in RPM package 2011-09-05 22:15:31 +02:00
Eric NOULARD b0f6a97587 CPack fix #12366 components RPM packages have the same package name 
fix based on the patch provided by winfriedd
 2011-09-05 20:22:00 +02:00
Eric NOULARD 2af80c76ee Add some more Specs file tag handling. 2011-06-12 12:49:44 +02:00
Eric NOULARD 05720c75c1 CPackRPM: Enhance documentation 2011-06-12 12:12:24 +02:00
Eric NOULARD db45b10ff7 CPack make RPM work on AIX. fix #0012183 merge patch from Pasi Valminen 2011-05-21 12:34:37 +02:00
Eric NOULARD d3fd945900 CPackRPM Fix #12096: handle absolute install path with component install 2011-04-17 17:12:38 +02:00
Eric NOULARD 7ebbcf19de CPackRPM non matching ENDIF 2011-03-10 18:32:47 +01:00
Eric NOULARD 0e07b425ca CPackRPM even more trace in debug mode or in case of failure 2011-03-10 18:20:16 +01:00
Eric NOULARD 564b7311f4 CPackRPM add more trace output in order to help failing diagnostics 2011-03-10 09:48:46 +01:00
Eric NOULARD 8d366cd1eb CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...) 2010-12-13 20:11:06 +01:00
Eric NOULARD 2c84d169b3 CPackRPM add basic component support to CPackRPM 
basic means 1 RPM per component and no dependency handling
this implies some CPackGenerator refactoring
 2010-11-13 17:56:36 +01:00
Eric NOULARD 4a4a53f3dd CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737) 
merge patch from Frank Stappers
 2010-10-03 23:29:34 +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
Todd Gamblin 2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04: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
Eric NOULARD 604c3698c1 CPackRPM:: [partially] support relocatable package 
The support is partial because it cannot be used if
   CPACK_SET_DESTDIR is set
   some file are installed using absolute path
 2010-07-09 20:01:57 +02:00
Brad King 48ac8180db Merge branch 'CPackRPM-handleFileWithSpace' 2010-07-06 10:30:30 -04:00
Brad King bf3abc592e Merge branch 'CPackRPM-VariousEnhancement-0010741' 2010-07-06 10:29:48 -04:00
Eric NOULARD 6926e9114c CPackRPM:: Quote every filenames in %file section (see bugs 10701,10871,10345) 2010-07-04 15:08:17 +02:00
Eric NOULARD c29cf0e1d2 Provides default changelog if no file is provided 2010-07-04 12:27:47 +02:00
Eric NOULARD 7486396e5b CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934) 2010-07-04 11:43:33 +02:00
Rolf Eike Beer dbe7525c6e clean up some stuff in CPack RPM script 
-remove trailing whitespace
-fix description of CPACK_RPM_PACKAGE_SUMMARY
-fix description of CPACK_RPM_PACKAGE_VENDOR
-fix description of CPACK_RPM_PACKAGE_PROVIDES
-do not put changelog of that file to generated RPM but read it from CPACK_RPM_CHANGELOG_FILE
-add CPACK_RPM_PACKAGE_URL
-add CPACK_RPM_PACKAGE_OBSOLETES
-add CPACK_RPM_PACKAGE_SUGGESTS
-add a loop so adding more user supplied header fields is easy

Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
 2010-07-04 11:11:52 +02:00
Eric NOULARD fcdbe001ea CPackRPM:: Fix bug #10363, specify compression type in RPM spec 
This is a feature request
--Eric
 2010-04-10 11:23:01 +02:00
Eric Noulard 5b0bbd6c33 CPackRPM:: Fix bug on Open SuSE 11.2 coming from initial fix of bug8972 
Eric
 2009-11-28 09:57:59 -05:00
Eric Noulard 03a8e912cb CPackRPM: do not forget to include installed symlinks (bug 9927) 
Eric
 2009-11-22 12:52:47 -05:00
Eric Noulard 147aa6bf80 CPackRPM: tolerate redhat specific clean BUILD ROOT pre-build macro (bug 9872) 
Eric
 2009-11-15 13:55:42 -05:00
Eric Noulard 33358ff4ff CPackRPM:: add support for USER specified post/pre [un]install scripts (fix bug 8988) 
Eric
 2009-11-11 15:55:44 -05:00
Eric Noulard c0814f4155 CPackRPM:: support user supplied "Provides" in spec file (fix bug 9584) 
Eric
 2009-11-11 15:27:44 -05:00
Eric Noulard 28f54d0b85 CPackRPM:: Support USER supplied spec files (bug 9679) 
Eric
 2009-11-09 16:17:22 -05:00
Eric Noulard 2362fdc850 Fix CPack bug #9654 
Eric
 2009-11-09 14:06:36 -05:00
Brad King 3a666595c9 Convert CMake non-find modules to BSD License 
This adds copyright/license notification blocks CMake's non-find
modules.  Most of the modules had no notices at all.  Some had notices
referring to the BSD license already.  This commit normalizes existing
notices and adds missing notices.
 2009-09-28 11:46:51 -04:00
Alexander Neundorf 79ed6b8ebc BUG: fix #9031: newer rpm versions complain about the "#%" lines 
Alex
 2009-05-29 16:09:56 -04:00
Alexander Neundorf ca3e9623e9 STYLE: add documentation for CPackRPM (#9029) 
Alex
 2009-05-14 15:31:18 -04:00
Alexander Neundorf f43e36a65d BUG: apply patch from Eric Noulard, so cpack works with rpmbuild 4.6.0, #8967 
Alex
 2009-05-12 15:13:10 -04:00
Bill Hoffman e87d252e95 BUG: #7904 add rpm package depend 2008-12-03 14:37:13 -05:00
Bill Hoffman 924fae24cf BUG: 7435, remove warning for not setting DESTDIR 2008-09-22 09:56:24 -04:00
Bill Hoffman d07fefc9ee BUG: 7435 fixes to add optional post-install 2008-09-19 17:45:37 -04:00
Alexander Neundorf 09829174a3 BUG: fix rpmbuild bug, which expands variables in comments :-/ 
apparently rpmbuild can't handle paths with spaces and can't handle
variables in comments...

Alex
 2008-02-25 14:23:24 -05:00
Bill Hoffman a1a5895c89 ENH: fix for RPM generator from Eric 2007-11-01 09:52:09 -04:00
Bill Hoffman 09c49cf658 ENH: use cpack generic variable if rpm one is not set 2007-10-30 10:16:43 -04:00
Bill Hoffman 6f2a997781 BUG: fix for bug 5878 2007-10-12 19:33:41 -04:00
Alexander Neundorf 483a147136 ENH: fail with error if trying to create a RPM stating that rpmbuild can't 
handle spaces

Alex
 2007-08-29 16:31:46 -04:00
Alexander Neundorf 45da4d2f80 ENH: patch from Eric Noulard for an RPM package generator 
It seems rpmbuild can't handle paths with spaces, it complains that
Buildroot takes only one tag (or something like this), quoting and escaping
don't seem to help.

Alex
 2007-08-17 09:13:15 -04:00
Alexander Neundorf 7432ef206e ENH: add empty RPM package generator, Eric Noulard wants to work on it 
Alex
 2007-08-08 11:33:42 -04:00