1172 Commits

Author SHA1 Message Date
Matthew Woehlke
62b85c9406 Utilities/Sphinx: Use brighter colors for html theme
Set Sphinx `html_theme_options` to give the generated documentation a
brighter and softer look than the default colors.
2017-03-28 13:38:42 -04:00
Brad King
6449063784 update-kwsys: Disable custom gitattributes during import
The KWSys `.gitattributes` file now defines custom attributes.
Git does not support these in a subdirectory where we are about
to place the content, so comment them out during import.
This also ensures that the `our-c-style` attribute on KWSys
sources does not activate the `format.clang-format` attribute
on the third-party import branch.
2017-03-24 15:16:39 -04:00
Brad King
f1a5583901 update-third-party: Add helper to disable custom gitattributes
Provide a helper function that import scripts can use when the
third-party project defines custom Git attributes in its top-level
`.gitattributes` file.  These must be commented out because Git
does not support custom attributes in a subdirectory where we
where the third-party project is about to be merged.
2017-03-24 15:13:55 -04:00
Brad King
97662babe9 Merge topic 'binaries-from-gitlab-repo'
954185d4 Utilities/Release: Fetch stage/master/head

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !621
2017-03-24 10:43:43 -04:00
Brad King
954185d414 Utilities/Release: Fetch stage/master/head
Update our release scripts to fetch `refs/stage/master/head` from
the `gitlab.kitware.com` repository.  This will allow us to prepare
releases from staged commits before merging them to `master` or
`release`.
2017-03-24 08:56:41 -04:00
Brad King
59032a3847 Merge topic 'libarchive-backport-rc4-crypto-rec'
18009aaf libarchive: backport rc4 crypto requirement update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !598
2017-03-22 08:49:35 -04:00
Brad King
18009aaf5e libarchive: backport rc4 crypto requirement update
Backport upstream libarchive commit 70f497f456 (As per Cryptographic
Requirements, 2017-03-19).  Discard more bytes of the RC4 keystream
to reduce the possibility of non-random bytes.
2017-03-21 11:09:25 -04:00
Brad King
9a1ee04dd5 Utilities/Release: Fetch from gitlab.kitware.com repository
Update our release scripts to fetch from the gitlab.kitware.com
repository instead of the cmake.org repository.  Revise our
mapping of special branch names to account for the refs that
now store them in the new repository.
2017-03-03 15:03:00 -05:00
Brad King
6cd3079ce8 SetupForDevelopment: Drop cmake.org remote repo configuration
We no longer push directly to cmake.org repositories.  Changes now
go through https://gitlab.kitware.com/cmake/cmake for integration.
2017-03-03 13:31:49 -05:00
Brad King
d33de80c8a Help/dev: Exclude this directory from user-facing documentation
Teach Sphinx and our own install rules to skip a `Help/dev` directory.
This will give us a place to put developer-only documentation that
should not be included in the user-facing documentation.  Add a
placeholder README.
2017-03-01 16:05:55 -05:00
Brad King
6403cda149 Merge topic 'update-kwiml'
f77420cf Merge branch 'upstream-KWIML' into update-kwiml
ae6607af KWIML 2017-02-27 (aa3a7733)
2017-02-28 09:11:47 -05:00
Brad King
6a8da1d777 Merge topic 'update-libarchive'
29528cc3 libarchive: Remove liblzma from introspection tests
62d0e223 Merge branch 'upstream-LibArchive' into update-libarchive
059aa805 LibArchive 2017-02-25 (d6b1bb9f)
5fee7660 libarchive: Update script to get 3.3.1
2017-02-28 09:11:45 -05:00
Brad King
e4ac7c2b4f libuv: Compile as C 90 on Solaris 10 2017-02-28 09:03:12 -05:00
Brad King
f77420cfc9 Merge branch 'upstream-KWIML' into update-kwiml
* upstream-KWIML:
  KWIML 2017-02-27 (aa3a7733)
