Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into get_env
- Loading branch information
Showing
233 changed files
with
1,594 additions
and
1,403 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: StyleCheck | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| stylecheck: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - os: "ubuntu-latest" | ||
| runs-on: ${{ matrix.config.os }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-python@v1 | ||
| - name: Install Compiler and Dependencies | ||
| shell: pwsh | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install clang-format-10 -y | ||
| sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-10 800 | ||
| - name: Stylecheck | ||
| run: | | ||
| cd testsuite/style | ||
| chmod +x clang-format-test.py | ||
| ./clang-format-test.py | ||
| notify_on_failure: | ||
| needs: stylecheck | ||
| runs-on: "ubuntu-latest" | ||
| if: failure() | ||
| steps: | ||
| - name: Discord notification failure | ||
| env: | ||
| DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} | ||
| uses: turleypol/actions-status-discord@master | ||
| with: | ||
| status: failure | ||
| job: StyleCheck | ||
| notify_on_success: | ||
| needs: stylecheck | ||
| runs-on: "ubuntu-latest" | ||
| if: success() | ||
| steps: | ||
| - name: Discord notification success | ||
| env: | ||
| DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} | ||
| uses: turleypol/actions-status-discord@master | ||
| with: | ||
| status: success | ||
| job: StyleCheck | ||
| notify_on_cancel: | ||
| needs: stylecheck | ||
| runs-on: "ubuntu-latest" | ||
| if: cancelled() | ||
| steps: | ||
| - name: Discord notification cancelled | ||
| env: | ||
| DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} | ||
| uses: turleypol/actions-status-discord@master | ||
| with: | ||
| status: cancelled | ||
| job: StyleCheck |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,65 @@ | ||
| find_package(Java QUIET COMPONENTS Runtime) | ||
|
|
||
| if(NOT ANTLR_EXECUTABLE) | ||
| find_program(ANTLR_EXECUTABLE | ||
| NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.8-complete.jar | ||
| ) | ||
| endif() | ||
| if(Java_JAVA_EXECUTABLE AND ANTLR_EXECUTABLE) | ||
| message("adding target 'escriptgrammar'") | ||
| add_custom_target(escriptgrammar | ||
| COMMAND ${Java_JAVA_EXECUTABLE} -jar ${ANTLR_EXECUTABLE} | ||
| -Dlanguage=Cpp -package EscriptGrammar | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.g4 | ||
| -o ${POL_EXT_LIB_DIR}/EscriptGrammar | ||
| # You'll have to qualify the namespace antlr4::TokenStream | ||
| # in the EscriptParser constructor when regenerating. | ||
| COMMAND ${Java_JAVA_EXECUTABLE} -jar ${ANTLR_EXECUTABLE} | ||
| -Dlanguage=Cpp -visitor -package EscriptGrammar | ||
| if(CMAKE_SCRIPT_MODE_FILE) | ||
| file(GLOB files "${path}/*.cpp" "${path}/*.h" ) | ||
| foreach(file ${files}) | ||
| get_filename_component(filename "${file}" NAME) | ||
| message("* Fixing ${filename}") | ||
| file(READ ${file} contents) | ||
| string(REGEX REPLACE "Generated from [^\r\n]*lib" "Generated from lib" replaced "${contents}") | ||
| if(filename STREQUAL "EscriptParser.cpp") | ||
| string(REPLACE "EscriptParser::EscriptParser(TokenStream *input)" "EscriptParser::EscriptParser(antlr4::TokenStream *input)" replaced "${replaced}") | ||
| endif() | ||
| file(WRITE ${file} "${replaced}") | ||
| endforeach() | ||
| else() | ||
| if(NOT ANTLR_EXECUTABLE) | ||
| find_program(ANTLR_EXECUTABLE | ||
| NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.8-complete.jar | ||
| ) | ||
| endif() | ||
| if(Java_JAVA_EXECUTABLE AND ANTLR_EXECUTABLE) | ||
| message("adding target 'escriptgrammar'") | ||
| add_custom_target(escriptgrammar | ||
| COMMAND ${Java_JAVA_EXECUTABLE} -jar ${ANTLR_EXECUTABLE} | ||
| -Dlanguage=Cpp -package EscriptGrammar | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.g4 | ||
| -o ${POL_EXT_LIB_DIR}/EscriptGrammar | ||
| # You'll have to qualify the namespace antlr4::TokenStream | ||
| # in the EscriptParser constructor when regenerating. | ||
| COMMAND ${Java_JAVA_EXECUTABLE} -jar ${ANTLR_EXECUTABLE} | ||
| -Dlanguage=Cpp -visitor -package EscriptGrammar | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.g4 | ||
| -o ${POL_EXT_LIB_DIR}/EscriptGrammar | ||
| COMMENT "Generating grammar files" | ||
| ) | ||
| add_custom_command(TARGET escriptgrammar | ||
| POST_BUILD COMMAND ${CMAKE_COMMAND} -Dpath=${POL_EXT_LIB_DIR}/EscriptGrammar -P ${CMAKE_CURRENT_LIST_FILE} | ||
| COMMENT "Fixing files" | ||
| ) | ||
| endif() | ||
|
|
||
| #fake target for vstudio gui | ||
| add_custom_target(escriptfiles | ||
| WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
| VERBATIM | ||
| SOURCES | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.g4 | ||
| -o ${POL_EXT_LIB_DIR}/EscriptGrammar | ||
| COMMENT "Generating grammar files" | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.cpp | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.g4 | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.cpp | ||
| ) | ||
| endif() | ||
|
|
||
| #fake target for vstudio gui | ||
| add_custom_target(escriptfiles | ||
| WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
| VERBATIM | ||
| SOURCES | ||
| source_group(escriptgrammar FILES | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.g4 | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.cpp | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.g4 | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.cpp | ||
| ) | ||
| source_group(escriptgrammar FILES | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.g4 | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptParser.cpp | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.g4 | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.h | ||
| ${POL_EXT_LIB_DIR}/EscriptGrammar/EscriptLexer.cpp | ||
| ) | ||
| set_target_properties(escriptfiles PROPERTIES EXCLUDE_FROM_ALL TRUE) | ||
| set_target_properties(escriptfiles PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) | ||
| set_target_properties(escriptfiles PROPERTIES FOLDER Grammar) | ||
| ) | ||
| set_target_properties(escriptfiles PROPERTIES EXCLUDE_FROM_ALL TRUE) | ||
| set_target_properties(escriptfiles PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) | ||
| set_target_properties(escriptfiles PROPERTIES FOLDER Grammar) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.