Update to v0.3.0:

* Update fmt/spdlog

* Move packages from testStage to EmscriptenStage

Author: srydell

.github/workflows/macos.yml

@@ -80,6 +80,7 @@ jobs:
         mv Frontend.wasm-Darwin-main.tar.xz Frontend.wasm-Darwin-${version}.tar.xz
 
         echo "Making sure the release ${version} is online"
+        test -f docs/ReleaseNotes/${version}.md
         gh release create "${version}" --title "${version}" --notes-file "docs/ReleaseNotes/${version}.md" || true
         gh release upload "${version}" "Frontend.wasm-Darwin-${version}.tar.xz" || true
 

.github/workflows/ubuntu.yml

@@ -83,6 +83,7 @@ jobs:
         mv Frontend.wasm-Linux-main.tar.xz Frontend.wasm-Linux-${version}.tar.xz
 
         echo "Making sure the release ${version} is online"
+        test -f docs/ReleaseNotes/${version}.md
         gh release create "${version}" --title "${version}" --notes-file "docs/ReleaseNotes/${version}.md" || true
         gh release upload "${version}" Frontend.wasm-Linux-${version}.tar.xz || true
 

.github/workflows/windows-debug-deploy.yml

@@ -54,7 +54,7 @@ jobs:
       shell: cmd
       run: |
         call "%VCVARS%"
-        cmake -S. -Bbuild -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DENABLE_PACKAGING=ON -DCMAKE_BUILD_TYPE=Debug -DCPACK_PACKAGE_FILE_NAME=frontend -G Ninja -DCPACK_PACKAGE_FILE_NAME=frontend.wasm
+        cmake -S. -Bbuild -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DENABLE_PACKAGING=ON -DCMAKE_BUILD_TYPE=Debug -DCPACK_PACKAGE_FILE_NAME=frontend.wasm -G Ninja
 
     - name: Build
       working-directory: C:\Repo
@@ -90,6 +90,7 @@ jobs:
         mv Frontend.wasm-Windows-main-Debug.tar.xz Frontend.wasm-Windows-${version}-Debug.tar.xz
 
         echo "Making sure the release ${version} is online"
+        test -f docs/ReleaseNotes/${version}.md
         gh release create "${version}" --title "${version}" --notes-file "docs/ReleaseNotes/${version}.md" || true
         gh release upload "${version}" Frontend.wasm-Windows-${version}-Debug.tar.xz || true
 

.github/workflows/windows.yml

@@ -92,6 +92,7 @@ jobs:
         mv Frontend.wasm-Windows-main-Release.tar.xz Frontend.wasm-Windows-${version}-Release.tar.xz
 
         echo "Making sure the release ${version} is online"
