summaryrefslogtreecommitdiffstats
path: root/Utilities
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-libarchive-openssl-no-hashes'Brad King2016-06-081-0/+1
|\ | | | | | | | | dbc9f73d libarchive: Restore OpenSSL include directory from upstream
| * libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto library, 2016-05-03) we accidentally dropped the include directory for OpenSSL as well as the library. Without that, it works only accidentally when CHECK_CRYPTO happens to choose the OpenSSL implementation and add the include directory. Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
* | Merge topic 'update-expat'Brad King2016-06-078-295/+433
|\ \ | |/ |/| | | | | | | 182f6458 Merge branch 'upstream-expat' into update-expat eb831123 expat 2016-06-05 (2b9cb7f5)
| * Merge branch 'upstream-expat' into update-expatBrad King2016-06-068-295/+433
| | | | | | | | | | * upstream-expat: expat 2016-06-05 (2b9cb7f5)
* | CMake 3.6.0-rc1 version updateBrad King2016-06-011-1/+1
|/
* liblzma: Avoid possible overflow on signed left shiftBrad King2016-05-251-1/+1
| | | | Use an unsigned value to produce the needed mask.
* clang-format.bash: Limit formatting to files selected by optionsBrad King2016-05-201-2/+45
| | | | | | | Now that our one-shot clang-format run is complete we rarely need to filter the entire tree anymore. Filter nothing if no options are given and just print the usage message. Offer options to specify selection of some set of files from Git as needed for various workflows.
* Revise C++ coding style using clang-formatKitware Robot2016-05-1612-36/+33
| | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* Add a script to run clang-format on the entire source treeBrad King2016-05-161-0/+91
| | | | | | List all sources in version control and filter out those that we should not format for various reasons. Then run the clang-format tool to do an in-place update.
* Utilities/Release: Switch to OS X 10.7 and Qt 5.6 for Mac binaryBrad King2016-05-061-2/+2
| | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.6.
* Merge topic 'update-expat'Brad King2016-05-0634-6923/+9514
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 58216d16 expat: Suppress compiler warnings f177c8a0 expat: Re-write CMake build system for our needs 4544c68a expat: Hard-code configuration options for our needs 9f7de396 expat: Drop upstream test/install/packaging code b4678e1c expat: Update cm_expat.h wrapper for new header location 94c62680 Merge branch 'upstream-expat' into update-expat 318b1c17 expat 2016-05-01 (379213ca) 48764630 expat: Disable all whitespace checks in third-party code f4bd9d43 Add script to update Expat from upstream 7eb7a189 Drop old expat sources to make room for a fresh import
| * expat: Suppress compiler warningsBrad King2016-05-052-0/+13
| | | | | | | | We are not developing expat so we do not care about warnings.
| * expat: Re-write CMake build system for our needsBrad King2016-05-052-33/+14
| | | | | | | | Hard-code production of a static library. Rename to `cmexpat`.
| * expat: Hard-code configuration options for our needsBrad King2016-05-053-28/+4
| | | | | | | | | | Also include our configured header on Windows too to get the same configuration.
| * expat: Drop upstream test/install/packaging codeBrad King2016-05-052-82/+0
| |
| * expat: Update cm_expat.h wrapper for new header locationBrad King2016-05-051-1/+1
| |
| * Merge branch 'upstream-expat' into update-expatBrad King2016-05-0523-0/+13896
| | | | | | | | | | * upstream-expat: expat 2016-05-01 (379213ca)
| * expat: Disable all whitespace checks in third-party codeBrad King2016-05-051-0/+1
| |
| * Add script to update Expat from upstreamBrad King2016-05-051-0/+49
| |
| * Drop old expat sources to make room for a fresh importBrad King2016-05-0521-11243/+0
| |
* | Utilities/Release: Update to openssl-1.0.2hBrad King2016-05-052-6/+6
|/ | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* libarchive: Drop early use of crypto libraryBrad King2016-05-031-2/+0
| | | | | | | | We already add the crypto library after the ssl library when using OpenSSL. Do not add it to the list of libraries individually or we may end up with the wrong order later. Further investigation will be needed to see how this change can be reconciled with the upstream need for the original line.
* Utilities/Release: Define NTDDI_VERSION for Windows binariesBrad King2016-05-032-2/+2
| | | | | | LibArchive now defines this explicitly if it is not defined already. Since we define _WIN32_WINNT explicitly, we must now define a consistent value of NTDDI_VERSION explicitly too.
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-0249-271/+868
| | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
* libarchive: Remove CMake-specific READMEBrad King2016-05-021-66/+0
| | | | | | We will now manage the libarchive source tree updates using the `Utilities/Scripts/update-libarchive.bash` script. Drop the README that covered the old method.
* Add script to update LibArchive from upstreamBrad King2016-05-021-0/+31
|
* Utilities/Release: Stabilize include order in WiX custom actionBrad King2016-04-291-0/+1
| | | | | | In `detect_nsis_overwrite.cpp` we include windows.h first, and we must preserve that. Place the include in an isolated block so that tools that sort includes do not move it.
* Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-296-6/+6
| | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* Utilities/Release: Skip spurious Qt5Autogen test for nightly win64 binaryBrad King2016-03-221-0/+4
| | | | | | This test fails spuriously too often and prevents the nightly binary from finishing. Simply skip it for the nightly binary to allow it to complete more regularly.
* Utilities/Release: Skip spurious Qt5Autogen test for nightly binaryBrad King2016-03-171-0/+4
| | | | | | This test fails spuriously too often and prevents the nightly binary from finishing. Simply skip it for the nightly binary to allow it to complete more regularly.
* Utilities/Release: Create a Windows 64-bit binaryBrad King2016-03-172-0/+30
| | | | | | | | | | | Compile with `-D_WIN32_WINNT=0x502` to use a WinXP-compatible API. Compile with `-D_USING_V110_SDK71_` to tell the VS standard library headers that we are building with a WinXP-compatible Windows SDK. Link executables with `-subsystem:console,5.02` to make them runnable on Windows XP 64-bit. Ideally `cmake-gui` should instead be linked with `-subsystem:windows,5.02` but with the Ninja and Makefile generators CMake adds `-subsystem:windows` after our `-subsystem:console,5.02` flag and the linker seems to interpret this combination as we need.
* Utilities/Release: Rename scripts to match target platformBrad King2016-03-175-5/+4
| | | | | The machine name we happen to use for the build is less informative than its platform.
* update-third-party: read attributes from the worktreeBen Boeckel2016-03-091-1/+1
| | | | | | | This should be done so that any attributes for ignoring certain files when exporting can be appended to the file during the extraction step, but ignored in the actual import. Necessary for importing the gitsetup repository.
* update-third-party: Add license noticeBrad King2016-03-091-0/+16
| | | | Our Git infrastructure scripts use the "Apache License 2.0".
* update-third-party: remove empty directories as wellBen Boeckel2016-03-091-0/+1
| | | | | | The `git ls-files | xargs rm` removes only files; directories which are empty are left laying around. This later chokes the `mv` which puts the "reduced" directory into place. Remove the empty directories as well.
* Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binaryBrad King2016-02-192-9/+14
| | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5.
* Merge topic 'update-prebuilt-openssl'Brad King2016-02-102-6/+6
|\ | | | | | | | | c0a1605b Utilities/Release: Update to openssl-1.0.2f
| * Utilities/Release: Update to openssl-1.0.2fBrad King2016-02-092-6/+6
| | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | Merge topic 'wix-prevent-nsis-overwrite'Brad King2016-02-108-1/+115
|\ \ | |/ |/| | | | | a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
| * CMake: Prevent WiX installations over existing NSIS installationsNils Gladitz2016-02-098-1/+115
| | | | | | | | | | | | | | | | Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue.
* | Merge topic 'install-man-conditionally'Brad King2016-02-091-0/+8
|\ \ | | | | | | | | | | | | 8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)
| * | Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)Brad King2016-02-081-0/+8
| |/
* | CMake 3.5.0-rc1 version updatev3.5.0-rc1Brad King2016-02-021-1/+1
|/
* Utilities/Release: Configure Windows binary to support Windows XPBrad King2015-12-211-0/+4
| | | | | | | | | | | Compile with `-D_WIN32_WINNT=0x501` to use a WinXP-compatible API. Compile with `-D_USING_V110_SDK71_` to tell the VS standard library headers that we are building with a WinXP-compatible Windows SDK. Link executables with `-subsystem:console,5.01` to make them runnable on Windows XP. Ideally `cmake-gui` should instead be linked with `-subsystem:windows,5.01` but with the Ninja and Makefile generators CMake adds `-subsystem:windows` after our `-subsystem:console,5.01` flag and the linker seems to interpret this combination as we need.
* Utilities/Release: Switch to .msi builder for Windows binaryBrad King2015-12-212-7/+8
| | | | | Use a new build machine to produce the Windows binary using the CPack WiX generator to produce a `.msi` installer.
* Utilities/Release: Optionally load environment on remote build serverBrad King2015-12-211-0/+1
|
* Utilities/Release: Add optional remote launcher to ssh callsBrad King2015-12-211-4/+7
|
* Merge topic 'import-kwiml'Brad King2015-12-2131-1737/+2065
|\ | | | | | | | | | | | | | | | | | | a5dd0c9d Add option to use a system-installed KWIML 036b6ef7 Port CMake from cmIML to KWIML 12293371 Merge branch 'upstream-KWIML' into import-kwiml 3fdbb0a8 KWIML 2015-12-09 (43f9f8d0) 55b21d07 Add script to update KWIML from upstream c7d9a249 Utilities/KWIML: Drop sources to make room for fresh import
| * Add option to use a system-installed KWIMLBrad King2015-12-183-2/+11
| | | | | | | | | | Do not activate it with the general use-system-libs options for now because KWIML is not commonly distributed or available.
| * Port CMake from cmIML to KWIMLBrad King2015-12-181-0/+18
| | | | | | | | KWIML no longer uses a configured prefix.