WIP

Author: hoffstadt

.github/workflows/deploy.yml

@@ -6,11 +6,6 @@ on:
 
       inputs:
 
-        version:
-          description: 'pilotlight version'
-          required: true
-          default: '0.1.0'
-
         deploy:
           description: 'Deploy (true will deploy to pypi)'
           required: true
@@ -88,7 +83,7 @@ jobs:
       CXX: g++-10
     strategy:
       matrix:
-        python-version: ["3.14"]
+        python-version: ["3.12"]
 
     steps:
 
@@ -107,6 +102,14 @@ jobs:
         python -c "import sysconfig; print('platinclude=', sysconfig.get_paths().get('platinclude'))"
         python -c "import sysconfig; print('EXT_SUFFIX=', sysconfig.get_config_var('EXT_SUFFIX'))"
 
+    - name: Show Python build paths 2
+      run: |
+        cd /opt/hostedtoolcache/Python/3.12.12/x64
+        ls
+        cd include
+        cd python3.12
+        ls
+
     - name: Install Dependencies
       run: |
         wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
@@ -129,6 +132,7 @@ jobs:
         cd ..
         git clone https://github.com/PilotLightTech/pilotlight
         cd pilotlight-python
+        python -m pip install pl-build
 
     - name: Build Package
       run: |
@@ -163,10 +167,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up Python 3.9
+    - name: Set up Python 3.14
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: "3.14"
 
     - name: Install Dependencies
       run: |
@@ -179,9 +183,9 @@ jobs:
       shell: cmd
       if: ${{contains(github.event.inputs.deploy, 'true') && github.ref == 'refs/heads/master'}}
       run: |
