GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-09-23 21:03:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get build scripts working and generating images

Browse Source
This commit is contained in:
Eisen Montalvo 2021-06-04 19:02:26 -07:00 committed by remi durand
parent 304cfb8f72
commit bae1b4e7a7
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BuildLinux.sh
View File

@ -108,12 +108,15 @@ echo -n "[8/9] Building Slic3r..."
} &> $ROOT/build/Build.log # Capture all command output } &> $ROOT/build/Build.log # Capture all command output
echo "done" echo "done"
# Give proper permissions to script
chmod 755 $ROOT/build/src/BuildLinuxImage.sh
echo -n "[9/9] Generating Linux app..." echo -n "[9/9] Generating Linux app..."
{ {
if [[ -n "$BUILD_IMAGE" ]] if [[ -n "$BUILD_IMAGE" ]]
then then
$ROOT/build/BuildLinuxImage.sh -i $ROOT/build/src/BuildLinuxImage.sh -i
else else
$ROOT/build/BuildLinuxImage.sh $ROOT/build/src/BuildLinuxImage.sh
fi fi
} &> $ROOT/build/Build.log # Capture all command output } &> $ROOT/build/Build.log # Capture all command output

7
BuildMacOS.sh
View File

@ -94,9 +94,12 @@ echo -n "[8/9] Building Slic3r..."
} &> $ROOT/build/Build.log # Capture all command output } &> $ROOT/build/Build.log # Capture all command output
echo "done" echo "done"
# Give proper permissions to script
chmod 755 $ROOT/build/src/BuildMacOSImage.sh
if [[ -n "$BUILD_IMAGE" ]] if [[ -n "$BUILD_IMAGE" ]]
then then
$ROOT/build/BuildMacOSImage.sh -i $ROOT/build/src/BuildMacOSImage.sh -i
else else
$ROOT/build/BuildMacOSImage.sh $ROOT/build/src/BuildMacOSImage.sh
fi fi

4
src/platform/osx/BuildMacOSImage.sh.in
View File

@ -45,7 +45,7 @@ echo -n "[9/9] Generating MacOS app..."
# copy bin and do not let it lower case # copy bin and do not let it lower case
cp -f src/@SLIC3R_APP_CMD@ pack/@SLIC3R_APP_KEY@/@SLIC3R_APP_KEY@.app/Contents/MacOS/@SLIC3R_APP_KEY@ cp -f src/@SLIC3R_APP_CMD@ pack/@SLIC3R_APP_KEY@/@SLIC3R_APP_KEY@.app/Contents/MacOS/@SLIC3R_APP_KEY@
chmod u+x pack/@SLIC3R_APP_KEY@/@SLIC3R_APP_KEY@.app/Contents/MacOS/@SLIC3R_APP_KEY@ chmod u+x pack/@SLIC3R_APP_KEY@/@SLIC3R_APP_KEY@.app/Contents/MacOS/@SLIC3R_APP_KEY@
} &> $ROOT/build/MacOS_Build.log # Capture all command output } &> $ROOT/Build.log # Capture all command output
echo "done" echo "done"
if [[ -n "$BUILD_IMAGE" ]] if [[ -n "$BUILD_IMAGE" ]]
@ -58,6 +58,6 @@ echo -n "Creating DMG Image for distribution..."
hdiutil create -ov -fs HFS+ -volname "@SLIC3R_APP_KEY@" -srcfolder "pack/@SLIC3R_APP_KEY@" temp.dmg hdiutil create -ov -fs HFS+ -volname "@SLIC3R_APP_KEY@" -srcfolder "pack/@SLIC3R_APP_KEY@" temp.dmg
hdiutil convert temp.dmg -format UDZO -o @SLIC3R_APP_KEY@.dmg hdiutil convert temp.dmg -format UDZO -o @SLIC3R_APP_KEY@.dmg
popd popd
} &> $ROOT/build/MacOS_Build.log # Capture all command output } &> $ROOT/Build.log # Capture all command output
echo "done" echo "done"
fi fi

10
src/platform/unix/BuildLinuxImage.sh.in
View File

@ -9,13 +9,13 @@ while getopts ":ih" opt; do
export BUILD_IMAGE="1" export BUILD_IMAGE="1"
;; ;;
h ) echo "Usage: ./BuildLinuxImage.sh [-i]" h ) echo "Usage: ./BuildLinuxImage.sh [-i]"
echo " -i: Generate DMG image (optional)" echo " -i: Generate Appimage (optional)"
exit 0 exit 0
;; ;;
esac esac
done done
echo -n "[9/9] Generating MacOS app..." echo -n "[9/9] Generating Linux app..."
{ {
# create directory and copy into it # create directory and copy into it
@ -25,7 +25,7 @@ echo -n "[9/9] Generating MacOS app..."
fi fi
mkdir package mkdir package
mkdir package/bin mkdir package/bin
# copy Resources # copy Resources
cp -Rf ../resources package/resources cp -Rf ../resources package/resources
cp -f src/@SLIC3R_APP_CMD@ package/bin/@SLIC3R_APP_CMD@ cp -f src/@SLIC3R_APP_CMD@ package/bin/@SLIC3R_APP_CMD@
@ -34,7 +34,7 @@ echo -n "[9/9] Generating MacOS app..."
echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/@SLIC3R_APP_CMD@" "$@"' >@SLIC3R_APP_CMD@ echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/@SLIC3R_APP_CMD@" "$@"' >@SLIC3R_APP_CMD@
chmod u+x @SLIC3R_APP_CMD@ chmod u+x @SLIC3R_APP_CMD@
tar -cvf ../@SLIC3R_APP_KEY@.tar . tar -cvf ../@SLIC3R_APP_KEY@.tar .
} &> $ROOT/build/MacOS_Build.log # Capture all command output } &> $ROOT/Build.log # Capture all command output
echo "done" echo "done"
if [[ -n "$BUILD_IMAGE" ]] if [[ -n "$BUILD_IMAGE" ]]
@ -43,6 +43,6 @@ echo -n "Creating Appimage for distribution..."
{ {
chmod +x ../build_appimage.sh chmod +x ../build_appimage.sh
../build_appimage.sh ../build_appimage.sh
} &> $ROOT/build/MacOS_Build.log # Capture all command output } &> $ROOT/Build.log # Capture all command output
echo "done" echo "done"
fi fi