diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index fc42d921175..74274e0af6d 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.github/workflows/ccpp_mac_debug.yml @@ -46,7 +46,7 @@ jobs: - name: cmake working-directory: ./build run: cmake .. -DCMAKE_BUILD_TYPE=Debug -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 - name: update Info.plist @@ -56,32 +56,32 @@ jobs: 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/SuperSlicer.icns pack/SuperSlicer/SuperSlicer.app/Contents/resources/SuperSlicer.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 Resources @@ -90,9 +90,9 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos_debug.dmg - path: build/Slic3r.dmg + path: build/SuperSlicer.dmg diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index 1ca83177e4f..81c9961197a 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -46,10 +46,10 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 - - name: make Slic3r + run: cmake .. -DCMAKE_BUILD_TYPE=Debug -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: | @@ -60,18 +60,18 @@ 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/upload-artifact@v1.0.0 with: name: nightly_linux.tar - path: build/Slic3r.tar + path: build/SuperSlicer.tar - name: build appimage working-directory: ./build/package run: | @@ -79,10 +79,10 @@ jobs: ../build_appimage.sh - name: 'Tar files' working-directory: ./build/package - run: tar -cvf Slic3r_ubu64.AppImage.tar Slic3r_ubu64.AppImage + run: tar -cvf SuperSlicer_ubu64.AppImage.tar SuperSlicer_ubu64.AppImage - name: Upload appimage uses: actions/upload-artifact@v1.0.0 with: name: Slic3r-AppImage.tar - path: build/package/Slic3r_ubu64.AppImage.tar + path: build/package/SuperSlicer_ubu64.AppImage.tar diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 9e7acc198fa..19841e73d38 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -55,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=Debug INSTALL.vcxproj @@ -70,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