Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing cpython #211

Merged
merged 41 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
88899ba
Initial commit of clean up.
Chukobyte Dec 15, 2023
150d29e
Cleaning up ci.
Chukobyte Dec 15, 2023
ed0ff80
Clean.
Chukobyte Dec 15, 2023
d22a2d7
Starting on updated game exporter.
Chukobyte Dec 15, 2023
a721bc6
Test.
Chukobyte Dec 16, 2023
99c7c69
Added python script to generate embedded asset headers.
Chukobyte Dec 16, 2023
78c22d9
Updating path.
Chukobyte Dec 17, 2023
ddefb5c
Update.
Chukobyte Dec 17, 2023
c6cdd46
Update.
Chukobyte Dec 17, 2023
9b121ed
Clean up.
Chukobyte Dec 17, 2023
f41e6db
Update.
Chukobyte Dec 17, 2023
08f6af2
Clean.
Chukobyte Dec 17, 2023
5ed1061
Clean.
Chukobyte Dec 17, 2023
73705db
Fixing comment.
Chukobyte Dec 17, 2023
26b2696
Update.
Chukobyte Dec 17, 2023
1bbf9e7
Update.
Chukobyte Dec 17, 2023
bf881b8
Update.
Chukobyte Dec 17, 2023
3ffd6c3
Clean.
Chukobyte Dec 17, 2023
fefe300
Updates.
Chukobyte Dec 18, 2023
876d4e4
Clean.
Chukobyte Dec 18, 2023
851f538
Clean up.
Chukobyte Dec 18, 2023
07213a1
Updates.
Chukobyte Dec 18, 2023
5963152
Working on creating .pck file.
Chukobyte Dec 18, 2023
e65fcd6
Update.
Chukobyte Dec 18, 2023
f731488
Update.
Chukobyte Dec 18, 2023
1b7bb9d
Update~.
Chukobyte Dec 18, 2023
cbafa3e
Update.
Chukobyte Dec 19, 2023
4ecc839
Update.
Chukobyte Dec 19, 2023
1679118
Update.
Chukobyte Dec 19, 2023
f7ed526
Update.
Chukobyte Dec 19, 2023
b45b8be
Update.
Chukobyte Dec 19, 2023
20b8338
Updates.
Chukobyte Dec 19, 2023
4091600
Updates.
Chukobyte Dec 19, 2023
a7d0c83
Updates.
Chukobyte Dec 19, 2023
6920aa1
Update.
Chukobyte Dec 19, 2023
e7c8d2f
Updates.
Chukobyte Dec 19, 2023
1a163c4
Removing tat.gz compression in editor (for now).
Chukobyte Dec 19, 2023
d357a9d
Clean up.
Chukobyte Dec 20, 2023
ceaf0dd
Clean up.
Chukobyte Dec 20, 2023
bf957a3
Clean.
Chukobyte Dec 20, 2023
ca6f6f5
Clean up.
Chukobyte Dec 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions .github/workflows/package-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,8 @@ jobs:
copy builds\Release\bz2.dll windows_run_dependencies\
copy builds\Release\freetype.dll windows_run_dependencies\
copy builds\Release\libpng16.dll windows_run_dependencies\
copy builds\Release\python310.dll windows_run_dependencies\
copy builds\Release\SDL2.dll windows_run_dependencies\
copy builds\Release\zlib1.dll windows_run_dependencies\
Invoke-WebRequest -URI "https://www.python.org/ftp/python/${{ env.PYTHON_VERSION }}/python-${{ env.PYTHON_VERSION }}-embed-win32.zip" -OutFile python-${{ env.PYTHON_VERSION }}-embed-win32.zip
Expand-Archive -Path python-${{ env.PYTHON_VERSION }}-embed-win32.zip -DestinationPath python-310_5_embed
copy python-310_5_embed\python310.zip windows_run_dependencies\
Compress-Archive -Path windows_run_dependencies -DestinationPath ${{ github.workspace }}\windows_run_dependencies.zip

- name: store engine binary
Expand Down Expand Up @@ -229,18 +225,6 @@ jobs:
echo "Running crescent engine editor tests!"
builds/Release/crescent_engine_editor_test

- name: download macosx python embed
uses: dawidd6/action-download-artifact@v2
with:
name: python-${{ env.PYTHON_VERSION }}-embed-macosx.zip
workflow: python-embedded-package.yml
search_artifacts: true
if_no_artifact_found: fail

- name: prepare macosx python package
run: |
unzip python-${{ env.PYTHON_VERSION }}-embed-macosx.zip -d embed_python_macosx

