[Cmake-commits] CMake branch, master, updated. v2.8.12-365-g9fb65d7
Brad King
brad.king at kitware.com
Mon Oct 21 09:02:06 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (commit)
via daa0f6f98df6e944a46a8dff13bb247cf7e301b1 (commit)
via a8c652342f0e4dcaf933ecb0ce164b44d4997ae4 (commit)
via dbd933365ec780d27ab7c0dfba30dc1af1094607 (commit)
via 56457837e28de29d4f94b0cc9c47ef314d8f05e1 (commit)
from ecfcce44b31ad7a6a39088e950ba36a0d8abc517 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fb65d7090ca314cd8bfd88e52fefa6905938a6d
commit 9fb65d7090ca314cd8bfd88e52fefa6905938a6d
Merge: ecfcce4 daa0f6f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 21 09:02:00 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 21 09:02:00 2013 -0400
Merge topic 'cmake-syntax-updates'
daa0f6f Add Lua-style long brackets and long comments to CMake language
a8c6523 cmListFileLexer: Convert CRLF -> LF newlines explicitly
dbd9333 cmListFileLexer: Allow a leading UTF-8 Byte-Order-Mark (#11137)
5645783 cmListFileLexer: Allow command names with one letter (#14181)
-----------------------------------------------------------------------
Summary of changes:
Source/cmListFileCache.cxx | 95 +++--
Source/cmListFileCache.h | 3 +-
Source/cmListFileLexer.c | 462 +++++++++++++++-----
Source/cmListFileLexer.h | 17 +-
Source/cmListFileLexer.in.l | 190 ++++++++-
Source/cmMakefile.cxx | 6 +
Tests/RunCMake/Syntax/.gitattributes | 2 +
.../BOM-UTF-16-BE-result.txt} | 0
Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt | 6 +
Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake | Bin 0 -> 54 bytes
.../BOM-UTF-16-LE-result.txt} | 0
Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt | 6 +
Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake | Bin 0 -> 54 bytes
.../BOM-UTF-32-BE-result.txt} | 0
Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt | 6 +
Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake | Bin 0 -> 108 bytes
.../BOM-UTF-32-LE-result.txt} | 0
Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt | 6 +
Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake | Bin 0 -> 108 bytes
Tests/RunCMake/Syntax/BOM-UTF-8-stdout.txt | 1 +
Tests/RunCMake/Syntax/BOM-UTF-8.cmake | 1 +
Tests/RunCMake/Syntax/Bracket0-stderr.txt | 1 +
Tests/RunCMake/Syntax/Bracket0.cmake | 1 +
Tests/RunCMake/Syntax/Bracket1-stderr.txt | 1 +
Tests/RunCMake/Syntax/Bracket1.cmake | 2 +
Tests/RunCMake/Syntax/Bracket2-stdout.txt | 2 +
Tests/RunCMake/Syntax/Bracket2.cmake | 2 +
.../BracketBackslash-result.txt} | 0
Tests/RunCMake/Syntax/BracketBackslash-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketBackslash.cmake | 2 +
Tests/RunCMake/Syntax/BracketCRLF-stderr.txt | 1 +
Tests/RunCMake/Syntax/BracketCRLF.cmake | 8 +
Tests/RunCMake/Syntax/BracketComment0-stdout.txt | 1 +
Tests/RunCMake/Syntax/BracketComment0.cmake | 5 +
.../BracketComment1-result.txt} | 0
Tests/RunCMake/Syntax/BracketComment1-stderr.txt | 4 +
Tests/RunCMake/Syntax/BracketComment1.cmake | 3 +
.../BracketComment2-result.txt} | 0
Tests/RunCMake/Syntax/BracketComment2-stderr.txt | 4 +
Tests/RunCMake/Syntax/BracketComment2.cmake | 3 +
Tests/RunCMake/Syntax/BracketComment3-stdout.txt | 1 +
Tests/RunCMake/Syntax/BracketComment3.cmake | 4 +
.../BracketComment4-result.txt} | 0
Tests/RunCMake/Syntax/BracketComment4-stderr.txt | 7 +
Tests/RunCMake/Syntax/BracketComment4.cmake | 3 +
Tests/RunCMake/Syntax/BracketComment5-stdout.txt | 1 +
Tests/RunCMake/Syntax/BracketComment5.cmake | 6 +
.../BracketNoSpace0-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace0.cmake | 1 +
.../BracketNoSpace1-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace1.cmake | 1 +
.../BracketNoSpace2-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace2.cmake | 1 +
.../BracketNoSpace3-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace3.cmake | 1 +
.../BracketNoSpace4-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace4.cmake | 1 +
.../BracketNoSpace5-result.txt} | 0
Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt | 6 +
Tests/RunCMake/Syntax/BracketNoSpace5.cmake | 1 +
Tests/RunCMake/Syntax/BracketWarn-stderr.txt | 35 --
Tests/RunCMake/Syntax/BracketWarn-stdout.txt | 1 -
Tests/RunCMake/Syntax/BracketWarn.cmake | 1 -
.../CommandError2-result.txt} | 0
Tests/RunCMake/Syntax/CommandError2-stderr.txt | 7 +
Tests/RunCMake/Syntax/CommandError2.cmake | 1 +
Tests/RunCMake/Syntax/OneLetter-stderr.txt | 1 +
Tests/RunCMake/Syntax/OneLetter.cmake | 7 +
Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt | 2 -
Tests/RunCMake/Syntax/ParenNoSpace.cmake | 2 -
Tests/RunCMake/Syntax/ParenNoSpace0-stdout.txt | 3 +
Tests/RunCMake/Syntax/ParenNoSpace0.cmake | 3 +
.../ParenNoSpace1-result.txt} | 0
Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt | 22 +
Tests/RunCMake/Syntax/ParenNoSpace1.cmake | 3 +
...NoSpace-stderr.txt => ParenNoSpace2-stderr.txt} | 0
Tests/RunCMake/Syntax/ParenNoSpace2-stdout.txt | 3 +
Tests/RunCMake/Syntax/ParenNoSpace2.cmake | 3 +
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 33 ++-
Tests/RunCMake/Syntax/StringCRLF-stderr.txt | 1 +
Tests/RunCMake/Syntax/StringCRLF.cmake | 6 +
.../UnterminatedBracket0-result.txt} | 0
.../Syntax/UnterminatedBracket0-stderr.txt | 8 +
Tests/RunCMake/Syntax/UnterminatedBracket0.cmake | 1 +
.../UnterminatedBracket1-result.txt} | 0
.../Syntax/UnterminatedBracket1-stderr.txt | 8 +
Tests/RunCMake/Syntax/UnterminatedBracket1.cmake | 1 +
.../UnterminatedBracketComment-result.txt} | 0
.../Syntax/UnterminatedBracketComment-stderr.txt | 8 +
.../Syntax/UnterminatedBracketComment.cmake | 2 +
95 files changed, 869 insertions(+), 204 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BOM-UTF-16-BE-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BOM-UTF-16-LE-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BOM-UTF-32-BE-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BOM-UTF-32-LE-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-8-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/BOM-UTF-8.cmake
create mode 100644 Tests/RunCMake/Syntax/Bracket0-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/Bracket0.cmake
create mode 100644 Tests/RunCMake/Syntax/Bracket1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/Bracket1.cmake
create mode 100644 Tests/RunCMake/Syntax/Bracket2-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/Bracket2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketBackslash-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketBackslash-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketBackslash.cmake
create mode 100644 Tests/RunCMake/Syntax/BracketCRLF-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketCRLF.cmake
create mode 100644 Tests/RunCMake/Syntax/BracketComment0-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment0.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketComment1-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketComment1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketComment2-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketComment2-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment2.cmake
create mode 100644 Tests/RunCMake/Syntax/BracketComment3-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment3.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketComment4-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketComment4-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment4.cmake
create mode 100644 Tests/RunCMake/Syntax/BracketComment5-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/BracketComment5.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace0-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace0.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace1-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace2-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace3-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace3.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace4-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace4.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/BracketNoSpace5-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/BracketNoSpace5.cmake
delete mode 100644 Tests/RunCMake/Syntax/BracketWarn-stderr.txt
delete mode 100644 Tests/RunCMake/Syntax/BracketWarn-stdout.txt
delete mode 100644 Tests/RunCMake/Syntax/BracketWarn.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CommandError2-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CommandError2-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/CommandError2.cmake
create mode 100644 Tests/RunCMake/Syntax/OneLetter-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/OneLetter.cmake
delete mode 100644 Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt
delete mode 100644 Tests/RunCMake/Syntax/ParenNoSpace.cmake
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace0-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace0.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/ParenNoSpace1-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace1.cmake
rename Tests/RunCMake/Syntax/{ParenNoSpace-stderr.txt => ParenNoSpace2-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stdout.txt
create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2.cmake
create mode 100644 Tests/RunCMake/Syntax/StringCRLF-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/StringCRLF.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/UnterminatedBracket0-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracket0-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracket0.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/UnterminatedBracket1-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracket1-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracket1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/UnterminatedBracketComment-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracketComment-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/UnterminatedBracketComment.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list