2017-02-27 13:49:07 -05:00
Brad King
220b799c8a Merge branch 'kwiml-test-gcc-format-security' into release 2017-02-27 13:47:34 -05:00
Orion Poplawski
4ca77bb6db KWIML: Add -Wno-format-security to tolerate -Werror=format-security
When compiling KWIML tests with `-Werror=format-security` we get

    error: -Wformat-security ignored without -Wformat

Therefore we should disable both `format` and `format-security`
together.
2017-02-27 13:47:00 -05:00
Brad King
29528cc33e libarchive: Remove liblzma from introspection tests
This was added upstream but does not make sense in CMake because we
may replace the library with a logical target name that will not
work inside a `try_compile`.
2017-02-27 08:53:08 -05:00
Brad King
62d0e22325 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2017-02-25 (d6b1bb9f)
2017-02-27 08:51:36 -05:00
Brad King
5fee76606b libarchive: Update script to get 3.3.1 2017-02-27 08:47:11 -05:00
Brad King
c9b3c5625a libuv: Link to 'rt' library on Solaris 10 to get semaphores 2017-02-26 10:48:26 -05:00
Brad King
f06986926a libuv: Implement mkdtemp on Solaris 10 2017-02-26 10:48:26 -05:00
Brad King
5651257fff libuv: automatically skip ifaddrs on Solaris 10 2017-02-26 10:48:26 -05:00
Brad King
33f636264a Merge topic 'update-libarchive'
d49176e9 libarchive: Avoid using isblank
ce8f117f libarchive: Avoid declaration after statement in C code
e0f725f8 libarchive: Fix use of ssize_t in archive_entry.h
ae4861ec libarchive: Define __LA_DEPRECATED consistently
fecb70dd Update CMake pre-cached values for libarchive 3.3.0
a59a7ee9 Merge branch 'upstream-LibArchive' into update-libarchive
c206211a LibArchive 2017-02-19 (100ee75a)
cdce7c61 libarchive: Update script to get 3.3.0
2017-02-24 09:31:22 -05:00
Brad King
8429068d7c Merge topic 'update-libuv'
741b7621 Merge branch 'upstream-libuv' into update-libuv
1f661e87 libuv 2017-02-21 (52ae8264)
2017-02-24 09:31:18 -05:00
Brad King
d23f4414c4 Merge topic 'clang-format-attrs'
d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting
f6986ee4 Define a custom Git attribute to mark sources using our C style
2256c3a7 Define a custom Git attribute to mark source files as generated
2017-02-23 07:35:32 -05:00
Brad King
d49176e91e libarchive: Avoid using isblank
It is not available on VS 2012 and below.  Use our own impl instead.
2017-02-23 07:15:21 -05:00
Brad King
ce8f117fe2 libarchive: Avoid declaration after statement in C code 2017-02-23 07:15:21 -05:00
Brad King
e0f725f821 libarchive: Fix use of ssize_t in archive_entry.h
This type is not available on Windows compilers so for clients including
this header we need to use `la_ssize_t` instead as we do in `archive.h`.
2017-02-23 07:15:21 -05:00
Brad King
ae4861ec22 libarchive: Define __LA_DEPRECATED consistently
Upstream libarchive now defines this macro in two places with the same
logic in both.  However, CMake's bundled copy disables this macro, so
we need to update the new location of its definition to be consistent.
2017-02-23 07:15:20 -05:00
Brad King
d5f39a56a4 clang-format.bash: Use Git attributes to mark files for formatting 2017-02-22 16:59:26 -05:00
Brad King
741b7621b3 Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
  libuv 2017-02-21 (52ae8264)
