Skip to content

Commit

Permalink
renaming for superslicer
Browse files Browse the repository at this point in the history
  • Loading branch information
remi durand committed Apr 12, 2021
1 parent 0279c6d commit 39c95d7
Show file tree
Hide file tree
Showing 6 changed files with 140 additions and 115 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* @lordofhyphens @supermerill
* @supermerill @lordofhyphens

.github/CODEOWNERS @lordofhyphens
.github/CODEOWNERS @supermerill
53 changes: 28 additions & 25 deletions .github/workflows/ccpp_mac.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:
- uses: actions/checkout@v2
with:
ref: 'CI'
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update
- name: change date in version
run: |
sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc
Expand Down Expand Up @@ -43,42 +46,42 @@ jobs:
- name: cmake
working-directory: ./build
run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1
- name: make Slic3r
- name: make SuperSlicer
working-directory: ./build
run: make Slic3r
run: make SuperSlicer
- name: update Info.plist
working-directory: ./build/src
run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist
- name: create directory and copy into it
working-directory: ./build
run: |
mkdir pack
mkdir pack/Slic3r
mkdir pack/Slic3r/Slic3r.app
mkdir pack/Slic3r/Slic3r.app/Contents
mkdir pack/Slic3r/Slic3r.app/Contents/_CodeSignature
mkdir pack/Slic3r/Slic3r.app/Contents/Frameworks
mkdir pack/Slic3r/Slic3r.app/Contents/MacOS
mkdir pack/SuperSlicer
mkdir pack/SuperSlicer/SuperSlicer.app
mkdir pack/SuperSlicer/SuperSlicer.app/Contents
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/_CodeSignature
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/Frameworks
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/MacOS
- name: copy Resources
working-directory: ./build
run: |
cp -Rf ../resources pack/Slic3r/Slic3r.app/Contents/Resources
cp pack/Slic3r/Slic3r.app/Contents/Resources/icons/slic3r.icns pack/Slic3r/Slic3r.app/Contents/resources/Slic3r.icns
cp src/Info.date.plist pack/Slic3r/Slic3r.app/Contents/Info.plist
cp -Rf ../resources pack/SuperSlicer/SuperSlicer.app/Contents/Resources
cp pack/SuperSlicer/SuperSlicer.app/Contents/Resources/icons/slic3r.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/Slic3r.icns
cp src/Info.date.plist pack/SuperSlicer/SuperSlicer.app/Contents/Info.plist
echo -n -e 'APPL????\x0a' > PkgInfo
cp PkgInfo pack/Slic3r/Slic3r.app/Contents/PkgInfo
cp PkgInfo pack/SuperSlicer/SuperSlicer.app/Contents/PkgInfo
# echo -n -e '\xff\xfeAPPL\x3f\x00\x3f\x00\x3f\x00\x3f\x00\x0a\x00' > PkgInfo
- name: copy bin and do not let it lower case
working-directory: ./build
run: |
cp -f src/Slic3r pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r
chmod u+x pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r
tar -cvf Slic3r.tar pack/Slic3r
cp -f src/SuperSlicer pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer
chmod u+x pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer
tar -cvf SuperSlicer.tar pack/SuperSlicer
- name: create dmg
working-directory: ./build
run: |
hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "pack/Slic3r" temp.dmg
hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg
hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "pack/SuperSlicer" temp.dmg
hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg
# - name: signing Resources (creating CodeResources inside _CodeSignature)
# working-directory: .
# run: codesign -s <identity> Resources
Expand All @@ -87,12 +90,12 @@ jobs:
uses: actions/[email protected]
with:
name: nightly_macos.tar
path: build/Slic3r.tar
path: build/SuperSlicer.tar
- name: Upload artifact
uses: actions/[email protected]
with:
name: nightly_macos.dmg
path: build/Slic3r.dmg
path: build/SuperSlicer.dmg
# build again, but the debug one this time
# - name: cmake
# working-directory: ./build
Expand All @@ -103,15 +106,15 @@ jobs:
# - name: copy bin and do not let it lower case
# working-directory: ./build
# run: |
# cp -f src/Slic3r Slic3r/Slic3r.app/Contents/MacOS/Slic3r
# chmod u+x Slic3r/Slic3r.app/Contents/MacOS/Slic3r
# tar -cvf Slic3r.tar Slic3r
# cp -f src/superslicer SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer
# chmod u+x SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer
# tar -cvf SuperSlicer.tar SuperSlicer
# - name: create dmg
# working-directory: ./build
# run: |
# rm Slic3r.dmg
# hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "Slic3r" temp.dmg
# hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg
# rm SuperSlicer.dmg
# hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "SuperSlicer" temp.dmg
# hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg
# - name: Upload artifact
# uses: actions/[email protected]
# with:
Expand Down
27 changes: 15 additions & 12 deletions .github/workflows/ccpp_ubuntu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:
- uses: actions/checkout@v2
with:
ref: 'CI'
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update
- name: change date in version
run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
- name: update clock
Expand Down Expand Up @@ -43,10 +46,10 @@ jobs:
run: mkdir build
- name: cmake
working-directory: ./build
run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1
- name: make Slic3r
run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/SuperSlicer/SuperSlicer/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1
- name: make SuperSlicer
working-directory: ./build
run: make Slic3r
run: make SuperSlicer
- name: create directory and copy into it
working-directory: ./build
run: |
Expand All @@ -57,27 +60,27 @@ jobs:
run: cp -Rf ../resources package/resources
- name: copy bin
working-directory: ./build
run: cp -f src/Slic3r package/bin/Slic3r
run: cp -f src/superslicer package/bin/superslicer
- name: create sh from echo
working-directory: ./build/package
run: |
echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/Slic3r" "$@"' >Slic3r
chmod u+x Slic3r
tar -cvf ../Slic3r.tar .
echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/superslicer" "$@"' >superslicer
chmod u+x superslicer
tar -cvf ../SuperSlicer.tar .
- name: Upload artifact
uses: actions/[email protected]
with:
name: nightly_linux.tar
path: build/Slic3r.tar
path: build/SuperSlicer.tar
- name: build appimage
working-directory: ./build/package
run: |
chmod +x ../build_appimage.sh
../build_appimage.sh Slic3r_ubu64.AppImage
chmod +x ../../src/platform/unix/build_appimage.sh
../../src/platform/unix/build_appimage.sh SuperSlicer_ubu64.AppImage
- name: Upload appimage
uses: actions/[email protected]
with:
name: Slic3r-AppImage.tar
path: build/package/Slic3r_ubu64.AppImage
name: SuperSlicer-AppImage.tar
path: build/package/SuperSlicer_ubu64.AppImage


