commonmarker 0.7.0 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of commonmarker might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/ext/commonmarker/cmark/CMakeLists.txt +3 -3
- data/ext/commonmarker/cmark/Makefile +2 -3
- data/ext/commonmarker/cmark/README.md +1 -1
- data/ext/commonmarker/cmark/api_test/main.c +15 -0
- data/ext/commonmarker/cmark/appveyor.yml +4 -2
- data/ext/commonmarker/cmark/build/CMakeCache.txt +86 -14
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CMakeCCompiler.cmake +9 -5
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CMakeCXXCompiler.cmake +9 -5
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2/CMakeDetermineCompilerABI_CXX.bin → 3.5.1/CMakeDetermineCompilerABI_C.bin} +0 -0
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2/CMakeDetermineCompilerABI_C.bin → 3.5.1/CMakeDetermineCompilerABI_CXX.bin} +0 -0
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CMakeSystem.cmake +4 -4
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CompilerIdC/CMakeCCompilerId.c +39 -3
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CompilerIdC/a.out +0 -0
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CompilerIdCXX/CMakeCXXCompilerId.cpp +38 -3
- data/ext/commonmarker/cmark/build/CMakeFiles/{3.3.2 → 3.5.1}/CompilerIdCXX/a.out +0 -0
- data/ext/commonmarker/cmark/build/CMakeFiles/CMakeDirectoryInformation.cmake +1 -1
- data/ext/commonmarker/cmark/build/CMakeFiles/CMakeError.log +6 -6
- data/ext/commonmarker/cmark/build/CMakeFiles/CMakeOutput.log +171 -167
- data/ext/commonmarker/cmark/build/CMakeFiles/Makefile.cmake +107 -104
- data/ext/commonmarker/cmark/build/CMakeFiles/Makefile2 +42 -42
- data/ext/commonmarker/cmark/build/CMakeFiles/TargetDirectories.txt +36 -1
- data/ext/commonmarker/cmark/build/CMakeFiles/feature_tests.bin +0 -0
- data/ext/commonmarker/cmark/build/CMakeFiles/feature_tests.c +1 -1
- data/ext/commonmarker/cmark/build/CMakeFiles/feature_tests.cxx +1 -1
- data/ext/commonmarker/cmark/build/Makefile +23 -23
- data/ext/commonmarker/cmark/build/api_test/CMakeFiles/CMakeDirectoryInformation.cmake +1 -1
- data/ext/commonmarker/cmark/build/api_test/CMakeFiles/api_test.dir/DependInfo.cmake +3 -0
- data/ext/commonmarker/cmark/build/api_test/CMakeFiles/api_test.dir/build.make +13 -13
- data/ext/commonmarker/cmark/build/api_test/CMakeFiles/api_test.dir/flags.make +7 -3
- data/ext/commonmarker/cmark/build/api_test/CMakeFiles/api_test.dir/link.txt +1 -1
- data/ext/commonmarker/cmark/build/api_test/Makefile +10 -10
- data/ext/commonmarker/cmark/build/man/CMakeFiles/CMakeDirectoryInformation.cmake +1 -1
- data/ext/commonmarker/cmark/build/man/Makefile +10 -10
- data/ext/commonmarker/cmark/build/src/CMakeFiles/CMakeDirectoryInformation.cmake +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/cmark.dir/DependInfo.cmake +3 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/cmark.dir/build.make +63 -63
- data/ext/commonmarker/cmark/build/src/CMakeFiles/cmark.dir/flags.make +4 -2
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/DependInfo.cmake +4 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/build.make +83 -83
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/cmake_clean.cmake +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/flags.make +4 -2
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark.dir/link.txt +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/DependInfo.cmake +3 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/blocks.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/buffer.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/build.make +60 -60
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/cmark.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/cmark_ctype.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/commonmark.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/depend.internal +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/depend.make +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/flags.make +4 -2
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/houdini_href_e.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/houdini_html_e.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/houdini_html_u.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/html.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/inlines.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/iterator.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/latex.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/link.txt +1 -1
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/man.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/node.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/references.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/render.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/scanners.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/utf8.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/CMakeFiles/libcmark_static.dir/xml.c.o +0 -0
- data/ext/commonmarker/cmark/build/src/Makefile +82 -82
- data/ext/commonmarker/cmark/build/src/cmake_install.cmake +2 -2
- data/ext/commonmarker/cmark/build/src/cmark_version.h +2 -2
- data/ext/commonmarker/cmark/build/src/libcmark.a +0 -0
- data/ext/commonmarker/cmark/build/src/libcmark.pc +1 -1
- data/ext/commonmarker/cmark/build/testdir/CMakeFiles/CMakeDirectoryInformation.cmake +1 -1
- data/ext/commonmarker/cmark/build/testdir/CTestTestfile.cmake +1 -0
- data/ext/commonmarker/cmark/build/testdir/Makefile +10 -10
- data/ext/commonmarker/cmark/changelog.txt +72 -0
- data/ext/commonmarker/cmark/man/CMakeLists.txt +5 -3
- data/ext/commonmarker/cmark/man/man1/cmark.1 +2 -2
- data/ext/commonmarker/cmark/man/man3/cmark.3 +10 -10
- data/ext/commonmarker/cmark/src/CMakeLists.txt +2 -2
- data/ext/commonmarker/cmark/src/blocks.c +407 -245
- data/ext/commonmarker/cmark/src/buffer.c +3 -2
- data/ext/commonmarker/cmark/src/cmark.h +3 -3
- data/ext/commonmarker/cmark/src/commonmark.c +5 -5
- data/ext/commonmarker/cmark/src/html.c +3 -3
- data/ext/commonmarker/cmark/src/inlines.c +11 -11
- data/ext/commonmarker/cmark/src/latex.c +2 -2
- data/ext/commonmarker/cmark/src/main.c +2 -1
- data/ext/commonmarker/cmark/src/man.c +1 -1
- data/ext/commonmarker/cmark/src/node.c +2 -2
- data/ext/commonmarker/cmark/src/parser.h +2 -0
- data/ext/commonmarker/cmark/src/render.c +2 -2
- data/ext/commonmarker/cmark/src/scanners.c +2431 -2620
- data/ext/commonmarker/cmark/src/xml.c +3 -2
- data/ext/commonmarker/cmark/test/CMakeLists.txt +7 -0
- data/ext/commonmarker/cmark/test/regression.txt +34 -0
- data/ext/commonmarker/cmark/test/spec.txt +49 -6
- data/ext/commonmarker/cmark/test/spec_tests.py +1 -1
- data/ext/commonmarker/cmark/tools/appveyor-build.bat +13 -0
- data/lib/commonmarker/version.rb +1 -1
- metadata +13 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a3f03e36e2523ce4afe82603ccdf2cf2f6ee31d7
|
4
|
+
data.tar.gz: 7d5cba8ced041cd04f0d4c73ccd262f9b82c9716
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d02862da970c8af7712656534022ef0adf16b5c20467f7bebc08adbe66c665026b2769c0069f9bbc17f34077cb30ca7531db7ce1670bcd1bd25bccf64652f9a5
|
7
|
+
data.tar.gz: 1a9510a64698b874cd2eff420830d114906aee4fef1613d160f3fb0bb080c2e1f2f0bfd0d67bfe28a596454b000cd2e53e4ff06991f183f89dd600f8a5a67e3e
|
@@ -1,5 +1,5 @@
|
|
1
|
-
project(cmark)
|
2
1
|
cmake_minimum_required(VERSION 2.8.9)
|
2
|
+
project(cmark)
|
3
3
|
include("FindAsan.cmake")
|
4
4
|
|
5
5
|
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
|
@@ -9,8 +9,8 @@ endif()
|
|
9
9
|
set(PROJECT_NAME "cmark")
|
10
10
|
|
11
11
|
set(PROJECT_VERSION_MAJOR 0)
|
12
|
-
set(PROJECT_VERSION_MINOR
|
13
|
-
set(PROJECT_VERSION_PATCH
|
12
|
+
set(PROJECT_VERSION_MINOR 25)
|
13
|
+
set(PROJECT_VERSION_PATCH 2)
|
14
14
|
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} )
|
15
15
|
|
16
16
|
option(CMARK_TESTS "Build cmark tests and enable testing" ON)
|
@@ -106,9 +106,8 @@ $(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt
|
|
106
106
|
# normally need to be generated.
|
107
107
|
$(SRCDIR)/scanners.c: $(SRCDIR)/scanners.re
|
108
108
|
@case "$$(re2c -v)" in \
|
109
|
-
*\ 0.13
|
110
|
-
echo "re2c
|
111
|
-
echo "Try a version >= 0.14.2 or <= 0.13.6."; \
|
109
|
+
*\ 0.13.*|*\ 0.14|*\ 0.14.1) \
|
110
|
+
echo "re2c >= 0.14.2 is required"; \
|
112
111
|
false; \
|
113
112
|
;; \
|
114
113
|
esac
|
@@ -65,7 +65,7 @@ Installing
|
|
65
65
|
|
66
66
|
Building the C program (`cmark`) and shared library (`libcmark`)
|
67
67
|
requires [cmake]. If you modify `scanners.re`, then you will also
|
68
|
-
need [re2c], which is used to generate `scanners.c` from
|
68
|
+
need [re2c] (>= 0.14.2), which is used to generate `scanners.c` from
|
69
69
|
`scanners.re`. We have included a pre-generated `scanners.c` in
|
70
70
|
the repository to reduce build dependencies.
|
71
71
|
|
@@ -362,6 +362,9 @@ static void create_tree(test_batch_runner *runner) {
|
|
362
362
|
cmark_node *str4 = cmark_node_new(CMARK_NODE_TEXT);
|
363
363
|
cmark_node_set_literal(str4, "brzz");
|
364
364
|
OK(runner, cmark_node_replace(str1, str4), "replace");
|
365
|
+
// The replaced node is not freed
|
366
|
+
cmark_node_free(str1);
|
367
|
+
|
365
368
|
INT_EQ(runner, cmark_node_check(doc, NULL), 0, "replace consistent");
|
366
369
|
OK(runner, cmark_node_previous(emph) == str4, "replace works");
|
367
370
|
INT_EQ(runner, cmark_node_replace(p, str4), 0, "replace str for p fails");
|
@@ -852,6 +855,17 @@ static void test_md_to_html(test_batch_runner *runner, const char *markdown,
|
|
852
855
|
free(html);
|
853
856
|
}
|
854
857
|
|
858
|
+
static void test_feed_across_line_ending(test_batch_runner *runner) {
|
859
|
+
// See #117
|
860
|
+
cmark_parser *parser = cmark_parser_new(CMARK_OPT_DEFAULT);
|
861
|
+
cmark_parser_feed(parser, "line1\r", 6);
|
862
|
+
cmark_parser_feed(parser, "\nline2\r\n", 8);
|
863
|
+
cmark_node *document = cmark_parser_finish(parser);
|
864
|
+
OK(runner, document->first_child->next == NULL, "document has one paragraph");
|
865
|
+
cmark_parser_free(parser);
|
866
|
+
cmark_node_free(document);
|
867
|
+
}
|
868
|
+
|
855
869
|
int main() {
|
856
870
|
int retval;
|
857
871
|
test_batch_runner *runner = test_batch_runner_new();
|
@@ -876,6 +890,7 @@ int main() {
|
|
876
890
|
numeric_entities(runner);
|
877
891
|
test_cplusplus(runner);
|
878
892
|
test_safe(runner);
|
893
|
+
test_feed_across_line_ending(runner);
|
879
894
|
|
880
895
|
test_print_summary(runner);
|
881
896
|
retval = test_ok(runner) ? 0 : 1;
|
@@ -2,14 +2,16 @@ environment:
|
|
2
2
|
PYTHON: "C:\\Python34-x64"
|
3
3
|
PYTHON_VERSION: "3.4.3"
|
4
4
|
PYTHON_ARCH: "64"
|
5
|
+
matrix:
|
6
|
+
- MSVC_VERSION: 10
|
7
|
+
- MSVC_VERSION: 12
|
5
8
|
|
6
9
|
# set up for nmake:
|
7
10
|
install:
|
8
|
-
- '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
|
9
11
|
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
|
10
12
|
|
11
13
|
build_script:
|
12
|
-
- '
|
14
|
+
- 'tools\appveyor-build.bat'
|
13
15
|
|
14
16
|
test_script:
|
15
17
|
- 'nmake test'
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# This is the CMakeCache file.
|
2
2
|
# For build in directory: /Users/gjtorikian/Development/commonmarker/ext/commonmarker/cmark/build
|
3
|
-
# It was generated by CMake: /usr/local/Cellar/cmake/3.
|
3
|
+
# It was generated by CMake: /usr/local/Cellar/cmake/3.5.1/bin/cmake
|
4
4
|
# You can edit this file to change values found and used by cmake.
|
5
5
|
# If you do not want to change any of the values, simply exit the editor.
|
6
6
|
# If you do want to change a value, simply edit, save, and exit the editor.
|
@@ -89,12 +89,57 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
|
|
89
89
|
//Enable/Disable output of compile commands during generation.
|
90
90
|
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
|
91
91
|
|
92
|
+
//user executables (bin)
|
93
|
+
CMAKE_INSTALL_BINDIR:PATH=bin
|
94
|
+
|
95
|
+
//read-only architecture-independent data (DATAROOTDIR)
|
96
|
+
CMAKE_INSTALL_DATADIR:PATH=
|
97
|
+
|
98
|
+
//read-only architecture-independent data root (share)
|
99
|
+
CMAKE_INSTALL_DATAROOTDIR:PATH=share
|
100
|
+
|
101
|
+
//documentation root (DATAROOTDIR/doc/PROJECT_NAME)
|
102
|
+
CMAKE_INSTALL_DOCDIR:PATH=
|
103
|
+
|
104
|
+
//C header files (include)
|
105
|
+
CMAKE_INSTALL_INCLUDEDIR:PATH=include
|
106
|
+
|
107
|
+
//info documentation (DATAROOTDIR/info)
|
108
|
+
CMAKE_INSTALL_INFODIR:PATH=
|
109
|
+
|
110
|
+
//object code libraries (lib)
|
111
|
+
CMAKE_INSTALL_LIBDIR:PATH=lib
|
112
|
+
|
113
|
+
//program executables (libexec)
|
114
|
+
CMAKE_INSTALL_LIBEXECDIR:PATH=libexec
|
115
|
+
|
116
|
+
//locale-dependent data (DATAROOTDIR/locale)
|
117
|
+
CMAKE_INSTALL_LOCALEDIR:PATH=
|
118
|
+
|
119
|
+
//modifiable single-machine data (var)
|
120
|
+
CMAKE_INSTALL_LOCALSTATEDIR:PATH=var
|
121
|
+
|
122
|
+
//man documentation (DATAROOTDIR/man)
|
123
|
+
CMAKE_INSTALL_MANDIR:PATH=
|
124
|
+
|
92
125
|
//Path to a program.
|
93
126
|
CMAKE_INSTALL_NAME_TOOL:FILEPATH=/usr/bin/install_name_tool
|
94
127
|
|
128
|
+
//C header files for non-gcc (/usr/include)
|
129
|
+
CMAKE_INSTALL_OLDINCLUDEDIR:PATH=/usr/include
|
130
|
+
|
95
131
|
//Install path prefix, prepended onto install directories.
|
96
132
|
CMAKE_INSTALL_PREFIX:PATH=/usr/local
|
97
133
|
|
134
|
+
//system admin executables (sbin)
|
135
|
+
CMAKE_INSTALL_SBINDIR:PATH=sbin
|
136
|
+
|
137
|
+
//modifiable architecture-independent data (com)
|
138
|
+
CMAKE_INSTALL_SHAREDSTATEDIR:PATH=com
|
139
|
+
|
140
|
+
//read-only single-machine data (etc)
|
141
|
+
CMAKE_INSTALL_SYSCONFDIR:PATH=etc
|
142
|
+
|
98
143
|
//Path to a program.
|
99
144
|
CMAKE_LINKER:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
|
100
145
|
|
@@ -185,9 +230,6 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
|
|
185
230
|
//Path to a program.
|
186
231
|
CMAKE_STRIP:FILEPATH=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip
|
187
232
|
|
188
|
-
//If true, cmake will use relative paths in makefiles and projects.
|
189
|
-
CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
|
190
|
-
|
191
233
|
//If this value is on, makefiles will be generated without the
|
192
234
|
// .SILENT directive, and all commands will be echoed to the console
|
193
235
|
// during the make. This is useful for debugging only. With Visual
|
@@ -230,17 +272,17 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/Users/gjtorikian/Development/commonmarker/ext/comm
|
|
230
272
|
//Major version of cmake used to create the current loaded cache
|
231
273
|
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
|
232
274
|
//Minor version of cmake used to create the current loaded cache
|
233
|
-
CMAKE_CACHE_MINOR_VERSION:INTERNAL=
|
275
|
+
CMAKE_CACHE_MINOR_VERSION:INTERNAL=5
|
234
276
|
//Patch version of cmake used to create the current loaded cache
|
235
|
-
CMAKE_CACHE_PATCH_VERSION:INTERNAL=
|
277
|
+
CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
|
236
278
|
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
|
237
279
|
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
|
238
280
|
//Path to CMake executable.
|
239
|
-
CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.
|
281
|
+
CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.5.1/bin/cmake
|
240
282
|
//Path to cpack program executable.
|
241
|
-
CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.
|
283
|
+
CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.5.1/bin/cpack
|
242
284
|
//Path to ctest program executable.
|
243
|
-
CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.
|
285
|
+
CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.5.1/bin/ctest
|
244
286
|
//ADVANCED property for variable: CMAKE_CXX_COMPILER
|
245
287
|
CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
|
246
288
|
//ADVANCED property for variable: CMAKE_CXX_FLAGS
|
@@ -270,7 +312,7 @@ CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
|
|
270
312
|
//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
|
271
313
|
CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
|
272
314
|
//Path to cache edit program executable.
|
273
|
-
CMAKE_EDIT_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.
|
315
|
+
CMAKE_EDIT_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.5.1/bin/ccmake
|
274
316
|
//Executable file format
|
275
317
|
CMAKE_EXECUTABLE_FORMAT:INTERNAL=Unknown
|
276
318
|
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
|
@@ -298,8 +340,38 @@ CMAKE_GENERATOR_TOOLSET:INTERNAL=
|
|
298
340
|
//Source directory with the top level CMakeLists.txt file for this
|
299
341
|
// project
|
300
342
|
CMAKE_HOME_DIRECTORY:INTERNAL=/Users/gjtorikian/Development/commonmarker/ext/commonmarker/cmark
|
343
|
+
//ADVANCED property for variable: CMAKE_INSTALL_BINDIR
|
344
|
+
CMAKE_INSTALL_BINDIR-ADVANCED:INTERNAL=1
|
345
|
+
//ADVANCED property for variable: CMAKE_INSTALL_DATADIR
|
346
|
+
CMAKE_INSTALL_DATADIR-ADVANCED:INTERNAL=1
|
347
|
+
//ADVANCED property for variable: CMAKE_INSTALL_DATAROOTDIR
|
348
|
+
CMAKE_INSTALL_DATAROOTDIR-ADVANCED:INTERNAL=1
|
349
|
+
//ADVANCED property for variable: CMAKE_INSTALL_DOCDIR
|
350
|
+
CMAKE_INSTALL_DOCDIR-ADVANCED:INTERNAL=1
|
351
|
+
//ADVANCED property for variable: CMAKE_INSTALL_INCLUDEDIR
|
352
|
+
CMAKE_INSTALL_INCLUDEDIR-ADVANCED:INTERNAL=1
|
353
|
+
//ADVANCED property for variable: CMAKE_INSTALL_INFODIR
|
354
|
+
CMAKE_INSTALL_INFODIR-ADVANCED:INTERNAL=1
|
355
|
+
//ADVANCED property for variable: CMAKE_INSTALL_LIBDIR
|
356
|
+
CMAKE_INSTALL_LIBDIR-ADVANCED:INTERNAL=1
|
357
|
+
//ADVANCED property for variable: CMAKE_INSTALL_LIBEXECDIR
|
358
|
+
CMAKE_INSTALL_LIBEXECDIR-ADVANCED:INTERNAL=1
|
359
|
+
//ADVANCED property for variable: CMAKE_INSTALL_LOCALEDIR
|
360
|
+
CMAKE_INSTALL_LOCALEDIR-ADVANCED:INTERNAL=1
|
361
|
+
//ADVANCED property for variable: CMAKE_INSTALL_LOCALSTATEDIR
|
362
|
+
CMAKE_INSTALL_LOCALSTATEDIR-ADVANCED:INTERNAL=1
|
363
|
+
//ADVANCED property for variable: CMAKE_INSTALL_MANDIR
|
364
|
+
CMAKE_INSTALL_MANDIR-ADVANCED:INTERNAL=1
|
301
365
|
//ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL
|
302
366
|
CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1
|
367
|
+
//ADVANCED property for variable: CMAKE_INSTALL_OLDINCLUDEDIR
|
368
|
+
CMAKE_INSTALL_OLDINCLUDEDIR-ADVANCED:INTERNAL=1
|
369
|
+
//ADVANCED property for variable: CMAKE_INSTALL_SBINDIR
|
370
|
+
CMAKE_INSTALL_SBINDIR-ADVANCED:INTERNAL=1
|
371
|
+
//ADVANCED property for variable: CMAKE_INSTALL_SHAREDSTATEDIR
|
372
|
+
CMAKE_INSTALL_SHAREDSTATEDIR-ADVANCED:INTERNAL=1
|
373
|
+
//ADVANCED property for variable: CMAKE_INSTALL_SYSCONFDIR
|
374
|
+
CMAKE_INSTALL_SYSCONFDIR-ADVANCED:INTERNAL=1
|
303
375
|
//ADVANCED property for variable: CMAKE_LINKER
|
304
376
|
CMAKE_LINKER-ADVANCED:INTERNAL=1
|
305
377
|
//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
|
@@ -317,7 +389,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
|
|
317
389
|
//ADVANCED property for variable: CMAKE_NM
|
318
390
|
CMAKE_NM-ADVANCED:INTERNAL=1
|
319
391
|
//number of local generators
|
320
|
-
|
392
|
+
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=5
|
321
393
|
//ADVANCED property for variable: CMAKE_OBJCOPY
|
322
394
|
CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
|
323
395
|
//ADVANCED property for variable: CMAKE_OBJDUMP
|
@@ -325,7 +397,7 @@ CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
|
|
325
397
|
//ADVANCED property for variable: CMAKE_RANLIB
|
326
398
|
CMAKE_RANLIB-ADVANCED:INTERNAL=1
|
327
399
|
//Path to CMake installation.
|
328
|
-
CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.
|
400
|
+
CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.5.1/share/cmake
|
329
401
|
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
|
330
402
|
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
|
331
403
|
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_ASAN
|
@@ -356,8 +428,6 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
|
|
356
428
|
CMAKE_STRIP-ADVANCED:INTERNAL=1
|
357
429
|
//uname command
|
358
430
|
CMAKE_UNAME:INTERNAL=/usr/bin/uname
|
359
|
-
//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
|
360
|
-
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
|
361
431
|
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
|
362
432
|
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
|
363
433
|
//Compiler support for a deprecated attribute
|
@@ -384,4 +454,6 @@ HAVE___BUILTIN_EXPECT:INTERNAL=1
|
|
384
454
|
PYTHON_EXECUTABLE-ADVANCED:INTERNAL=1
|
385
455
|
//ADVANCED property for variable: USE_COMPILER_HIDDEN_VISIBILITY
|
386
456
|
USE_COMPILER_HIDDEN_VISIBILITY-ADVANCED:INTERNAL=1
|
457
|
+
//CMAKE_INSTALL_PREFIX during last run
|
458
|
+
_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX:INTERNAL=/usr/local
|
387
459
|
|
@@ -1,7 +1,9 @@
|
|
1
1
|
set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc")
|
2
2
|
set(CMAKE_C_COMPILER_ARG1 "")
|
3
3
|
set(CMAKE_C_COMPILER_ID "AppleClang")
|
4
|
-
set(CMAKE_C_COMPILER_VERSION "7.0.
|
4
|
+
set(CMAKE_C_COMPILER_VERSION "7.3.0.7030029")
|
5
|
+
set(CMAKE_C_COMPILER_WRAPPER "")
|
6
|
+
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11")
|
5
7
|
set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert")
|
6
8
|
set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes")
|
7
9
|
set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros")
|
@@ -52,12 +54,14 @@ if(CMAKE_C_LIBRARY_ARCHITECTURE)
|
|
52
54
|
set(CMAKE_LIBRARY_ARCHITECTURE "")
|
53
55
|
endif()
|
54
56
|
|
57
|
+
set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "")
|
58
|
+
if(CMAKE_C_CL_SHOWINCLUDES_PREFIX)
|
59
|
+
set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}")
|
60
|
+
endif()
|
61
|
+
|
55
62
|
|
56
63
|
|
57
64
|
|
58
|
-
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0
|
65
|
+
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.3.0/lib/darwin/libclang_rt.osx.a")
|
59
66
|
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib;/usr/local/lib")
|
60
67
|
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Library/Frameworks;/System/Library/Frameworks")
|
61
|
-
|
62
|
-
|
63
|
-
|
@@ -1,7 +1,9 @@
|
|
1
1
|
set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++")
|
2
2
|
set(CMAKE_CXX_COMPILER_ARG1 "")
|
3
3
|
set(CMAKE_CXX_COMPILER_ID "AppleClang")
|
4
|
-
set(CMAKE_CXX_COMPILER_VERSION "7.0.
|
4
|
+
set(CMAKE_CXX_COMPILER_VERSION "7.3.0.7030029")
|
5
|
+
set(CMAKE_CXX_COMPILER_WRAPPER "")
|
6
|
+
set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "98")
|
5
7
|
set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
|
6
8
|
set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters")
|
7
9
|
set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
|
@@ -53,12 +55,14 @@ if(CMAKE_CXX_LIBRARY_ARCHITECTURE)
|
|
53
55
|
set(CMAKE_LIBRARY_ARCHITECTURE "")
|
54
56
|
endif()
|
55
57
|
|
58
|
+
set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "")
|
59
|
+
if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX)
|
60
|
+
set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}")
|
61
|
+
endif()
|
62
|
+
|
56
63
|
|
57
64
|
|
58
65
|
|
59
|
-
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0
|
66
|
+
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.3.0/lib/darwin/libclang_rt.osx.a")
|
60
67
|
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib;/usr/local/lib")
|
61
68
|
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Library/Frameworks;/System/Library/Frameworks")
|
62
|
-
|
63
|
-
|
64
|
-
|
Binary file
|
Binary file
|
@@ -1,13 +1,13 @@
|
|
1
|
-
set(CMAKE_HOST_SYSTEM "Darwin-15.
|
1
|
+
set(CMAKE_HOST_SYSTEM "Darwin-15.4.0")
|
2
2
|
set(CMAKE_HOST_SYSTEM_NAME "Darwin")
|
3
|
-
set(CMAKE_HOST_SYSTEM_VERSION "15.
|
3
|
+
set(CMAKE_HOST_SYSTEM_VERSION "15.4.0")
|
4
4
|
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
|
5
5
|
|
6
6
|
|
7
7
|
|
8
|
-
set(CMAKE_SYSTEM "Darwin-15.
|
8
|
+
set(CMAKE_SYSTEM "Darwin-15.4.0")
|
9
9
|
set(CMAKE_SYSTEM_NAME "Darwin")
|
10
|
-
set(CMAKE_SYSTEM_VERSION "15.
|
10
|
+
set(CMAKE_SYSTEM_VERSION "15.4.0")
|
11
11
|
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
|
12
12
|
|
13
13
|
set(CMAKE_CROSSCOMPILING "FALSE")
|
@@ -45,7 +45,7 @@
|
|
45
45
|
# define COMPILER_ID "Embarcadero"
|
46
46
|
# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF)
|
47
47
|
# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF)
|
48
|
-
# define COMPILER_VERSION_PATCH
|
48
|
+
# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF)
|
49
49
|
|
50
50
|
#elif defined(__BORLANDC__)
|
51
51
|
# define COMPILER_ID "Borland"
|
@@ -130,7 +130,7 @@
|
|
130
130
|
|
131
131
|
#elif defined(_CRAYC)
|
132
132
|
# define COMPILER_ID "Cray"
|
133
|
-
# define COMPILER_VERSION_MAJOR DEC(
|
133
|
+
# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR)
|
134
134
|
# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR)
|
135
135
|
|
136
136
|
#elif defined(__TI_COMPILER_VERSION__)
|
@@ -181,7 +181,9 @@
|
|
181
181
|
#elif defined(__GNUC__)
|
182
182
|
# define COMPILER_ID "GNU"
|
183
183
|
# define COMPILER_VERSION_MAJOR DEC(__GNUC__)
|
184
|
-
#
|
184
|
+
# if defined(__GNUC_MINOR__)
|
185
|
+
# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__)
|
186
|
+
# endif
|
185
187
|
# if defined(__GNUC_PATCHLEVEL__)
|
186
188
|
# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__)
|
187
189
|
# endif
|
@@ -216,6 +218,21 @@
|
|
216
218
|
#elif defined(__IAR_SYSTEMS_ICC__ ) || defined(__IAR_SYSTEMS_ICC)
|
217
219
|
# define COMPILER_ID "IAR"
|
218
220
|
|
221
|
+
#elif defined(__ARMCC_VERSION)
|
222
|
+
# define COMPILER_ID "ARMCC"
|
223
|
+
#if __ARMCC_VERSION >= 1000000
|
224
|
+
/* __ARMCC_VERSION = VRRPPPP */
|
225
|
+
# define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000)
|
226
|
+
# define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100)
|
227
|
+
# define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000)
|
228
|
+
#else
|
229
|
+
/* __ARMCC_VERSION = VRPPPP */
|
230
|
+
# define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000)
|
231
|
+
# define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10)
|
232
|
+
# define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000)
|
233
|
+
#endif
|
234
|
+
|
235
|
+
|
219
236
|
#elif defined(SDCC)
|
220
237
|
# define COMPILER_ID "SDCC"
|
221
238
|
/* SDCC = VRP */
|
@@ -264,6 +281,10 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
|
|
264
281
|
char const* qnxnto = "INFO" ":" "qnxnto[]";
|
265
282
|
#endif
|
266
283
|
|
284
|
+
#if defined(__CRAYXE) || defined(__CRAYXC)
|
285
|
+
char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
|
286
|
+
#endif
|
287
|
+
|
267
288
|
#define STRINGIFY_HELPER(X) #X
|
268
289
|
#define STRINGIFY(X) STRINGIFY_HELPER(X)
|
269
290
|
|
@@ -482,6 +503,17 @@ char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
|
|
482
503
|
|
483
504
|
|
484
505
|
|
506
|
+
const char* info_language_dialect_default = "INFO" ":" "dialect_default["
|
507
|
+
#if !defined(__STDC_VERSION__)
|
508
|
+
"90"
|
509
|
+
#elif __STDC_VERSION__ >= 201000L
|
510
|
+
"11"
|
511
|
+
#elif __STDC_VERSION__ >= 199901L
|
512
|
+
"99"
|
513
|
+
#else
|
514
|
+
#endif
|
515
|
+
"]";
|
516
|
+
|
485
517
|
/*--------------------------------------------------------------------------*/
|
486
518
|
|
487
519
|
#ifdef ID_VOID_MAIN
|
@@ -502,6 +534,10 @@ int main(int argc, char* argv[])
|
|
502
534
|
#ifdef SIMULATE_VERSION_MAJOR
|
503
535
|
require += info_simulate_version[argc];
|
504
536
|
#endif
|
537
|
+
#if defined(__CRAYXE) || defined(__CRAYXC)
|
538
|
+
require += info_cray[argc];
|
539
|
+
#endif
|
540
|
+
require += info_language_dialect_default[argc];
|
505
541
|
(void)argv;
|
506
542
|
return require;
|
507
543
|
}
|