Commit Graph

37052 Commits

Author SHA1 Message Date
Brad King
73ed503ed5 jsoncpp: Drop doxygen comments not recognized by Clang
Some Clang versions warn with `-Wdocumentation-unknown-command` about
the `\internal` and `\snippet` command tag names.
2017-08-30 10:17:21 -04:00
Brad King
1a2b62b189 jsoncpp: Add initialization to pacify scanbuild
The scanbuild analysis cannot see that decodeUnicodeEscapeSequence
either initializes the `unicode` argument or returns `false` such
that the code following it runs only if `unicode` is initialized.
Add an explicit initialization to pacify it.
2017-08-30 10:17:17 -04:00
Brad King
c103a959d1 jsoncpp: Fix compilation on SunPro
The SunPro compiler does not support `#pragma pack`.
2017-08-30 10:17:13 -04:00
Brad King
0a0f71066f jsoncpp: Drop deprecation markup
Even though we disable warnings when building jsoncpp itself, including
its headers from other CMake sources may still cause warnings.
Additional work will be needed to port CMake to newer jsoncpp interfaces
while still supporting jsoncpp 1.0.0.  For now, just suppress the
markup.
2017-08-30 10:17:09 -04:00
Brad King
e09819557f Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
  jsoncpp 2017-08-27 (4cfae897)
