Skip to content

Commit

Permalink
Merge pull request #30 from Tolc-Software/llvm14
Browse files Browse the repository at this point in the history
Update to LLVM 14 and latest parser/frontend.{py,wasm}
  • Loading branch information
srydell authored May 25, 2022
2 parents 980716c + 850be18 commit d064236
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ on:
jobs:
build:

runs-on: windows-2019
runs-on: windows-2022
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
env:
VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
VCVARS: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
20 changes: 14 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.20)

# Temporary workaround for clang 14
# https://github.com/llvm/llvm-project/issues/53950
if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Windows)
set(tolc_languages CXX)
else()
set(tolc_languages C CXX)
endif()

project(
tolc
VERSION 0.6.2
LANGUAGES CXX)
VERSION 0.6.3
LANGUAGES ${tolc_languages})

configure_file(docs/ReleaseNotes/version.in
${CMAKE_CURRENT_LIST_DIR}/docs/ReleaseNotes/version @ONLY)
Expand Down Expand Up @@ -31,17 +39,17 @@ include(${modules}/Sanitizers.cmake)
include(${modules}/StaticAnalyzers.cmake)

include(${modules}/GetFrontend.cmake)
get_frontend(NAME Frontend.py VERSION v0.6.1)
get_frontend(NAME Frontend.py VERSION v0.7.0)
copy_frontend_docs(NAME Frontend.py SRC_DIR ${frontend.py_SOURCE_DIR} COPY_TO
${CMAKE_CURRENT_LIST_DIR}/docs/packaging/docs/python)

get_frontend(NAME Frontend.wasm VERSION v0.5.1)
get_frontend(NAME Frontend.wasm VERSION v0.6.0)
copy_frontend_docs(
NAME Frontend.wasm SRC_DIR ${frontend.wasm_SOURCE_DIR} COPY_TO
${CMAKE_CURRENT_LIST_DIR}/docs/packaging/docs/webassembly)

include(${modules}/GetParser.cmake)
get_parser(VERSION v0.5.6)
get_parser(VERSION v0.6.0)

# Set the include path for the system library in the variable
# We are using the standard library shipped
Expand Down
3 changes: 3 additions & 0 deletions docs/ReleaseNotes/v0.6.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# News #

* Update to LLVM14
2 changes: 1 addition & 1 deletion tests/packaging/systemTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ foreach(test_name createTranslationTestWasm)
wasm
RUN_COMMAND
node
--no-experimental-fetch
${CMAKE_CURRENT_LIST_DIR}/${test_name}/test.js)
endforeach()

2 changes: 1 addition & 1 deletion tools/conan_profiles/Windows/clang.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build_type=@CMAKE_BUILD_TYPE@
compiler=Visual Studio
compiler.toolset=ClangCL
compiler.runtime=@MSVC_RUNTIME_LIBRARY@
compiler.version=16
compiler.version=17
os=Windows
os_build=Windows
[options]
Expand Down

0 comments on commit d064236

Please sign in to comment.