More renaming

This commit is contained in:
Joseph Lenox 2021-04-03 08:01:42 -05:00
parent f7ef660d02
commit 2a0b8867a7
3 changed files with 40 additions and 40 deletions

View File

@ -43,9 +43,9 @@ jobs:
- name: cmake - name: cmake
working-directory: ./build working-directory: ./build
run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1 run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1
- name: make SuperSlicer - name: make Slic3r
working-directory: ./build working-directory: ./build
run: make SuperSlicer run: make Slic3r
- name: update Info.plist - name: update Info.plist
working-directory: ./build/src working-directory: ./build/src
run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist
@ -53,32 +53,32 @@ jobs:
working-directory: ./build working-directory: ./build
run: | run: |
mkdir pack mkdir pack
mkdir pack/SuperSlicer mkdir pack/Slic3r
mkdir pack/SuperSlicer/SuperSlicer.app mkdir pack/Slic3r/Slic3r.app
mkdir pack/SuperSlicer/SuperSlicer.app/Contents mkdir pack/Slic3r/Slic3r.app/Contents
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/_CodeSignature mkdir pack/Slic3r/Slic3r.app/Contents/_CodeSignature
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/Frameworks mkdir pack/Slic3r/Slic3r.app/Contents/Frameworks
mkdir pack/SuperSlicer/SuperSlicer.app/Contents/MacOS mkdir pack/Slic3r/Slic3r.app/Contents/MacOS
- name: copy Resources - name: copy Resources
working-directory: ./build working-directory: ./build
run: | run: |
cp -Rf ../resources pack/SuperSlicer/SuperSlicer.app/Contents/Resources cp -Rf ../resources pack/Slic3r/Slic3r.app/Contents/Resources
cp pack/SuperSlicer/SuperSlicer.app/Contents/Resources/icons/slic3r.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/Slic3r.icns cp pack/Slic3r/Slic3r.app/Contents/Resources/icons/slic3r.icns pack/Slic3r/Slic3r.app/Contents/resources/Slic3r.icns
cp src/Info.date.plist pack/SuperSlicer/SuperSlicer.app/Contents/Info.plist cp src/Info.date.plist pack/Slic3r/Slic3r.app/Contents/Info.plist
echo -n -e 'APPL????\x0a' > PkgInfo echo -n -e 'APPL????\x0a' > PkgInfo
cp PkgInfo pack/SuperSlicer/SuperSlicer.app/Contents/PkgInfo cp PkgInfo pack/Slic3r/Slic3r.app/Contents/PkgInfo
# echo -n -e '\xff\xfeAPPL\x3f\x00\x3f\x00\x3f\x00\x3f\x00\x0a\x00' > 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 - name: copy bin and do not let it lower case
working-directory: ./build working-directory: ./build
run: | run: |
cp -f src/SuperSlicer pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer cp -f src/Slic3r pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r
chmod u+x pack/SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer chmod u+x pack/Slic3r/Slic3r.app/Contents/MacOS/Slic3r
tar -cvf SuperSlicer.tar pack/SuperSlicer tar -cvf Slic3r.tar pack/Slic3r
- name: create dmg - name: create dmg
working-directory: ./build working-directory: ./build
run: | run: |
hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "pack/SuperSlicer" temp.dmg hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "pack/Slic3r" temp.dmg
hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg
# - name: signing Resources (creating CodeResources inside _CodeSignature) # - name: signing Resources (creating CodeResources inside _CodeSignature)
# working-directory: . # working-directory: .
# run: codesign -s <identity> Resources # run: codesign -s <identity> Resources
@ -87,12 +87,12 @@ jobs:
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_macos.tar name: nightly_macos.tar
path: build/SuperSlicer.tar path: build/Slic3r.tar
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_macos.dmg name: nightly_macos.dmg
path: build/SuperSlicer.dmg path: build/Slic3r.dmg
# build again, but the debug one this time # build again, but the debug one this time
# - name: cmake # - name: cmake
# working-directory: ./build # working-directory: ./build
@ -103,15 +103,15 @@ jobs:
# - name: copy bin and do not let it lower case # - name: copy bin and do not let it lower case
# working-directory: ./build # working-directory: ./build
# run: | # run: |
# cp -f src/superslicer SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer # cp -f src/Slic3r Slic3r/Slic3r.app/Contents/MacOS/Slic3r
# chmod u+x SuperSlicer/SuperSlicer.app/Contents/MacOS/SuperSlicer # chmod u+x Slic3r/Slic3r.app/Contents/MacOS/Slic3r
# tar -cvf SuperSlicer.tar SuperSlicer # tar -cvf Slic3r.tar Slic3r
# - name: create dmg # - name: create dmg
# working-directory: ./build # working-directory: ./build
# run: | # run: |
# rm SuperSlicer.dmg # rm Slic3r.dmg
# hdiutil create -ov -fs HFS+ -volname "SuperSlicer" -srcfolder "SuperSlicer" temp.dmg # hdiutil create -ov -fs HFS+ -volname "Slic3r" -srcfolder "Slic3r" temp.dmg
# hdiutil convert temp.dmg -format UDZO -o SuperSlicer.dmg # hdiutil convert temp.dmg -format UDZO -o Slic3r.dmg
# - name: Upload artifact # - name: Upload artifact
# uses: actions/upload-artifact@v1.0.0 # uses: actions/upload-artifact@v1.0.0
# with: # with:

View File

@ -43,10 +43,10 @@ jobs:
run: mkdir build run: mkdir build
- name: cmake - name: cmake
working-directory: ./build working-directory: ./build
run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/SuperSlicer/SuperSlicer/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1
- name: make SuperSlicer - name: make Slic3r
working-directory: ./build working-directory: ./build
run: make SuperSlicer run: make Slic3r
- name: create directory and copy into it - name: create directory and copy into it
working-directory: ./build working-directory: ./build
run: | run: |
@ -57,27 +57,27 @@ jobs:
run: cp -Rf ../resources package/resources run: cp -Rf ../resources package/resources
- name: copy bin - name: copy bin
working-directory: ./build working-directory: ./build
run: cp -f src/superslicer package/bin/superslicer run: cp -f src/Slic3r package/bin/Slic3r
- name: create sh from echo - name: create sh from echo
working-directory: ./build/package working-directory: ./build/package
run: | run: |
echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/superslicer" "$@"' >superslicer echo -e '#!/bin/bash\nDIR=$(readlink -f "$0" | xargs dirname)\nexport LD_LIBRARY_PATH="$DIR/bin"\nexec "$DIR/bin/Slic3r" "$@"' >Slic3r
chmod u+x superslicer chmod u+x Slic3r
tar -cvf ../SuperSlicer.tar . tar -cvf ../Slic3r.tar .
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_linux.tar name: nightly_linux.tar
path: build/SuperSlicer.tar path: build/Slic3r.tar
- name: build appimage - name: build appimage
working-directory: ./build/package working-directory: ./build/package
run: | run: |
chmod +x ../../src/platform/unix/build_appimage.sh chmod +x ../../src/platform/unix/build_appimage.sh
../../src/platform/unix/build_appimage.sh SuperSlicer_ubu64.AppImage ../../src/platform/unix/build_appimage.sh Slic3r_ubu64.AppImage
- name: Upload appimage - name: Upload appimage
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: SuperSlicer-AppImage.tar name: Slic3r-AppImage.tar
path: build/package/SuperSlicer_ubu64.AppImage path: build/package/Slic3r_ubu64.AppImage

View File

@ -52,7 +52,7 @@ jobs:
run: mkdir build run: mkdir build
- name: cmake - name: cmake
working-directory: ./build working-directory: ./build
run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\SuperSlicer\SuperSlicer\deps\destdir\usr\local" run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\Slic3r\Slic3r\deps\destdir\usr\local"
- name: make - name: make
working-directory: ./build working-directory: ./build
run: msbuild /m /P:Configuration=Release INSTALL.vcxproj run: msbuild /m /P:Configuration=Release INSTALL.vcxproj
@ -67,15 +67,15 @@ jobs:
- name: copy from release - name: copy from release
working-directory: ./build working-directory: ./build
shell: powershell shell: powershell
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")' 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")'
- name: unzip - name: unzip
working-directory: ./build working-directory: ./build
shell: cmd shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip' run: '"C:/Program Files/7-Zip/7z.exe" x Slic3r_2.2.53.3_win64_20201005.zip'
- name: copy old release content - name: copy old release content
working-directory: ./build working-directory: ./build
shell: cmd shell: cmd
run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\ run: xcopy /RCYIE Slic3r_2.2.53.3_win64_20201005\* package\
- name: copy new resources - name: copy new resources
working-directory: ./build working-directory: ./build
shell: cmd shell: cmd