2017-08-30 10:16:59 -04:00
Brad King
a7241206bf jsoncpp: Update script to get jsoncpp 1.8.2 2017-08-30 10:12:59 -04:00
Brad King
cb844d4119 jsoncpp: Drop unnecessary files from source list 2017-08-30 10:12:55 -04:00
Brad King
7c06d35628 Merge branch 'upstream-jsoncpp' into update-jsoncpp 2017-08-30 10:12:40 -04:00
Brad King
ee68d3eb8c jsoncpp: Add script to update from upstream 2017-08-30 10:12:10 -04:00
Brad King
fff28e30cd Merge topic 'no-crlf-blobs'
ebc91a44 Avoid CRLF newlines in Git repo blobs
c69b4c8d bzip2: Drop unused .dsp files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1211
2017-08-30 10:02:05 -04:00
Craig Scott
54efb7e07a Merge topic 'doc-dev-review-messages'
ee51f374 Help/dev: Add commit reference format to review process guide
c928439c Help/dev: Organize commit message instructions into subsections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1182
2017-08-30 08:33:00 -04:00
Brad King
ebc91a4452 Avoid CRLF newlines in Git repo blobs
In commit 8ed03baa76 (gitattributes: prefer `eol=crlf` to `-crlf`,
2017-08-23) we left a few CRLF blobs in the repository.  Some Git
versions get confused by text files with CRLF blobs.  Convert them
to LF blobs.  Use the `eol=crlf` attribute to tell Git to use CRLF
on checkout.
2017-08-30 08:29:43 -04:00
Brad King
c69b4c8dfe bzip2: Drop unused .dsp files 2017-08-30 06:56:49 -04:00
Daniel Pfeifer
7321cfb667 Merge topic 'lexer'
168b97a5 Lexer: add a helper script to automate generating the lexers
376c1395 cmFortranLexer: regenerate with flex 2.6.4 (previously 2.6.1)
80c08c7c cmExprLexer: regenerate with flex 2.6.4 (previously 2.6.1)
59f78dcb cmDependsJavaLexer: regenerate with flex 2.6.4 (previously 2.6.1)
d2e8351a cmCommandArgumentLexer: regenerate with flex 2.6.4 (previously 2.6.1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1201
2017-08-30 06:45:01 -04:00
Daniel Pfeifer
7ddd43183d Merge topic 'cstyle-casts'
190e3825 Replace C-style casts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1176
2017-08-30 06:38:00 -04:00
Daniel Pfeifer
5cac887297 Merge topic 'bootstrap-std'
4a275f63 bootstrap: Require compiler mode aware of C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1200
2017-08-30 06:35:15 -04:00
Kitware Robot
e0713a6b95 CMake Nightly Date Stamp 2017-08-30 00:01:09 -04:00
Brad King
ee51f3746a Help/dev: Add commit reference format to review process guide 2017-08-29 13:01:47 -04:00
Brad King
8da7adc22b Merge branch 'release-3.9' 2017-08-29 11:27:52 -04:00
Brad King
4a275f6320 bootstrap: Require compiler mode aware of C++11
Some compilers have enough features enabled in their default modes to
pass our simple C++11 unique_ptr check but do not enable enough to build
CMake.  Poison this case so that we choose one of the explicit `-std=`
options for such compilers.
2017-08-29 11:05:19 -04:00
Matthias Maennich
168b97a5c5 Lexer: add a helper script to automate generating the lexers
note: this depends on
	- a suitable flex version in PATH (currently 2.6.4)
	- a suitable version of 'sed' in PATH (e.g. GNU sed)

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-29 14:58:34 +02:00
Kitware Robot
5eb6d200f4 CMake Nightly Date Stamp 2017-08-29 00:01:08 -04:00
Matthias Maennich
376c13958d cmFortranLexer: regenerate with flex 2.6.4 (previously 2.6.1)
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.

In addition some manual cleanup that had to be done previously is now
obsolete. namely:
  - the size_t cast of _yybytes_len in yy_scan_bytes
    (i is now also defined int and not size_t anymore)
  - the redefinition of yyl within yy_find_action
    (yyl is now already defined as int)

Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmFortranLexer.in.l and mapping the current
instruction to a meaningful location within that file.

The prefix "cmFortran_yy" can already be set as %option directly.

For convenience also provide a sed command for all the manual steps that
need to be done after generating.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-29 00:34:36 +02:00
Matthias Maennich
80c08c7c0a cmExprLexer: regenerate with flex 2.6.4 (previously 2.6.1)
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.

In addition some manual cleanup that had to be done previously is now
obsolete. namely:
  - the size_t cast of _yybytes_len in yy_scan_bytes
    (i is now also defined int and not size_t anymore)
  - the redefinition of yyl within yy_find_action
    (yyl is now already defined as int)

Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmExprLexer.in.l and mapping the current
instruction to a meaningful location within that file.

The prefix "cmExpr_yy" can already be set as %option directly.

For convenience also provide a sed command for all the manual steps that
need to be done after generating.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-29 00:31:15 +02:00
Matthias Maennich
59f78dcb23 cmDependsJavaLexer: regenerate with flex 2.6.4 (previously 2.6.1)
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.

In addition some manual cleanup that had to be done previously is now
obsolete. namely:
  - the size_t cast of _yybytes_len in yy_scan_bytes
    (i is now also defined int and not size_t anymore)
  - the redefinition of yyl within yy_find_action
    (yyl is now already defined as int)

Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmDependsJavaLexer.in.l and mapping the current
instruction to a meaningful location within that file.

The prefix "cmDependsJava_yy" can already be set as %option directly.

For convenience also provide a sed command for all the manual steps that
need to be done after generating.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-29 00:25:02 +02:00
Matthias Maennich
d2e8351a4d cmCommandArgumentLexer: regenerate with flex 2.6.4 (previously 2.6.1)
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.

In addition some manual cleanup that had to be done previously is now
obsolete. namely:
  - the size_t cast of _yybytes_len in yy_scan_bytes
    (i is now also defined int and not size_t anymore)
  - the redefinition of yyl within yy_find_action
    (yyl is now already defined as int)

Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmCommandArgumentLexer.in.l and mapping the current
instruction to a meaningful location within that file.

The prefix "cmCommandArgument_yy" can already be set as %option directly.

For convenience also provide a sed command for all the manual steps that
need to be done after generating.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-08-29 00:18:06 +02:00
JsonCpp Upstream
6e9ef8d1b1 jsoncpp 2017-08-27 (4cfae897)
Code extracted from:

    https://github.com/open-source-parsers/jsoncpp.git

at commit 4cfae897c049ec72175a3d55deda68146ad3720d (1.8.2).
2017-08-28 11:32:48 -04:00
JsonCpp Upstream
6be718a8e1 jsoncpp 2014-11-20 (7165f6ac)
Code extracted from:

    https://github.com/open-source-parsers/jsoncpp.git

at commit 7165f6ac4c482e68475c9e1dac086f9e12fff0d0 (1.0.0).
2017-08-28 11:15:40 -04:00
Brad King
a6374b88d9 Merge topic 'lexer'
ef41bf85 cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1)
9cacb0cb cmListFileLexer: fix 'bail out on seek-errors' also in original file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1185
2017-08-28 09:54:36 -04:00
Brad King
55e281c3b7 Merge topic 'cpackifw-repositories-directories'
5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1150
2017-08-28 09:53:10 -04:00
Brad King
39889d778e Merge topic 'FindQt4-do-not-assume-all-libraries-are-frameworks'
33161f48 FindQt4: Do not assume all libraries are frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1169
2017-08-28 09:52:27 -04:00
Brad King
3e5175447b Merge topic 'fix-gnu-to-ms'
f362052b GNUToMS: Tolerate existence of a %USERPROFILE%/source directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1164
2017-08-28 09:51:57 -04:00
Brad King
072296fc16 Merge topic 'gnu-to-ms-ninja-support'
d2d7ae07 Ninja: Implement support for GNUToMS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1165
2017-08-28 09:49:31 -04:00
Brad King
f267505c53 Merge topic 'test-fix-vs15-toolset-v90'
ce602feb Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1186
2017-08-28 09:46:13 -04:00
Kitware Robot
f8e9a848fb CMake Nightly Date Stamp 2017-08-28 00:01:08 -04:00
Daniel Pfeifer
e710d6953d Merge topic 'server-cxx11'
27d87fbd CTestCustom: Suppress exception loosening warning
7f29bbe6 server: always enable server
4614a3b2 server: backport to C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1149
2017-08-27 04:02:24 -04:00
Daniel Pfeifer
190e3825d4 Replace C-style casts 2017-08-27 09:58:46 +02:00
Daniel Pfeifer
19f2a706a3 Merge topic 'cmSourceFile-Nocopy'
687aef91 cmSourceFile: Avoid unnecessary vector copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1190
2017-08-27 03:52:47 -04:00
Daniel Pfeifer
b044dedecd Merge topic 'iwyu-keep-cmConfigure'
ca2233e3 IWYU: Mark cmConfigure.h with pragma: keep

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1187
2017-08-27 03:52:05 -04:00
Daniel Pfeifer
a51d04d4bf Merge topic 'cmConfigure-fix'
367a348a cmConfigure: Add missing #

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1189
2017-08-27 03:51:08 -04:00
Kitware Robot
6dfb8dadc3 CMake Nightly Date Stamp 2017-08-27 00:01:06 -04:00
Daniel Pfeifer
27d87fbd04 CTestCustom: Suppress exception loosening warning 2017-08-26 20:38:07 +02:00
Sebastian Holtermann
687aef913c cmSourceFile: Avoid unnecessary vector copy 2017-08-26 14:45:46 +02:00
Daniel Pfeifer
2ade9a0264 Merge topic 'deb-libarchive-ar'
df556e65 cmCPackDebGenerator: Use libarchive to create .deb file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1181
2017-08-26 08:20:41 -04:00
Daniel Pfeifer
367a348a00 cmConfigure: Add missing # 2017-08-26 08:30:49 +02:00
Daniel Pfeifer
7f29bbe6f2 server: always enable server 2017-08-26 07:46:58 +02:00
Daniel Pfeifer
4614a3b287 server: backport to C++11 2017-08-26 07:46:57 +02:00
Daniel Pfeifer
ca2233e31f IWYU: Mark cmConfigure.h with pragma: keep
Also remove `#include "cmConfigure.h"` from most source files.
2017-08-26 07:41:04 +02:00
Kitware Robot
6285fe009d CMake Nightly Date Stamp 2017-08-26 00:01:17 -04:00
Daniel Pfeifer
df556e65f2 cmCPackDebGenerator: Use libarchive to create .deb file
Remove the copy of OpenBSD's 'ar' implementation and instead
use cmArchiveWrite with the "arbsd" format.
2017-08-25 23:01:50 +02:00