+        test -f docs/ReleaseNotes/${version}.md
         gh release create "${version}" --title "${version}" --notes-file "docs/ReleaseNotes/${version}.md" || true
         gh release upload "${version}" Frontend.wasm-Windows-${version}-Release.tar.xz || true
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(
   Frontend.wasm
-  VERSION 0.2.0
+  VERSION 0.3.0
   LANGUAGES CXX)
 
 configure_file(docs/ReleaseNotes/version.in
@@ -28,7 +28,7 @@ include(${modules}/ConanHelpers.cmake)
 # Create the profile from variables known during configure
 setup_conan_profile(VARIABLE frontend_conan_profile)
 # This helps with packaging
-set(FRONTEND.WASM_CONAN_REQUIRES_PACKAGES spdlog/1.8.0 fmt/7.1.3)
+set(FRONTEND.WASM_CONAN_REQUIRES_PACKAGES spdlog/1.9.2 fmt/8.1.1)
 find_conan_packages(REQUIRES ${FRONTEND.WASM_CONAN_REQUIRES_PACKAGES} PROFILE
                     ${frontend_conan_profile})
 

docs/ReleaseNotes/.gitignore

@@ -0,0 +1,6 @@
+# Ignore all files named (wherever they are):
+.DS_Store
+.log
+
+# Generated by CMake
+version

docs/ReleaseNotes/v0.3.0.md

@@ -0,0 +1,7 @@
+# News #
+
+## Housekeeping ##
+
+* Update fmt to 8.1.1
+* Update spdlog to 1.9.2
+* Link against Tolc::Parser 0.2.0

src/Helpers/Embind/checkType.cpp

@@ -121,8 +121,10 @@ extractRegisterCommands(IR::Type const& type, EmbindProxy::TypeInfo& typeInfo) {
 	    container && noneOfIsConst(container->m_containedTypes)) {
 		if (auto s = getRegisterString(container->m_container)) {
 			auto typeString = Builders::buildTypeString(type, "_");
-			auto registerCmd = fmt::format(
-			    s.value(), Builders::getTemplateParameters(type), typeString);
+			auto registerCmd =
+			    fmt::format(fmt::runtime(s.value()),
+			                Builders::getTemplateParameters(type),
+			                typeString);
 
 			registerCmd += addElementsIfNecessary(
 			    *container, type.m_representation, typeString, typeInfo);

tests/CMakeLists.txt

@@ -1,12 +1,7 @@
 include_guard()
 
 include(${modules}/GetParser.cmake)
-
-set(parser_asset_name "Parser-${CMAKE_SYSTEM_NAME}-main")
-if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Windows)
-  set(parser_asset_name "${parser_asset_name}-${CMAKE_BUILD_TYPE}")
-endif()
-get_parser(ASSET_NAME ${parser_asset_name}.tar.xz)
+get_parser(VERSION v0.2.0)
 
 # Set the include path for the system library in the variable
 # We are using the standard library shipped
@@ -55,11 +50,14 @@ configure_file(
   TestUtil/include/TestStage/paths.cpp.in
   ${CMAKE_CURRENT_LIST_DIR}/TestUtil/include/TestStage/paths.cpp @ONLY)
 
-
 # Everything put in TestUtil/include is available
-add_library(TestUtil TestUtil/include/TestUtil/embindStage.cpp TestUtil/include/TestUtil/parse.cpp TestUtil/include/TestStage/paths.cpp)
+add_library(
+  TestUtil
+  TestUtil/include/TestUtil/embindStage.cpp TestUtil/include/TestUtil/parse.cpp
+  TestUtil/include/TestStage/paths.cpp)
 target_include_directories(TestUtil PUBLIC TestUtil/include)
-target_link_libraries(TestUtil PRIVATE Tolc::Frontend.wasm Tolc::Parser Catch2::Catch2 Tolc::Stage)
+target_link_libraries(TestUtil PRIVATE Tolc::Frontend.wasm Tolc::Parser
+                                       Catch2::Catch2 Tolc::Stage)
 target_link_libraries(TestUtil PUBLIC IR::IR)
 find_package(fmt REQUIRED)
 
@@ -77,9 +75,9 @@ endif()
 
 # Before configuring the stage, we have to download node dependencies
 add_test(
-    NAME NpmInstall
-	WORKING_DIRECTORY ${test_stage}
-    COMMAND ${npm_exe} install)
+  NAME NpmInstall
+  WORKING_DIRECTORY ${test_stage}/EmscriptenStage
+  COMMAND ${npm_exe} install)
 set_tests_properties(NpmInstall PROPERTIES FIXTURES_SETUP PreTestStage)
 
 # Create a test fixture for downloading dependencies in the test stage
@@ -88,11 +86,11 @@ add_test(
   WORKING_DIRECTORY ${test_stage}
   COMMAND ${CMAKE_COMMAND} -S. -Bbuild -GNinja)
 set_tests_properties(ConfigureTestStage PROPERTIES FIXTURES_SETUP TestStage)
-set_tests_properties(ConfigureTestStage PROPERTIES FIXTURES_REQUIRED PreTestStage)
+set_tests_properties(ConfigureTestStage PROPERTIES FIXTURES_REQUIRED
+                                                   PreTestStage)
 
 foreach(
   test
-
   Builders/attributeBuilder.cpp
   Builders/classBuilder.cpp
   Builders/enumBuilder.cpp
@@ -133,9 +131,8 @@ foreach(
   # userDefined.cpp
   # valarrays.cpp
   # variants.cpp
-  vectors.cpp
-  )
-# Ex: EmbindProxy/moduleFile.cpp -> moduleFile
+  vectors.cpp)
+  # Ex: EmbindProxy/moduleFile.cpp -> moduleFile
   get_filename_component(testName ${test} NAME_WLE)
 
   create_catch2_test(

tests/testStage/CMakeLists.txt

@@ -10,16 +10,11 @@ project(
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(cmake/GetEmscripten.cmake)
-include(cmake/GetNodeModules.cmake)
 
 if(NOT emsdk_SOURCE_DIR)
   get_emscripten(VERSION 3.1.3)
 endif()
 
-# Download and copy over to EmscriptenStage
-# package.json and node_modules
-get_node_modules()
-
 # Get the variable 'target_name'
 # NOTE: This will be generated for each test
 include(cmake/TargetName.cmake)

tests/testStage/EmscriptenStage/.gitignore

@@ -12,6 +12,7 @@
 !configureAndBuild.bat
 !defaultModule.test.js
 !package.json
+!package-lock.json
 
 # Directories
 !cmake

tests/testStage/package-lock.json renamed to tests/testStage/EmscriptenStage/package-lock.json

@@ -1,8 +1,5 @@
 {
   "dependencies": {
-    "jest": "^27.5.0"
-  },
-  "scripts": {
-      "test": "jest"
+    "jest": "^27.5.1"
   }
 }