GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 05:55:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use defines for linux script

Browse Source
This commit is contained in:
remi durand 2021-04-04 15:56:02 +02:00
parent 65cd6e3010
commit 5eab98f376
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ccpp_ubuntu.yml vendored
View File

@ -72,8 +72,8 @@ jobs:
- name: build appimage
working-directory: ./build/package
run: |
chmod +x ../../src/platform/unix/build_appimage.sh
../../src/platform/unix/build_appimage.sh Slic3r_ubu64.AppImage
chmod +x ../build_appimage.sh
../build_appimage.sh Slic3r_ubu64.AppImage
- name: Upload appimage
uses: actions/upload-artifact@v1.0.0
with:

3
src/CMakeLists.txt
View File

@ -95,6 +95,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/Slic3r.rc.in ${CMAKE_CUR
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/gcodeviewer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/gcodeviewer.rc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/Slic3r.manifest @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/Gcodeviewer.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/Gcodeviewer.desktop @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/Slic3r.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/Slic3r.desktop @ONLY)
if (WIN32)
add_library(Slic3r SHARED PrusaSlicer.cpp PrusaSlicer.hpp)
else ()

6
src/platform/unix/Gcodeviewer.desktop → src/platform/unix/Gcodeviewer.desktop.in
View File

@ -1,8 +1,8 @@
[Desktop Entry]
Name=Super GCode viewer
Name=@GCODEVIEWER_APP_NAME@
Comment=G-code viewer of Slic3r
Exec=superslicer --gcodeviewer %F
Icon=Slic3r-gcodeviewer
Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
Icon=@SLIC3R_APP_KEY@-gcodeviewer
Terminal=false
Type=Application
MimeType=text/x.gcode;

8
src/platform/unix/Slic3r.desktop → src/platform/unix/Slic3r.desktop.in
View File

@ -1,13 +1,13 @@
[Desktop Entry]
Name=Slic3r
Name=@SLIC3R_APP_KEY@
GenericName=3D Printing Software
Comment=G-code generator for 3D printers
Icon=Slic3r
Exec=Slic3r %F
Icon=@SLIC3R_APP_KEY@
Exec=@SLIC3R_APP_CMD@ %F
Terminal=false
Type=Application
MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
Categories=Graphics;3DGraphics;Engineering;
Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
StartupNotify=false
StartupWMClass=Slic3r
StartupWMClass=@SLIC3R_APP_KEY@

10
src/platform/unix/build_appimage.sh → src/platform/unix/build_appimage.sh.in
View File

@ -7,16 +7,16 @@ APP_IMAGE=$1
wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage
chmod +x ../appimagetool.AppImage
sed -i -e 's#/usr#././#g' bin/Slic3r
mv Slic3r AppRun
sed -i -e 's#/usr#././#g' bin/@SLIC3R_APP_CMD@
mv @SLIC3R_APP_CMD@ AppRun
chmod +x AppRun
cp resources/icons/Slic3r_192px.png Slic3r.png
cp resources/icons/@SLIC3R_APP_KEY@_192px.png @SLIC3R_APP_KEY@.png
cat <<EOF > Slic3r.desktop
[Desktop Entry]
Name=Slic3r
Name=@SLIC3R_APP_NAME@
Exec=AppRun %F
Icon=Slic3r
Icon=@SLIC3R_APP_KEY@
Type=Application
Categories=Utility;
MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;

2
version.inc
View File

@ -6,7 +6,7 @@ set(SLIC3R_APP_NAME "Slic3r")
# Key fo the slicer, must only contains ascii chars and no spaces
set(SLIC3R_APP_KEY "Slic3r")
# exe name of the slicer, should be lowercase and valid in all os
set(SLIC3R_APP_CMD "slic3r")
set(SLIC3R_APP_CMD "Slic3r")
# versions
set(SLIC3R_VERSION "2.0")
set(SLIC3R_VERSION_FULL "2.0.00.0")