- name: decode private key and cert
run: |
echo "${{ secrets.MAC_CERT_KEY }}" >> cert.txt
Expand Down Expand Up @@ -272,13 +256,6 @@ jobs:
run: |
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v crescent_engine_macosx
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v crescent_engine_editor_macosx
# Will probably need to sign other embedded python files, but only doing these for now...
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v embed_python_macosx/lib/python3.10/lib-dynload/_struct.cpython-310-darwin.so
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v embed_python_macosx/lib/python3.10/lib-dynload/_json.cpython-310-darwin.so
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v embed_python_macosx/lib/python3.10/lib-dynload/_pickle.cpython-310-darwin.so
codesign -s "${{ secrets.MAC_SIGNING_ID }}" -v embed_python_macosx/lib/python3.10/lib-dynload/math.cpython-310-darwin.so
cd embed_python_macosx
zip -r ${{ github.workspace }}/embed_python_macosx.zip *

- name: store engine binary
uses: actions/upload-artifact@v3
Expand All @@ -294,13 +271,6 @@ jobs:
path: crescent_engine_editor_macosx
if-no-files-found: error

- name: store signed embedded python package
uses: actions/upload-artifact@v3
with:
name: embed_python_macosx.zip
path: embed_python_macosx.zip
if-no-files-found: error

package-all:
runs-on: ubuntu-latest
needs: [windows-build, linux-build, macosx-build]
Expand Down Expand Up @@ -367,14 +337,6 @@ jobs:
with:
name: crescent_engine_editor_linux

- name: download linux python embed
uses: dawidd6/action-download-artifact@v2
with:
name: python-${{ env.PYTHON_VERSION }}-embed-linux.zip
workflow: python-embedded-package.yml
search_artifacts: true
if_no_artifact_found: fail

- name: download macosx signed engine binary
uses: actions/download-artifact@v3
with:
Expand All @@ -385,18 +347,6 @@ jobs:
with:
name: crescent_engine_editor_macosx

- name: download macosx signed python package
uses: actions/download-artifact@v3
with:
name: embed_python_macosx.zip

- name: setup python dependencies
run: |
# Linux
unzip python-${{ env.PYTHON_VERSION }}-embed-linux.zip -d embed_python_linux
# MacOSX
unzip embed_python_macosx.zip -d embed_python_macosx

- name: build windows package
run: |
# Copy engine binaries
Expand All @@ -415,8 +365,6 @@ jobs:
unzip windows_run_dependencies.zip
cp windows_run_dependencies/* crescent_windows/
cp windows_run_dependencies/* crescent_windows/bin/windows/
cp -r embed_python_linux crescent_windows/bin/linux/embed_python
cp -r embed_python_macosx crescent_windows/bin/macosx/embed_python
chmod -R 755 crescent_windows
zip -r crescent_windows.zip crescent_windows/

Expand All @@ -436,8 +384,6 @@ jobs:
mv crescent_engine_editor_linux crescent_linux/crescent
# Copy runtime deps
cp windows_run_dependencies/* crescent_linux/bin/windows/
cp -r embed_python_linux crescent_linux/bin/linux/embed_python
cp -r embed_python_macosx crescent_linux/bin/macosx/embed_python
chmod -R 755 crescent_linux
zip -r crescent_linux.zip crescent_linux/
tar -czvf crescent_linux.tar.gz crescent_linux/
Expand Down Expand Up @@ -466,8 +412,6 @@ jobs:
mv crescent_engine_editor_macosx crescent.app/Contents/MacOS/crescent
# Copy runtime deps
cp windows_run_dependencies/* crescent.app/Contents/MacOS/bin/windows/
cp -r embed_python_linux crescent.app/Contents/MacOS/bin/linux/embed_python
cp -r embed_python_macosx crescent.app/Contents/MacOS/bin/macosx/embed_python
chmod -R 755 crescent.app
zip -r crescent_macosx.zip crescent.app/
tar -czvf crescent_macosx.tar.gz crescent.app/
Expand Down
120 changes: 0 additions & 120 deletions .github/workflows/python-embedded-package.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ target_link_libraries(${PROJECT_NAME}_editor crescent_editor crescent_core)

# Create test editor exe
find_package(SDL2 CONFIG REQUIRED)
add_executable(${PROJECT_NAME}_editor_test editor/test/main.cpp editor/test/unit/curve_float_test.cpp)
add_executable(${PROJECT_NAME}_editor_test editor/test/main.cpp editor/test/unit/curve_float_test.cpp editor/test/unit/game_exporter_test.cpp)
target_link_libraries(${PROJECT_NAME}_editor_test crescent_editor crescent_core SDL2::SDL2main SDL2::SDL2)
2 changes: 1 addition & 1 deletion Functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function(install_seika)
FetchContent_Declare(
seika
GIT_REPOSITORY https://github.com/Chukobyte/seika.git
GIT_TAG v0.0.9
GIT_TAG v0.0.13
)
FetchContent_MakeAvailable(seika)
endif ()
Expand Down
5 changes: 0 additions & 5 deletions crescent_py_api/CHANGELOG.md

This file was deleted.

Loading
Loading