diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-04-28 20:26:55 +0200 |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-04-28 23:10:39 +0200 |
commit | 9bad0dfccedcc1cd71ee2579486f6729cb9d7749 (patch) | |
tree | 254ca1652ef98e6a3d36024f675f05a2fe6ad1d4 | |
parent | 8927e913f780fa62c540063b8a5cfe0dcbfdd288 (diff) | |
download | cmake-9bad0dfccedcc1cd71ee2579486f6729cb9d7749.tar.gz |
LexerParser: move to custom directory
-rw-r--r-- | Source/.gitattributes | 18 | ||||
-rw-r--r-- | Source/CMakeLists.txt | 40 | ||||
-rw-r--r-- | Source/LexerParser/.gitattributes | 17 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentLexer.cxx (renamed from Source/cmCommandArgumentLexer.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentLexer.h (renamed from Source/cmCommandArgumentLexer.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentLexer.in.l (renamed from Source/cmCommandArgumentLexer.in.l) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentParser.cxx (renamed from Source/cmCommandArgumentParser.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentParser.y (renamed from Source/cmCommandArgumentParser.y) | 1 | ||||
-rw-r--r-- | Source/LexerParser/cmCommandArgumentParserTokens.h (renamed from Source/cmCommandArgumentParserTokens.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaLexer.cxx (renamed from Source/cmDependsJavaLexer.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaLexer.h (renamed from Source/cmDependsJavaLexer.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaLexer.in.l (renamed from Source/cmDependsJavaLexer.in.l) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaParser.cxx (renamed from Source/cmDependsJavaParser.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaParser.y (renamed from Source/cmDependsJavaParser.y) | 3 | ||||
-rw-r--r-- | Source/LexerParser/cmDependsJavaParserTokens.h (renamed from Source/cmDependsJavaParserTokens.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmExprLexer.cxx (renamed from Source/cmExprLexer.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmExprLexer.h (renamed from Source/cmExprLexer.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmExprLexer.in.l (renamed from Source/cmExprLexer.in.l) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmExprParser.cxx (renamed from Source/cmExprParser.cxx) | 1 | ||||
-rw-r--r-- | Source/LexerParser/cmExprParser.y (renamed from Source/cmExprParser.y) | 1 | ||||
-rw-r--r-- | Source/LexerParser/cmExprParserTokens.h (renamed from Source/cmExprParserTokens.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranLexer.cxx (renamed from Source/cmFortranLexer.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranLexer.h (renamed from Source/cmFortranLexer.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranLexer.in.l (renamed from Source/cmFortranLexer.in.l) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranParser.cxx (renamed from Source/cmFortranParser.cxx) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranParser.y (renamed from Source/cmFortranParser.y) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmFortranParserTokens.h (renamed from Source/cmFortranParserTokens.h) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmListFileLexer.c (renamed from Source/cmListFileLexer.c) | 0 | ||||
-rw-r--r-- | Source/LexerParser/cmListFileLexer.in.l (renamed from Source/cmListFileLexer.in.l) | 0 | ||||
-rwxr-xr-x | bootstrap | 25 |
30 files changed, 65 insertions, 41 deletions
diff --git a/Source/.gitattributes b/Source/.gitattributes index f69ad9d357..0f829a368d 100644 --- a/Source/.gitattributes +++ b/Source/.gitattributes @@ -1,20 +1,2 @@ -/cmCommandArgumentLexer.cxx generated -/cmCommandArgumentLexer.h generated -/cmCommandArgumentParser.cxx generated -/cmCommandArgumentParserTokens.h generated -/cmDependsJavaLexer.cxx generated -/cmDependsJavaLexer.h generated -/cmDependsJavaParser.cxx generated -/cmDependsJavaParserTokens.h generated -/cmExprLexer.cxx generated -/cmExprLexer.h generated -/cmExprParser.cxx generated -/cmExprParserTokens.h generated -/cmFortranLexer.cxx generated -/cmFortranLexer.h generated -/cmFortranParser.cxx generated -/cmFortranParserTokens.h generated -/cmListFileLexer.c generated - # Do not format third-party sources. /kwsys/** -format.clang-format diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 7c72a114cf..1ea75bf7af 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -78,6 +78,7 @@ configure_file( include_directories( "${CMake_BINARY_DIR}/Source" "${CMake_SOURCE_DIR}/Source" + "${CMake_SOURCE_DIR}/Source/LexerParser" ${CMAKE_ZLIB_INCLUDES} ${CMAKE_EXPAT_INCLUDES} ${CMAKE_TAR_INCLUDES} @@ -102,14 +103,40 @@ endif() # Sources for CMakeLib # set(SRCS + # Lexers/Parsers + LexerParser/cmCommandArgumentLexer.cxx + LexerParser/cmCommandArgumentLexer.h + LexerParser/cmCommandArgumentLexer.in.l + LexerParser/cmCommandArgumentParser.cxx + LexerParser/cmCommandArgumentParserTokens.h + LexerParser/cmCommandArgumentParser.y + LexerParser/cmDependsJavaLexer.cxx + LexerParser/cmDependsJavaLexer.h + LexerParser/cmDependsJavaLexer.in.l + LexerParser/cmDependsJavaParser.cxx + LexerParser/cmDependsJavaParserTokens.h + LexerParser/cmDependsJavaParser.y + LexerParser/cmExprLexer.cxx + LexerParser/cmExprLexer.h + LexerParser/cmExprLexer.in.l + LexerParser/cmExprParser.cxx + LexerParser/cmExprParserTokens.h + LexerParser/cmExprParser.y + LexerParser/cmFortranLexer.cxx + LexerParser/cmFortranLexer.h + LexerParser/cmFortranLexer.in.l + LexerParser/cmFortranParser.cxx + LexerParser/cmFortranParserTokens.h + LexerParser/cmFortranParser.y + LexerParser/cmListFileLexer.c + LexerParser/cmListFileLexer.in.l + cmArchiveWrite.cxx cmBase32.cxx cmCacheManager.cxx cmCacheManager.h cmCLocaleEnvironmentScope.h cmCLocaleEnvironmentScope.cxx - cmCommandArgumentLexer.cxx - cmCommandArgumentParser.cxx cmCommandArgumentParserHelper.cxx cmCommonTargetGenerator.cxx cmCommonTargetGenerator.h @@ -141,8 +168,6 @@ set(SRCS cmDependsFortran.h cmDependsJava.cxx cmDependsJava.h - cmDependsJavaLexer.cxx - cmDependsJavaParser.cxx cmDependsJavaParserHelper.cxx cmDependsJavaParserHelper.h cmDocumentation.cxx @@ -151,8 +176,6 @@ set(SRCS cmDynamicLoader.cxx cmDynamicLoader.h ${ELF_SRCS} - cmExprLexer.cxx - cmExprParser.cxx cmExprParserHelper.cxx cmExportBuildAndroidMKGenerator.h cmExportBuildAndroidMKGenerator.cxx @@ -192,10 +215,6 @@ set(SRCS cmFilePathChecksum.h cmFileTimeComparison.cxx cmFileTimeComparison.h - cmFortranLexer.cxx - cmFortranLexer.h - cmFortranParser.cxx - cmFortranParser.h cmFortranParserImpl.cxx cmGeneratedFileStream.cxx cmGeneratorExpressionContext.cxx @@ -247,7 +266,6 @@ set(SRCS cmLinkLineDeviceComputer.h cmListFileCache.cxx cmListFileCache.h - cmListFileLexer.c cmLocalCommonGenerator.cxx cmLocalCommonGenerator.h cmLocalGenerator.cxx diff --git a/Source/LexerParser/.gitattributes b/Source/LexerParser/.gitattributes new file mode 100644 index 0000000000..47eedfb4bd --- /dev/null +++ b/Source/LexerParser/.gitattributes @@ -0,0 +1,17 @@ +/cmCommandArgumentLexer.cxx generated +/cmCommandArgumentLexer.h generated +/cmCommandArgumentParser.cxx generated +/cmCommandArgumentParserTokens.h generated +/cmDependsJavaLexer.cxx generated +/cmDependsJavaLexer.h generated +/cmDependsJavaParser.cxx generated +/cmDependsJavaParserTokens.h generated +/cmExprLexer.cxx generated +/cmExprLexer.h generated +/cmExprParser.cxx generated +/cmExprParserTokens.h generated +/cmFortranLexer.cxx generated +/cmFortranLexer.h generated +/cmFortranParser.cxx generated +/cmFortranParserTokens.h generated +/cmListFileLexer.c generated diff --git a/Source/cmCommandArgumentLexer.cxx b/Source/LexerParser/cmCommandArgumentLexer.cxx index 12dce37583..12dce37583 100644 --- a/Source/cmCommandArgumentLexer.cxx +++ b/Source/LexerParser/cmCommandArgumentLexer.cxx diff --git a/Source/cmCommandArgumentLexer.h b/Source/LexerParser/cmCommandArgumentLexer.h index 82e87b5579..82e87b5579 100644 --- a/Source/cmCommandArgumentLexer.h +++ b/Source/LexerParser/cmCommandArgumentLexer.h diff --git a/Source/cmCommandArgumentLexer.in.l b/Source/LexerParser/cmCommandArgumentLexer.in.l index e3a80948c0..e3a80948c0 100644 --- a/Source/cmCommandArgumentLexer.in.l +++ b/Source/LexerParser/cmCommandArgumentLexer.in.l diff --git a/Source/cmCommandArgumentParser.cxx b/Source/LexerParser/cmCommandArgumentParser.cxx index aed0826c0d..aed0826c0d 100644 --- a/Source/cmCommandArgumentParser.cxx +++ b/Source/LexerParser/cmCommandArgumentParser.cxx diff --git a/Source/cmCommandArgumentParser.y b/Source/LexerParser/cmCommandArgumentParser.y index d6c83124e2..55a88dffa3 100644 --- a/Source/cmCommandArgumentParser.y +++ b/Source/LexerParser/cmCommandArgumentParser.y @@ -189,4 +189,3 @@ void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message) { yyGetParser->Error(message); } - diff --git a/Source/cmCommandArgumentParserTokens.h b/Source/LexerParser/cmCommandArgumentParserTokens.h index 3172182d7a..3172182d7a 100644 --- a/Source/cmCommandArgumentParserTokens.h +++ b/Source/LexerParser/cmCommandArgumentParserTokens.h diff --git a/Source/cmDependsJavaLexer.cxx b/Source/LexerParser/cmDependsJavaLexer.cxx index 8159f47bbe..8159f47bbe 100644 --- a/Source/cmDependsJavaLexer.cxx +++ b/Source/LexerParser/cmDependsJavaLexer.cxx diff --git a/Source/cmDependsJavaLexer.h b/Source/LexerParser/cmDependsJavaLexer.h index ccadd70b9a..ccadd70b9a 100644 --- a/Source/cmDependsJavaLexer.h +++ b/Source/LexerParser/cmDependsJavaLexer.h diff --git a/Source/cmDependsJavaLexer.in.l b/Source/LexerParser/cmDependsJavaLexer.in.l index 8cb42b17a1..8cb42b17a1 100644 --- a/Source/cmDependsJavaLexer.in.l +++ b/Source/LexerParser/cmDependsJavaLexer.in.l diff --git a/Source/cmDependsJavaParser.cxx b/Source/LexerParser/cmDependsJavaParser.cxx index bc45d45e17..bc45d45e17 100644 --- a/Source/cmDependsJavaParser.cxx +++ b/Source/LexerParser/cmDependsJavaParser.cxx diff --git a/Source/cmDependsJavaParser.y b/Source/LexerParser/cmDependsJavaParser.y index 1137f39016..f7eb228188 100644 --- a/Source/cmDependsJavaParser.y +++ b/Source/LexerParser/cmDependsJavaParser.y @@ -242,7 +242,7 @@ jp_DECIMALINTEGERLITERAL yyGetParser->SetCurrentCombine(""); } | -jp_HEXINTEGERLITERAL +jp_HEXINTEGERLITERAL { jpElementStart(1); jpCheckEmpty(1); @@ -3212,4 +3212,3 @@ void cmDependsJava_yyerror(yyscan_t yyscanner, const char* message) { yyGetParser->Error(message); } - diff --git a/Source/cmDependsJavaParserTokens.h b/Source/LexerParser/cmDependsJavaParserTokens.h index 7f18f1dd84..7f18f1dd84 100644 --- a/Source/cmDependsJavaParserTokens.h +++ b/Source/LexerParser/cmDependsJavaParserTokens.h diff --git a/Source/cmExprLexer.cxx b/Source/LexerParser/cmExprLexer.cxx index fb6f0db989..fb6f0db989 100644 --- a/Source/cmExprLexer.cxx +++ b/Source/LexerParser/cmExprLexer.cxx diff --git a/Source/cmExprLexer.h b/Source/LexerParser/cmExprLexer.h index 835a7a36a5..835a7a36a5 100644 --- a/Source/cmExprLexer.h +++ b/Source/LexerParser/cmExprLexer.h diff --git a/Source/cmExprLexer.in.l b/Source/LexerParser/cmExprLexer.in.l index 25ddba4604..25ddba4604 100644 --- a/Source/cmExprLexer.in.l +++ b/Source/LexerParser/cmExprLexer.in.l diff --git a/Source/cmExprParser.cxx b/Source/LexerParser/cmExprParser.cxx index 19efca1f03..67664a5f5f 100644 --- a/Source/cmExprParser.cxx +++ b/Source/LexerParser/cmExprParser.cxx @@ -1696,4 +1696,3 @@ void cmExpr_yyerror(yyscan_t yyscanner, const char* message) { cmExpr_yyget_extra(yyscanner)->Error(message); } - diff --git a/Source/cmExprParser.y b/Source/LexerParser/cmExprParser.y index 220f7c8e4c..d1c3a97a7c 100644 --- a/Source/cmExprParser.y +++ b/Source/LexerParser/cmExprParser.y @@ -162,4 +162,3 @@ void cmExpr_yyerror(yyscan_t yyscanner, const char* message) { cmExpr_yyget_extra(yyscanner)->Error(message); } - diff --git a/Source/cmExprParserTokens.h b/Source/LexerParser/cmExprParserTokens.h index 84b2bbdcd9..84b2bbdcd9 100644 --- a/Source/cmExprParserTokens.h +++ b/Source/LexerParser/cmExprParserTokens.h diff --git a/Source/cmFortranLexer.cxx b/Source/LexerParser/cmFortranLexer.cxx index 01c09acb7f..01c09acb7f 100644 --- a/Source/cmFortranLexer.cxx +++ b/Source/LexerParser/cmFortranLexer.cxx diff --git a/Source/cmFortranLexer.h b/Source/LexerParser/cmFortranLexer.h index ddda919659..ddda919659 100644 --- a/Source/cmFortranLexer.h +++ b/Source/LexerParser/cmFortranLexer.h diff --git a/Source/cmFortranLexer.in.l b/Source/LexerParser/cmFortranLexer.in.l index 112121037a..112121037a 100644 --- a/Source/cmFortranLexer.in.l +++ b/Source/LexerParser/cmFortranLexer.in.l diff --git a/Source/cmFortranParser.cxx b/Source/LexerParser/cmFortranParser.cxx index 2b3452f2e2..2b3452f2e2 100644 --- a/Source/cmFortranParser.cxx +++ b/Source/LexerParser/cmFortranParser.cxx diff --git a/Source/cmFortranParser.y b/Source/LexerParser/cmFortranParser.y index acfb40ad8e..acfb40ad8e 100644 --- a/Source/cmFortranParser.y +++ b/Source/LexerParser/cmFortranParser.y diff --git a/Source/cmFortranParserTokens.h b/Source/LexerParser/cmFortranParserTokens.h index 8d6a5fe5ab..8d6a5fe5ab 100644 --- a/Source/cmFortranParserTokens.h +++ b/Source/LexerParser/cmFortranParserTokens.h diff --git a/Source/cmListFileLexer.c b/Source/LexerParser/cmListFileLexer.c index 3dd3b85b9b..3dd3b85b9b 100644 --- a/Source/cmListFileLexer.c +++ b/Source/LexerParser/cmListFileLexer.c diff --git a/Source/cmListFileLexer.in.l b/Source/LexerParser/cmListFileLexer.in.l index 5152dbf08f..5152dbf08f 100644 --- a/Source/cmListFileLexer.in.l +++ b/Source/LexerParser/cmListFileLexer.in.l @@ -240,6 +240,10 @@ CMAKE_UNUSED_SOURCES="\ " CMAKE_CXX_SOURCES="\ + LexerParser/cmCommandArgumentLexer \ + LexerParser/cmCommandArgumentParser \ + LexerParser/cmExprLexer \ + LexerParser/cmExprParser \ cmAddCustomCommandCommand \ cmAddCustomTargetCommand \ cmAddDefinitionsCommand \ @@ -255,8 +259,6 @@ CMAKE_CXX_SOURCES="\ cmCPackPropertiesGenerator \ cmCacheManager \ cmCommand \ - cmCommandArgumentLexer \ - cmCommandArgumentParser \ cmCommandArgumentParserHelper \ cmCommandArgumentsHelper \ cmCommands \ @@ -288,8 +290,6 @@ CMAKE_CXX_SOURCES="\ cmExportSet \ cmExportSetMap \ cmExportTryCompileFileGenerator \ - cmExprLexer \ - cmExprParser \ cmExprParserHelper \ cmExternalMakefileProjectGenerator \ cmFileCommand \ @@ -417,7 +417,7 @@ if ${cmake_system_mingw}; then fi CMAKE_C_SOURCES="\ - cmListFileLexer \ + LexerParser/cmListFileLexer \ " if ${cmake_system_mingw}; then @@ -810,6 +810,11 @@ if [ ! -d "cmsys" ]; then cmake_error 4 "Cannot create directory ${cmake_bootstrap_dir}/cmsys" fi +[ -d "LexerParser" ] || mkdir "LexerParser" +if [ ! -d "LexerParser" ]; then + cmake_error 5 "Cannot create directory ${cmake_bootstrap_dir}/LexerParser" +fi + # Delete all the bootstrap files rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log" rm -f "${cmake_bootstrap_dir}/cmConfigure.h${_tmp}" @@ -1431,9 +1436,15 @@ cmake_cxx_flags_SystemTools=" -DKWSYS_CXX_HAS_UTIMENSAT=${KWSYS_CXX_HAS_UTIMENSAT} -DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES} " -cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ +cmake_c_flags="${cmake_c_flags} \ + -I`cmake_escape \"${cmake_bootstrap_dir}\"` \ + -I`cmake_escape \"${cmake_source_dir}/Source\"` \ + -I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \ -I`cmake_escape \"${cmake_source_dir}/Utilities\"`" -cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ +cmake_cxx_flags="${cmake_cxx_flags} \ + -I`cmake_escape \"${cmake_bootstrap_dir}\"` \ + -I`cmake_escape \"${cmake_source_dir}/Source\"` \ + -I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \ -I`cmake_escape \"${cmake_source_dir}/Utilities\"`" echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" |