11 changes: 7 additions & 4 deletions .github/workflows/ccpp_win.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
- name: update submodule profiles
working-directory: ./resources/profiles
run: git submodule update
- name: change date in version
shell: powershell
run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc
Expand All @@ -52,7 +55,7 @@ jobs:
run: mkdir build
- name: cmake
working-directory: ./build
run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\Slic3r\Slic3r\deps\destdir\usr\local"
run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\SuperSlicer\SuperSlicer\deps\destdir\usr\local"
- name: make
working-directory: ./build
run: msbuild /m /P:Configuration=Release INSTALL.vcxproj
Expand All @@ -67,15 +70,15 @@ jobs:
- name: copy from release
working-directory: ./build
shell: powershell
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/Slic3r/releases/download/2.2.53.3/Slic3r_2.2.53.3_win64_20201005.zip", "Slic3r_2.2.53.3_win64_20201005.zip")'
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer/releases/download/2.2.53.3/SuperSlicer_2.2.53.3_win64_20201005.zip", "SuperSlicer_2.2.53.3_win64_20201005.zip")'
- name: unzip
working-directory: ./build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x Slic3r_2.2.53.3_win64_20201005.zip'
run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip'
- name: copy old release content
working-directory: ./build
shell: cmd
run: xcopy /RCYIE Slic3r_2.2.53.3_win64_20201005\* package\
run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\
- name: copy new resources
working-directory: ./build
shell: cmd
Expand Down
Loading

1 comment on commit 39c95d7

@nerdCopter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github actions: @supermerill

Run make SuperSlicer
  make SuperSlicer
  shell: /bin/bash -e {0}
make: *** No rule to make target 'SuperSlicer'.  Stop.
Error: Process completed with exit code 2.

Please sign in to comment.