Merge branch 'main' into Xmader/feat/url

[skip ci]

Author: Xmader

.github/workflows/test-and-publish.yaml

@@ -42,11 +42,6 @@ jobs:
             ./_spidermonkey_install/*
           key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
-      - name: Setup Poetry
-        if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.5.1
       - name: Setup XCode
         if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
         # SpiderMonkey 115 ESR requires XCode SDK version at least 13.3
@@ -67,11 +62,6 @@ jobs:
             ./_spidermonkey_install/*
           key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
-      - name: Setup Poetry
-        if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.5.1
       - name: Install dependencies
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
         shell: powershell

.vscode/c_cpp_properties.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/include/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++20",
+            "intelliSenseMode": "linux-clang-x64",
+            "browse": {
+                "limitSymbolsToIncludedHeaders": true
+            },
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        }
+    ],
+    "version": 4
+}

CMakeLists.txt

@@ -11,6 +11,7 @@ project("PythonMonkey"
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Add an external; appends to `PYTHONMONKEY_EXTERNAL_FILES` in the parent scope.
 function(pythonmonkey_add_external PYTHONMONKEY_EXTERNAL)

setup.sh

@@ -24,7 +24,12 @@ fi
 curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.69 # force to use Rust 1.69 because 1.70 has linking issues on Windows
 # Setup Poetry
 curl -sSL https://install.python-poetry.org | python3 - --version "1.5.1"
-poetry self add "poetry-dynamic-versioning[plugin]"
+if [[ "$OSTYPE" == "msys"* ]]; then # Windows
+  POETRY_BIN="$APPDATA/Python/Scripts/poetry"
+else
+  POETRY_BIN=`echo ~/.local/bin/poetry` # expand tilde
+fi
+$POETRY_BIN self add 'poetry-dynamic-versioning[plugin]'
 echo "Done installing dependencies"
 
 echo "Downloading spidermonkey source code"