Merge remote-tracking branch 'upstream/main' into wasi-sdk-build

.github/workflows/build.yml

@@ -12,18 +12,18 @@ on:
 jobs:
   lint:
     # if: 'false'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # Install lint dependencies
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
-    - uses: actions/setup-node@v1
+        python-version: '3.12'
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16'
+        node-version: '20'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
 
@@ -34,22 +34,22 @@ jobs:
 
   web:
     # if: 'false'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # Install web dependencies
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
     - run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
     - run: nohup python -m httpbin.core --port 64526 --host 0.0.0.0 &
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16'
+        node-version: '20'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - run: make install-wasi-sdk-linux
@@ -69,7 +69,7 @@ jobs:
     - run: . emsdk/emsdk_env.sh && make vjs BUILD=profile
     - run: . emsdk/emsdk_env.sh && make vjs BUILD=release TARGET=asmjs-unknown-emscripten
     - run: npm pack
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: npm package
         path: ./vireo-*.tgz
@@ -98,13 +98,13 @@ jobs:
 
   web-windows:
     # if: 'false'
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # Install web-windows dependencies
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v4
       with:
         node-version: '16'
         registry-url: 'https://registry.npmjs.org'
@@ -113,9 +113,9 @@ jobs:
     - run: make vwasi
     - run: choco install make -y
     - run: choco install gnuwin32-coreutils.portable -y
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
     - run: |
         python -m pip install --upgrade pip
         pip install tox
@@ -132,7 +132,7 @@ jobs:
     # Build web-windows
     - run: emsdk\emsdk_env.ps1 && make vjs
     - run: npm pack
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: npm package win build
         path: ./vireo-*.tgz
@@ -145,7 +145,7 @@ jobs:
     - run: npm run test-min
 
   setup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
@@ -165,16 +165,16 @@ jobs:
   windows:
     # if: 'false'
     needs: setup
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # Install windows dependencies
-    - uses: microsoft/setup-msbuild@v1
-    - uses: actions/setup-node@v1
+    - uses: microsoft/setup-msbuild@v2
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16'
+        node-version: '20'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
 
@@ -190,14 +190,14 @@ jobs:
     - run: 7z a %ESH_32_DEBUG% .\dist\Debug\esh.exe .\dist\Debug\esh.pdb .\README.md .\LICENSE.txt
       shell: cmd
       working-directory: ${{env.GITHUB_WORKSPACE}}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ env.ESH_32_DEBUG }}
         path: ${{ env.ESH_32_DEBUG }}
         if-no-files-found: error
-    - uses: nuget/setup-nuget@v1
+    - uses: nuget/setup-nuget@v2
     - run: nuget pack VireoSDK.nuspec -properties version="$Env:ESH_VERSION"
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: nuget package
         path: ./*.nupkg
@@ -225,15 +225,15 @@ jobs:
   linux:
     # if: 'false'
     needs: setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # Install linux dependencies
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16'
+        node-version: '20'
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - run: echo gcc -v
@@ -246,7 +246,7 @@ jobs:
         export ESH_64_RELEASE="esh_"$ESH_VERSION"_x86_64-unknown-linux-gnu_release.zip"
         echo "ESH_64_RELEASE=$ESH_64_RELEASE" >> $GITHUB_ENV
     - run: zip -j $ESH_64_RELEASE dist/esh README.md LICENSE.txt
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ env.ESH_64_RELEASE }}
         path: ${{ env.ESH_64_RELEASE }}

.gitignore

@@ -40,6 +40,7 @@ Vireo_VS/VireoCommandLine.sdf
 Vireo_VS/VireoCommandLine.vcxproj.user
 Vireo_VS/_Resharper.Caches/*
 Vireo_VS/VireoCommandLine.sln.DotSettings.user
+Vireo_VS/VireoCommandLine/*
 **.VC.db
 **.opendb
 **.suo

Vireo_VS/VireoCommandLine.vcxproj

@@ -110,7 +110,7 @@
     <ProjectGuid>{113F876C-CB35-4D2F-A3EF-C72215B288F7}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>VireoCommandLine</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

docs/Build.md

@@ -5,7 +5,7 @@
 ### Software requirements
 
 - [git](https://git-scm.com/downloads)
-- [Node.js](https://nodejs.org/en/) (>=12, latest LTS release recommended)
+- [Node.js](https://nodejs.org/en/) (>=20, latest LTS release recommended)
 - GNU Make and GNU core utilities (see following)
 
 ### Installing GNU Make and GNU core utilities
@@ -31,7 +31,7 @@ On all platforms run the following in the `VireoSDK` folder to install JavaScrip
 
 ### Software requirements
 
-- [Python](https://www.python.org/) (>= 2.7.9)
+- [Python](https://www.python.org/) (>= 3.12)
 - emsdk toolchain (see following)
 
 Note: Windows 10 may include a a copy of python seen by running `which python` resulting in the path: `C:\Users\<USER>\AppData\Local\Microsoft\WindowsApps\python.exe`. Make sure to install a copy of python from `python.org`.
@@ -102,7 +102,9 @@ make install-wasi-sdk-mac
 
 ### Software requirements
 
-- Visual Studio 2013, Visual Studio 2015, or Visual Studio 2017 with C++ support
+- Visual Studio 2022 with C++ support, specifically:
+  - Windows 10 SDK (10.0.20348.0)
+  - MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.29)
 
 ### Building Vireo Windows Native
 

make-it/EmMakefile

@@ -208,7 +208,7 @@ $(OBJS):
 	@$(MKDIR) -p $(OBJS)
 
 $(PREJS) $(POSTJS): $(CORESOURCEDIR)/vireo.wrapper.js
-	node splitVireoWrapper.js $(CORESOURCEDIR)/vireo.wrapper.js $(PREJS) $(POSTJS)
+	npm run split-wrapper -- $(CORESOURCEDIR)/vireo.wrapper.js $(PREJS) $(POSTJS)
 
 vjs: $(DIST)/vireo.js $(DIST)/vireo.min.js
 vwasi: $(DIST)/vireo.wasm