mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-06-12 15:03:33 +00:00
Fix: CICD
This commit is contained in:
12
scripts/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml → scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml
Executable file → Normal file
12
scripts/flatpak/io.github.softfever.OrcaSlicer.metainfo.xml → scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml
Executable file → Normal file
@@ -1,18 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop">
|
||||
<id>io.github.softfever.OrcaSlicer</id>
|
||||
<launchable type="desktop-id">io.github.softfever.OrcaSlicer.desktop</launchable>
|
||||
<id>io.github.softfever.Snapmaker_Orca</id>
|
||||
<launchable type="desktop-id">io.github.Snapmaker.Snapmaker_Orca.desktop</launchable>
|
||||
<provides>
|
||||
<id>io.github.softfever.OrcaSlicer.desktop</id>
|
||||
<id>io.github.Snapmaker.Snapmaker_Orca.desktop</id>
|
||||
</provides>
|
||||
<name>OrcaSlicer</name>
|
||||
<name>Snapmaker_Orca</name>
|
||||
<!-- hehe hadess @ppd
|
||||
... seriously though, thanks -->
|
||||
<summary>Get even more perfect prints!</summary>
|
||||
<developer_name>SoftFever</developer_name>
|
||||
<url type="homepage">https://github.com/SoftFever/OrcaSlicer</url>
|
||||
<url type="homepage">https://github.com/Snapmaker/OrcaSlicer</url>
|
||||
<url type="help">https://github.com/SoftFever/OrcaSlicer/wiki</url>
|
||||
<url type="bugtracker">https://github.com/SoftFever/OrcaSlicer/issues/</url>
|
||||
<url type="bugtracker">https://github.com/Snapamker/OrcaSlicer/issues/</url>
|
||||
<url type="donation">https://ko-fi.com/SoftFever</url>
|
||||
<metadata_license>0BSD</metadata_license>
|
||||
<project_license>AGPL-3.0-only</project_license>
|
||||
30
scripts/flatpak/io.github.softfever.OrcaSlicer.yml → scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml
Executable file → Normal file
30
scripts/flatpak/io.github.softfever.OrcaSlicer.yml → scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml
Executable file → Normal file
@@ -1,10 +1,10 @@
|
||||
app-id: io.github.softfever.OrcaSlicer
|
||||
app-id: io.github.softfever.Snapmaker_Orca
|
||||
runtime: org.gnome.Platform
|
||||
runtime-version: "47"
|
||||
sdk: org.gnome.Sdk
|
||||
command: entrypoint
|
||||
separate-locales: true
|
||||
rename-icon: OrcaSlicer
|
||||
rename-icon: Snapmaker_Orca
|
||||
finish-args:
|
||||
- --share=ipc
|
||||
- --socket=x11
|
||||
@@ -15,8 +15,8 @@ finish-args:
|
||||
- --filesystem=/run/media
|
||||
- --filesystem=/media
|
||||
- --filesystem=/run/spnav.sock:ro
|
||||
# Allow OrcaSlicer to talk to other instances
|
||||
- --talk-name=io.github.softfever.OrcaSlicer.InstanceCheck.*
|
||||
# Allow Snapmaker_Orca to talk to other instances
|
||||
- --talk-name=io.github.softfever.Snapmaker_Orca.InstanceCheck.*
|
||||
- --system-talk-name=org.freedesktop.UDisks2
|
||||
- --env=SPNAV_SOCKET=/run/spnav.sock
|
||||
|
||||
@@ -140,13 +140,13 @@ modules:
|
||||
|
||||
sources:
|
||||
# -
|
||||
# Section bellow fetches all OrcaSlicer dependencies before the build process and stores them in external-packages/*/* .
|
||||
# Section bellow fetches all Snapmaker_Orca dependencies before the build process and stores them in external-packages/*/* .
|
||||
# -DDEP_DOWNLOAD_DIR is set in the build process which has to match with dest.
|
||||
#
|
||||
# NOTE: The url, dest folder name and sha256 must match from OrcaSlicer's cmake scripts and folder names in OrcaSlicer/deps/
|
||||
# NOTE: The url, dest folder name and sha256 must match from Snapmaker_Orca's cmake scripts and folder names in Snapmaker_Orca/deps/
|
||||
# -
|
||||
|
||||
# OrcaSlicer Source Archive
|
||||
# Snapmaker_Orca Source Archive
|
||||
- type: dir
|
||||
path: ../../
|
||||
|
||||
@@ -257,7 +257,7 @@ modules:
|
||||
dest: external-packages/libnoise
|
||||
sha256: 96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
|
||||
|
||||
- name: OrcaSlicer
|
||||
- name: Snapmaker_Orca
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
- |
|
||||
@@ -274,7 +274,7 @@ modules:
|
||||
-DBBL_RELEASE_TO_PUBLIC=1 \
|
||||
-DCMAKE_PREFIX_PATH=/app \
|
||||
-DCMAKE_INSTALL_PREFIX=/app
|
||||
CXXFLAGS=-std=gnu++20 cmake --build build_flatpak --target OrcaSlicer -j$FLATPAK_BUILDER_N_JOBS
|
||||
CXXFLAGS=-std=gnu++20 cmake --build build_flatpak --target Snapmaker_Orca -j$FLATPAK_BUILDER_N_JOBS
|
||||
./scripts/run_gettext.sh
|
||||
CXXFLAGS=-std=gnu++20 cmake --build build_flatpak --target install -j$FLATPAK_BUILDER_N_JOBS
|
||||
|
||||
@@ -284,28 +284,28 @@ modules:
|
||||
post-install:
|
||||
|
||||
- | # Desktop Integration files
|
||||
install -Dm644 -t /app/share/icons/hicolor/scalable/apps/ resources/images/OrcaSlicer.svg
|
||||
install -Dm644 -t /app/share/icons/hicolor/scalable/apps/ resources/images/Snapmaker_Orca.svg
|
||||
install -Dm644 ${FLATPAK_ID}.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
|
||||
mv /app/share/applications/OrcaSlicer.desktop /app/share/applications/${FLATPAK_ID}.desktop
|
||||
mv /app/share/applications/Snapmaker_Orca.desktop /app/share/applications/${FLATPAK_ID}.desktop
|
||||
desktop-file-edit --set-key=Exec --set-value="entrypoint %U" /app/share/applications/${FLATPAK_ID}.desktop
|
||||
install -Dm755 entrypoint /app/bin
|
||||
install -Dm755 umount /app/bin
|
||||
|
||||
sources:
|
||||
# -
|
||||
# Section bellow fetches all OrcaSlicer dependencies before the build process and stores them in external-packages/*/* .
|
||||
# Section bellow fetches all Snapmaker_Orca dependencies before the build process and stores them in external-packages/*/* .
|
||||
# -DDEP_DOWNLOAD_DIR is set in the build process which has to match with dest.
|
||||
#
|
||||
# NOTE: The url, dest folder name and sha256 must match from OrcaSlicer's cmake scripts and folder names in OrcaSlicer/deps/
|
||||
# NOTE: The url, dest folder name and sha256 must match from Snapmaker_Orca's cmake scripts and folder names in Snapmaker_Orca/deps/
|
||||
# -
|
||||
|
||||
# OrcaSlicer Source Archive
|
||||
# Snapmaker_Orca Source Archive
|
||||
- type: dir
|
||||
path: ../../
|
||||
|
||||
# AppData metainfo for Gnome Software & Co.
|
||||
- type: file
|
||||
path: io.github.softfever.OrcaSlicer.metainfo.xml
|
||||
path: io.github.softfever.Snapmaker_Orca.metainfo.xml
|
||||
|
||||
# start-up script
|
||||
- type: file
|
||||
@@ -9,7 +9,7 @@ flatpak install flathub org.gnome.Platform//46 org.gnome.Sdk//46
|
||||
##
|
||||
# in OrcaSlicer folder, run following command to build Orca
|
||||
# # First time build
|
||||
# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user --force-clean build-dir scripts/flatpak/io.github.softfever.OrcaSlicer.yml
|
||||
# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user --force-clean build-dir scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml
|
||||
|
||||
# # Subsequent builds (only rebuilding OrcaSlicer)
|
||||
# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user build-dir scripts/flatpak/io.github.softfever.OrcaSlicer.yml --build-only=OrcaSlicer
|
||||
# flatpak-builder --state-dir=.flatpak-builder --keep-build-dirs --user build-dir scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml --build-only=OrcaSlicer
|
||||
Reference in New Issue
Block a user