-        python -m twine upload windowsbuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
-        python -m twine upload apple10sbuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
-        python -m twine upload linuxbuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
+        python -m twine upload windowsbuild*/* -u __token__ -p ${{ secrets.PYPI_API_TOKEN }} --skip-existing
+        rem python -m twine upload apple10sbuild*/* -u __token__ -p ${{ secrets.PYPI_API_TOKEN }} --skip-existing
+        python -m twine upload linuxbuild*/* -u __token__ -p ${{ secrets.PYPI_API_TOKEN }} --skip-existing
 
     - name: Test PyPi Deployment
       shell: cmd

pilotlight/pilotlight.so

@@ -257,7 +257,14 @@
                     pl.add_compiler_flags("-Zc:preprocessor", "-nologo", "-std:c11", "-W4", "-WX", "-wd4201",
                                             "-wd4100", "-wd4996", "-wd4505", "-wd4189", "-wd5105", "-wd4115",
                                             "-permissive-", "-Od", "-MDd", "-Zi")
-                    pl.set_post_target_build_step('@copy "%VULKAN_SDK%\\bin\\spirv-cross-c-shared.dll" "..\\pilotlight\\" >nul\n')
+                    pl.set_post_target_build_step(
+                        '@copy "%VULKAN_SDK%\\bin\\spirv-cross-c-shared.dll" "..\\pilotlight\\" >nul\n'
+                        '@copy "..\\dependencies\\cpython\\PCbuild\\amd64\\python314_d.dll" "..\\out\\" >nul\n'
+                        '@copy "..\\dependencies\\cpython\\PCbuild\\amd64\\python314.dll" "..\\out\\" >nul\n'
+                        '@copy "..\\dependencies\\cpython\\PCbuild\\amd64\\python3.dll" "..\\out\\" >nul\n'
+                        '@copy "..\\dependencies\\cpython\\PCbuild\\amd64\\python3_d.dll" "..\\out\\" >nul\n'
+                        )
+
 
             with pl.platform("Linux"):
                 with pl.compiler("gcc"):
@@ -297,6 +304,21 @@
                                             "-permissive-", "-Od", "-MD", "-Zi")
                     pl.set_post_target_build_step('@copy "%VULKAN_SDK%\\bin\\spirv-cross-c-shared.dll" "..\\pilotlight\\" >nul\n')
 
+            with pl.platform("Linux"):
+                with pl.compiler("gcc"):
+
+                    pl.add_include_directories("/opt/hostedtoolcache/Python/3.12.12/x64/include/python3.12")
+                    pl.add_link_directories("/opt/hostedtoolcache/Python/3.12.12/x64/libs")
+
+                    pl.add_definitions("PL_VULKAN_BACKEND")
+                    pl.add_include_directories('$VULKAN_SDK/include', '/usr/include/vulkan')
+                    pl.set_output_binary_extension(".so")
+                    pl.add_compiler_flags("-fPIC")
+                    pl.add_compiler_flags("--debug -g")
+                    pl.add_linker_flags("-ldl -lm")
+                    pl.add_dynamic_link_libraries("shaderc_shared", "spirv-cross-c-shared", "vulkan")
+                    pl.add_static_link_libraries("glfw", "pl_platform_ext")
+                    pl.add_link_directories('$VULKAN_SDK/lib')
 
 #-----------------------------------------------------------------------------
 # [SECTION] generate scripts

scripts/gen_build.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-wip_version = "0.1.0"
+wip_version = "0.1.1"
 
 def get_platform():
 
@@ -41,13 +41,16 @@ def setup_package():
         # long_description_content_type='text/markdown',         # Optional
         # url='https://github.com/PilotLightTech/pilotlight-python',          # Optional
         license = 'MIT',
-        python_requires='>=3.14',
+        python_requires='>=3.12',
         classifiers=[
                 'Development Status :: 3 - Alpha',
                 'Intended Audience :: Education',
                 'Intended Audience :: Developers',
                 'Intended Audience :: Science/Research',
                 'Operating System :: Microsoft :: Windows :: Windows 10',
+                'Operating System :: POSIX',
+                'Operating System :: Unix',
+                'Programming Language :: Python :: 3.12',
                 'Programming Language :: Python :: 3.14',
                 'Programming Language :: Python :: Implementation :: CPython',
                 'Programming Language :: Python :: 3 :: Only',
@@ -71,6 +74,17 @@ def setup_package():
             "pl_vfs_ext.py",
             "spirv-cross-c-shared.dll"
             ]
+    else:
+        metadata['package_data']['pilotlight'] = [
+            "__init__.py",
+            "pilotlight.so",
+            "pilotlight.pyi",
+            "pl_core.py",
+            "pl_draw_ext.py",
+            "pl_starter_ext.py",
+            "pl_ui_ext.py",
+            "pl_vfs_ext.py"
+            ]
 
     if "--force" in sys.argv:
         sys.argv.remove('--force')

setup.py

@@ -269,8 +269,8 @@ PL_RESULT=${BOLD}${GREEN}Successful.${NC}
 PL_DEFINES="-D_USE_MATH_DEFINES -DPy_PYTHON_H "
 PL_INCLUDE_DIRECTORIES="-I../src -I../../pilotlight/libs -I../../pilotlight/extensions -I../../pilotlight/dependencies/stb -I../../pilotlight/src "
 PL_LINK_DIRECTORIES="-L../out -Wl,-rpath,../out -L../../pilotlight/out -Wl,-rpath,../../pilotlight/out "
-PL_COMPILER_FLAGS=""
-PL_LINKER_FLAGS=""
+PL_COMPILER_FLAGS="-fPIC "
+PL_LINKER_FLAGS="-ldl -lm "
 PL_STATIC_LINK_LIBRARIES=""
 PL_DYNAMIC_LINK_LIBRARIES="-lpthread "
 # # run compiler only

src/build_linux.sh

@@ -221,6 +221,10 @@ cl %PL_INCLUDE_DIRECTORIES% %PL_DEFINES% %PL_COMPILER_FLAGS% %PL_SOURCES% -Fe"..
 @echo ~~~~~~~~~~~~~~~~~~~~~~
 
 @copy "%VULKAN_SDK%\bin\spirv-cross-c-shared.dll" "..\pilotlight\" >nul
+@copy "..\dependencies\cpython\PCbuild\amd64\python314_d.dll" "..\out\" >nul
+@copy "..\dependencies\cpython\PCbuild\amd64\python314.dll" "..\out\" >nul
+@copy "..\dependencies\cpython\PCbuild\amd64\python3.dll" "..\out\" >nul
+@copy "..\dependencies\cpython\PCbuild\amd64\python3_d.dll" "..\out\" >nul
 
 
 :Exit_pilotlight