| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
dbc9f73d libarchive: Restore OpenSSL include directory from upstream
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
|/|
| |
| |
| | |
182f6458 Merge branch 'upstream-expat' into update-expat
eb831123 expat 2016-06-05 (2b9cb7f5)
|
| |
| |
| |
| |
| | |
* upstream-expat:
expat 2016-06-05 (2b9cb7f5)
|
|/ |
|
|
|
|
| |
Use an unsigned value to produce the needed mask.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Use a new build machine to produce the OS X binary targeting OS X 10.7
and using Qt 5.6.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
We are not developing expat so we do not care about warnings.
|
| |
| |
| |
| | |
Hard-code production of a static library. Rename to `cmexpat`.
|
| |
| |
| |
| |
| | |
Also include our configured header on Windows too to get the same
configuration.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
* upstream-expat:
expat 2016-05-01 (379213ca)
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
| |
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
The Debian package checker tool (lintian) detected several typos in
CMake.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
The machine name we happen to use for the build is less informative than
its platform.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Our Git infrastructure scripts use the "Apache License 2.0".
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Use a new build machine to produce the OS X binary targeting OS X 10.7
and using Qt 5.5.
|
|\
| |
| |
| |
| | |
c0a1605b Utilities/Release: Update to openssl-1.0.2f
|
| |
| |
| |
| |
| | |
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
|
|\ \
| |/
|/|
| |
| | |
a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| | |
| | |
| | |
| | | |
8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)
|
| |/ |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Use a new build machine to produce the Windows binary using the CPack
WiX generator to produce a `.msi` installer.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Do not activate it with the general use-system-libs options for now
because KWIML is not commonly distributed or available.
|
| |
| |
| |
| | |
KWIML no longer uses a configured prefix.
|