2017-02-21 19:40:27 -05:00
Brad King
a59a7ee956 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2017-02-19 (100ee75a)
2017-02-20 08:04:00 -05:00
Brad King
cdce7c619c libarchive: Update script to get 3.3.0 2017-02-20 07:50:23 -05:00
Brad King
f45e3b9509 Merge branch 'backport-clang-format-cuda' into release 2017-02-14 10:22:43 -05:00
Brad King
fa5188d0ed Merge branch 'backport-clang-format-cuda' into clang-format-cuda 2017-02-14 10:21:22 -05:00
Brad King
592e3d2f96 clang-format.bash: Format CUDA source files too
Add `.clang-format` configuration files for Cuda test directories that
use `Standard: Cpp11`.  Otherwise clang-format splits the triple angle
brackets used for CUDA kernels.
2017-02-14 10:20:23 -05:00
Brad King
bb72fff2f0 Merge topic 'update-curl'
d4da4755 Help: Add notes for topic 'update-curl'
14c77153 Tests: Fix `file://` URLs given to curl
73ae6700 curl: Fix passing _WINSOCKAPI_ macro to compiler
1df9d5f9 Merge branch 'upstream-curl' into update-curl
4cc2908f curl 2016-12-22 (44b9b4d4)
f4a3290a curl: Update script to get curl 7.52.1
2017-02-10 13:36:11 -05:00
Brad King
46c6489850 Merge topic 'sphinx-1.4'
30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4
97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
2017-02-10 11:32:21 -05:00
Brad King
6cbad490c2 Merge branch 'sphinx-1.4' into release 2017-02-10 11:32:04 -05:00
Brad King
97917900d1 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
The `default.css` static content is no longer placed in the qthelp
`_static` directory.  If it does not exist, skip over it and insert
the content of `basic.css` directly into `cmake.css`.
2017-02-10 10:43:29 -05:00
Gregor Jasny
971384c287 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
Sphinx 1.4 introduced a breaking change to `indexnode` by changing
the length of a tuple.  Teach our extension to produce a tuple of
the proper length for the version of Sphinx in use.

This gets rid of the "4 column based index found" warning.
2017-02-10 10:24:25 -05:00
Brad King
82e5ab9e14 Utilities/Sphinx: Add option for cmake.org version switch to html
Leave the option undocumented since it is not for general use.  We can
simply pass it through `SPHINX_FLAGS` when building for publication on
`cmake.org`.
2017-02-08 08:19:10 -05:00
Brad King
73ae67006c curl: Fix passing _WINSOCKAPI_ macro to compiler
Define `_WINSOCKAPI_` blank rather than to 1 in order to match the
value used by Microsoft's winsock header files.

Backported from upstream curl commit 192466e0 (cmake: Fix passing
_WINSOCKAPI_ macro to compiler, 2017-01-09).

Fixes: #16545
2017-02-07 11:39:49 -05:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05:00
Brad King
f4a3290ae7 curl: Update script to get curl 7.52.1 2017-02-07 11:36:59 -05:00
Brad King
566d20771f CMake 3.8.0-rc1 version update 2017-02-06 11:27:03 -05:00
Brad King
773df0e2d7 Add pre-commit hook to check whether SetupForDevelopment must re-run
Add a version number to the `SetupForDevelopment.sh` script and use
a pre-commit hook to check when it changes.
2017-01-31 11:16:10 -05:00
Brad King
050bb41ca7 Tell Git not to export the GitSetup directory
The `Utilities/GitSetup` directory is useful only in Git work trees
and so does not need to be distributed with source tarballs.
2017-01-30 16:56:31 -05:00
Brad King
d6108c87af GitSetup: Tell Git not to export .gitattributes
GitSetup upstream added an attribute to export `.gitattributes` so that
importing snapshots into the sources of other projects would bring along
the attributes.  However, we don't want to export them from CMake.  Drop
`.gitattributes` entries not relevant to CMake.
2017-01-30 16:53:14 -05:00
Brad King
3642d657b1 Merge branch 'upstream-GitSetup' into developer-setup
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-01-30 16:45:48 -05:00