summaryrefslogtreecommitdiffstats
path: root/Source/CPack
Commit message (Collapse)AuthorAgeFilesLines
* Remove `//------...` horizontal separator commentsBrad King2016-05-0925-201/+0
| | | | | | | | | | | | | | | | | | | | | | | | Modern editors provide plenty of ways to visually separate functions. Drop the explicit comments that previously served this purpose. Use the following command to automate the change: $ git ls-files -z -- \ "*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" | egrep -z -v "^Source/cmCommandArgumentLexer\." | egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmDependsJavaLexer\." | egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmExprLexer\." | egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmFortranLexer\." | egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmListFileLexer\." | egrep -z -v "^Source/cm_sha2" | egrep -z -v "^Source/(kwsys|CursesDialog/form)/" | egrep -z -v "^Utilities/(KW|cm).*/" | xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}' This avoids modifying third-party sources and generated sources.
* Help clang-format wrap after braces on long initializer listsBrad King2016-05-061-0/+1
| | | | | | Add a long comment inside a few braced initializer lists in order to convince clang-format to break after the opening brace and format the list without indenting every value past the opening brace.
* Move comments off of class access specifier linesBrad King2016-05-063-11/+23
| | | | | | | | | | | | | | | | | | The clang-format tool may turn this: public: // comment about access specifier // unrelated comment indented with code ... Into: public: // comment about access specifier // unrelated comment indented with code ... Avoid this by moving comments off of access specifier lines.
* Isolate formatted streaming blocks with clang-format off/onBrad King2016-05-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang-format tool can do a good job formatting most code, but well-organized streaming blocks are best left manually formatted. Find blocks of the form os << "...\n" "...\n" ; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *("[^\n]*("|<<|;)$|;)\n){2,}' Find blocks of the form os << "...\n" << "...\n" << "...\n"; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *<<[^\n]*(\\n"|<<|;)$\n){2,}' Surround such blocks with the pair /* clang-format off */ ... /* clang-format on */ in order to protect them from update by clang-format. Use the C-style `/*...*/` comments instead of C++-style `//...` comments in order to prevent them from ever being swallowed by re-formatting of surrounding comments.
* Source: Sort includes the way clang-format wouldBrad King2016-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply the approach from commit e1c77472 (Format include directive blocks and ordering with clang-format, 2016-04-29) but this time be more careful about exclusion of parser generator sources: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '^Source/cmCommandArgumentLexer\.' | egrep -z -v '^Source/cmCommandArgumentParser\.' | egrep -z -v '^Source/cmDependsJavaLexer\.' | egrep -z -v '^Source/cmDependsJavaParser\.' | egrep -z -v '^Source/cmExprLexer\.' | egrep -z -v '^Source/cmExprParser\.' | egrep -z -v '^Source/cmFortranLexer\.' | egrep -z -v '^Source/cmFortranParser\.' | egrep -z -v '^Source/cmListFileLexer\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i Also drop use of custom sorting for `sys/types.h`.
* Source: Stabilize include order of sys/types.h before sys/stat.hBrad King2016-05-033-1/+5
| | | | | Include the two headers in an isolated block with a comment separating them so that tools that re-order includes do not re-order these.
* Format include directive blocks and ordering with clang-formatBrad King2016-04-2923-90/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Source: Stabilize include orderBrad King2016-04-2924-19/+29
| | | | | Each source file has a logical first include file. Include it in an isolated block so that tools that sort includes do not move them.
* CPack/IFW: port to cmXMLWriterDaniel Pfeifer2016-03-236-103/+81
|
* Merge topic 'cpack-osx-optional-CoreServices'Brad King2016-03-211-0/+6
|\ | | | | | | | | d84ba668 CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)
| * CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)Brad King2016-03-181-0/+6
| | | | | | | | | | | | Some compilers on OS X report errors in the CoreServices framework headers. Check for support of the header ahead of time and compile the relevant code only when the header is available.
* | Merge topic 'cpack-osx-no-carbon'Brad King2016-03-181-15/+6
|\ \ | |/ | | | | | | c718070c CPack: Avoid requiring Carbon framework on OS X (#16021)
| * CPack: Avoid requiring Carbon framework on OS X (#16021)Sean McBride2016-03-171-15/+6
| | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~232^2 (CPackDMG: Add support for multilingual SLAs, 2015-10-19) we added use of the Carbon framework in order to get access to its APIs to convert Script Manager RegionCode values. This is not necessary. Instead we can use CoreServices. While at it, replace individual CoreFoundation includes with including the entire framework, which is the correct way.
* | CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) optionDaniel Wirtz2016-02-181-2/+1
|/
* CPack/DragNDrop: Fix handling of certain license file content (#15899)Andrey Mishchenko2016-01-072-25/+77
| | | | | | | There were issues in the special-character-escaping and line-wrapping code which caused DragNDrop packaging to fail mysteriously at a later step with parsing errors in the `sla.r` file generated by the following code.
* CPackWIX: Allow multiple patch files and diagnose if any are missingNils Gladitz2015-12-143-4/+21
| | | | | | | CPACK_WIX_PATCH_FILE now accepts a list of patch files. An error will now be produced if any of the patch files is missing. Previously this would be silently ignored.
* CPackWIX: Allow patching of shortcut componentsNils Gladitz2015-12-121-0/+2
|
* CPackWIX: Fix installed file property lookups when using componentsNils Gladitz2015-12-102-4/+22
| | | | | | | | | The WIX generator incorrectly looked for installed file properties by relative paths that included the component specific staging directory prefix. Remove that prefix in installed file property lookups when generating packages with components.
* CPack/DragNDrop: Allow single license for multiple languagesSimon Levermann2015-12-022-7/+17
| | | | | | | When both CPACK_DMG_SLA_DIR and CPACK_RESOURCE_FILE_LICENSE are defined, use the license file for all languages instead of looking for a license file for each language. Also expand the documentation on the SLA variables.
* CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variableSimon Levermann2015-11-231-7/+7
| | | | | | | The change in commit f88533cc (CPackDMG: Add support for multilingual SLAs, 2015-10-19) accidentally used CPACK_DMG_LANGUAGES in its implementation instead of the intended CPACK_DMG_SLA_LANGUAGES added to the documentation.
* CPack/DragNDrop: Optionally run an AppleScript when making a packageRobert Maynard2015-11-132-11/+100
| | | | | | | | | | | | | | | | While the DragNDropGenerator supports custom DS_Store and backgrounds, it is still very hard to automatically setup nice looking packages. The primary issue is that the DS_Store embeds the name of the volume in the path to backgrounds, which means that if a package embeds the version in its volume name a new DS_Store must generated for each release. Instead one now can use applescript to setup the DS_Store. This change also ensures that temporary RW image has enough space for these changes, creating 1 MB dummy padding file, that is later removed from the image. Co-Author: Adam Strzelecki <adam.strzelecki@java.pl>
* CPack/DragNDrop: Place the background image file in a hidden folderRobert Maynard2015-11-131-16/+2
| | | | | | By using a hidden folder we avoid the need to mark the file as hidden from finder, and it makes it easier for future work to refer to the background image file.
* CPack/DragNDrop: Use source file extension for background imageRobert Maynard2015-11-131-1/+5
| | | | | | | Instead of blindly copying the `CPACK_DMG_BACKGROUND_IMAGE` file to `background.png`, we instead use the same file extension as the source image. This is needed for proper support of multi resolution `tif` backgrounds.
* CPackWIX: Don't allow users to deselect the top-level feature (#15838)Nils Gladitz2015-11-091-0/+1
| | | | | | | | | | The top-level WiX feature implicitly created by the WIX generator represents the package as a whole. As such it does not make sense to allow installer users to deselect it from the installation. Suggested-by: Mark Stijnman
* Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-11-092-39/+333
|\ | | | | | | | | f88533cc CPackDMG: Add support for multilingual SLAs
| * CPackDMG: Add support for multilingual SLAsSimon Levermann2015-11-062-39/+333
| | | | | | | | | | | | | | | | | | Multiple languages for SLAs and the SLA UI can be added via the CPack variables CPACK_DMG_SLA_DIR and CPACK_DMG_SLA_LANGUAGES. For each language defined in the languages variable, CPack will search for <language>.menu.txt and <language>.license.txt in CPACK_DMG_SLA_DIR. If the sla directory variable is not defined, the old behaviour using CPACK_RESOURCE_FILE_LICENSE is retained.
* | CPackDEB: added config file optional Source fieldRaffi Enficiaud2015-11-041-0/+7
|/
* Merge topic 'cpack-deb-fakeroot-removal'Brad King2015-10-261-1/+1
|\ | | | | | | | | 66178ae5 CPackDEB: Use proper compression scheme for control.tar.gz
| * CPackDEB: Use proper compression scheme for control.tar.gzRaffi Enficiaud2015-10-231-1/+1
| | | | | | | | | | | | Changes in commit v3.4.0-rc1~79^2~1 (CPackDeb: use of libarchive and removal of fakeroot, 2015-09-11) accidentally set the wrong compression scheme for the `control.tar.gz` file. Set it explicitly to GZip.
* | Merge topic 'wix-text-node'Brad King2015-10-146-19/+118
|\ \ | | | | | | | | | | | | 5a266095 CPackWIX: Handle text nodes in XML patch content
| * | CPackWIX: Handle text nodes in XML patch contentNils Gladitz2015-10-126-19/+118
| | |
* | | cmState: Initialize default definitions immediately.Stephen Kelly2015-10-132-0/+2
|/ / | | | | | | Don't leave this as cmMakefile responsibility.
* | Merge topic 'cpack-nsis-bitmap'Brad King2015-10-081-0/+22
|\ \ | | | | | | | | | | | | 3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
| * | CPackNSIS: Add options to set the bitmap for NSIS installer left sideColin Tracey2015-10-061-0/+22
| | | | | | | | | | | | | | | set MUI_WELCOMEFINISHPAGE_BITMAP set MUI_UNWELCOMEFINISHPAGE_BITMAP
* | | Remove unused cmLocalGenerator include.Stephen Kelly2015-10-059-9/+0
| | |
* | | CPack: Remove needless cmLocalGenerator creation.Stephen Kelly2015-10-052-5/+0
|/ /
* | CPack: allow packaging of empty directoriesDomen Vrankar2015-09-282-3/+11
| |
* | CPackDeb: allow empty directories in component packagesRaffi Enficiaud2015-09-281-0/+2
| |
* | Revert topic 'cpack-package-empty-dirs'Brad King2015-09-252-6/+0
| | | | | | | | | | | | | | | | | | The changes in commit 47b060ae (CPackDeb: allow empty directories in component packages, 2015-09-21), commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-21), and commit b761e90d (CPack: remove accidental changes, 2015-09-22) regressed packaging of CMake itself. Revert the changes until they can be revised and rebased on other changes that make additional fixes.
* | CPack: remove accidental changesDomen Vrankar2015-09-231-1/+0
| | | | | | | | | | Remove changes accidentally included in commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-22).
* | CPack: allow packaging of empty directoriesDomen Vrankar2015-09-221-0/+5
| |
* | CPackDeb: allow empty directories in component packagesRaffi Enficiaud2015-09-211-0/+2
| |
* | CPackDeb: preventing md5sum on symlinksRaffi Enficiaud2015-09-181-13/+16
|/ | | | | | - Direct call to cmSystemTools::ComputeFileMD5 - Avoiding hashing symlinks - Tests
* CPackDeb: use of libarchive and removal of fakerootRaffi Enficiaud2015-09-171-113/+186
|
* cmLocalGenerator: Create from already-constructed cmMakefile.Stephen Kelly2015-08-282-6/+8
| | | | Don't manage the lifetime of the cmMakefile with cmLocalGenerator.
* cmGlobalGenerator: Remove MakeLocalGenerator method.Stephen Kelly2015-08-282-2/+2
| | | | Inline implementation to callers.
* cmGlobalGenerator: Require a snapshot to create a local generator.Stephen Kelly2015-08-282-2/+4
|
* Replace foo.size() pattern with !foo.empty().Stephen Kelly2015-08-245-6/+6
|
* Replace 'foo.size() == 0' pattern with foo.empty().Stephen Kelly2015-08-241-2/+2
|
* Replace 'foo.size() > 0' pattern with !foo.empty().Stephen Kelly2015-08-241-1/+1
|
generated by cgit v0.12 at 2024-11-14 23:39:44 (GMT)