TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to 1.10.14 thirdparties, enable Python 3.12 CI on Windows

Browse Source
This commit is contained in:
rdb 2023-10-14 21:25:42 +02:00
parent 1db6dbc166
commit 5e4fc7999e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/ci.yml vendored
View File

@ -20,30 +20,27 @@ jobs:
shell: powershell shell: powershell
run: | run: |
$wc = New-Object System.Net.WebClient $wc = New-Object System.Net.WebClient
$wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-win64.zip", "thirdparty-tools.zip") $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-win64.zip", "thirdparty-tools.zip")
Expand-Archive -Path thirdparty-tools.zip Expand-Archive -Path thirdparty-tools.zip
Move-Item -Path thirdparty-tools/panda3d-1.10.13/thirdparty -Destination . Move-Item -Path thirdparty-tools/panda3d-1.10.14/thirdparty -Destination .
- name: Get thirdparty packages (macOS) - name: Get thirdparty packages (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
tar -xf panda3d-1.10.13-tools-mac.tar.gz tar -xf panda3d-1.10.14-tools-mac.tar.gz
mv panda3d-1.10.13/thirdparty thirdparty mv panda3d-1.10.14/thirdparty thirdparty
rmdir panda3d-1.10.13 rmdir panda3d-1.10.14
(cd thirdparty/darwin-libs-a && rm -rf rocket) (cd thirdparty/darwin-libs-a && rm -rf rocket)
- name: Set up Python 3.12 - name: Set up Python 3.12
if: matrix.os != 'windows-2019'
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: '3.12' python-version: '3.12'
- name: Build Python 3.12 - name: Build Python 3.12
if: matrix.os != 'windows-2019'
shell: bash shell: bash
run: | run: |
python makepanda/makepanda.py --git-commit=${{github.sha}} --outputdir=built --everything --no-eigen --python-incdir="$pythonLocation/include" --python-libdir="$pythonLocation/lib" --verbose --threads=4 --windows-sdk=10 python makepanda/makepanda.py --git-commit=${{github.sha}} --outputdir=built --everything --no-eigen --python-incdir="$pythonLocation/include" --python-libdir="$pythonLocation/lib" --verbose --threads=4 --windows-sdk=10
- name: Test Python 3.12 - name: Test Python 3.12
if: matrix.os != 'windows-2019'
shell: bash shell: bash
run: | run: |
python -m pip install pytest setuptools python -m pip install pytest setuptools

6
README.md
View File

@ -64,8 +64,8 @@ depending on whether you are on a 32-bit or 64-bit system, or you can
[click here](https://github.com/rdb/panda3d-thirdparty) for instructions on [click here](https://github.com/rdb/panda3d-thirdparty) for instructions on
building them from source. building them from source.
- https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-win64.zip - https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-win64.zip
- https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-win32.zip - https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-win32.zip
After acquiring these dependencies, you can build Panda3D from the command After acquiring these dependencies, you can build Panda3D from the command
prompt using the following command. Change the `--msvc-version` option based prompt using the following command. Change the `--msvc-version` option based
@ -136,7 +136,7 @@ macOS
----- -----
On macOS, you will need to download a set of precompiled thirdparty packages in order to On macOS, you will need to download a set of precompiled thirdparty packages in order to
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz). compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz).
After placing the thirdparty directory inside the panda3d source directory, After placing the thirdparty directory inside the panda3d source directory,
you may build Panda3D using a command like the following: you may build Panda3D using a command like the following: