From 9ebc926564b5591ffbdc920ec655813d5c5e573a Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 18 Dec 2019 19:14:33 +0100 Subject: [PATCH] update version, replaced UNKNOWN by the totay date, better macOsX handling... #129 --- .github/workflows/ccpp_mac.yml | 12 ++++++++++-- .github/workflows/ccpp_ubuntu.yml | 2 ++ .github/workflows/ccpp_win.yml | 10 ++++++---- resources/icons/Slic3r.icns | Bin 0 -> 34257 bytes src/platform/msw/PrusaSlicer.rc.in | 2 +- src/platform/osx/Info.plist.in | 12 ++++++------ version.inc | 6 +++--- 7 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 resources/icons/Slic3r.icns diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 358592455..44b1a14a4 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -25,6 +25,8 @@ jobs: - name: cmake working-directory: ./build run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" -DSLIC3R_STATIC=1 + - name: change date in version + run: sed "s/UNKNOWN/$(date '+%F')/" version.inc - name: make slic3r working-directory: ./build run: make slic3r @@ -39,10 +41,16 @@ jobs: mkdir Slic3r++/Slic3r++.app/Contents/MacOS - name: copy resources working-directory: ./build - run: cp -Rf ../resources Slic3r++/Slic3r++.app/Contents/resources + run: | + cp -Rf ../resources Slic3r++/Slic3r++.app/Contents/resources + cp Slic3r++/Slic3r++.app/Contents/resources/icons/slic3r.icns Slic3r++/Slic3r++.app/Contents/resources/slic3r.icns + cp src/Info.plist Slic3r++/Slic3r++.app/Contents/Info.plist + echo -n -e '\xff\xfeAPPL\x3f\x00\x3f\x00\x3f\x00\x3f\x00\x0a\x00' > PkgInfo - name: copy bin working-directory: ./build - run: cp -f src/slic3r++ Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++ + run: | + cp -f src/slic3r++ Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++ + chmod 777 Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++ # - name: signing resources (creating CodeResources inside _CodeSignature) # working-directory: . # run: codesign -s resources diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 94f0061ad..a3ccd21ee 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -27,6 +27,8 @@ jobs: - name: cmake working-directory: ./build run: cmake .. -DCMAKE_PREFIX_PATH="/home/runner/work/Slic3r/Slic3r/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 + - name: change date in version + run: sed "s/UNKNOWN/$(date '+%F')/" version.inc - name: make slic3r working-directory: ./build run: make slic3r diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index e2b36b22d..b6ece530a 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -23,10 +23,12 @@ 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\build\destdir\usr\local" - #msbuild /m /P:Configuration=Release ALL_BUILD.vcxproj - msbuild /m /P:Configuration=Release INSTALL.vcxproj + run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\Slic3r\Slic3r\deps\build\destdir\usr\local" + - 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 + - name: make + run: msbuild /m /P:Configuration=Release INSTALL.vcxproj - name: create directory and copy into it working-directory: ./build run: ls diff --git a/resources/icons/Slic3r.icns b/resources/icons/Slic3r.icns new file mode 100644 index 0000000000000000000000000000000000000000..04a2be211b1122e6f186ace19065add48b960bf1 GIT binary patch literal 34257 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 alM)l+<6@%mv;*bCFBundleExecutable @SLIC3R_APP_KEY@ CFBundleGetInfoString - @SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2019 Prusa Reseach + @SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2019 Prusa Reseach, (C) 2018-2019 Remi Durand CFBundleIconFile - PrusaSlicer.icns + Slic3r.icns CFBundleName @SLIC3R_APP_KEY@ CFBundleShortVersionString @@ -48,7 +48,7 @@ OBJ CFBundleTypeIconFile - PrusaSlicer.icns + Slic3r.icns CFBundleTypeName STL CFBundleTypeRole @@ -65,7 +65,7 @@ AMF CFBundleTypeIconFile - PrusaSlicer.icns + Slic3r.icns CFBundleTypeName AMF CFBundleTypeRole @@ -82,7 +82,7 @@ 3MF CFBundleTypeIconFile - PrusaSlicer.icns + Slic3r.icns CFBundleTypeName 3MF CFBundleTypeRole @@ -111,7 +111,7 @@ LSMinimumSystemVersion - 10.9 + 10.14 NSPrincipalClass NSApplication NSHighResolutionCapable diff --git a/version.inc b/version.inc index f6850f590..51da50981 100644 --- a/version.inc +++ b/version.inc @@ -3,7 +3,7 @@ set(SLIC3R_APP_NAME "Slic3r++") set(SLIC3R_APP_KEY "Slic3r++") -set(SLIC3R_VERSION "2.2.46") +set(SLIC3R_VERSION "2.2.47") set(SLIC3R_BUILD_ID "slic3r++_${SLIC3R_VERSION}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,2,46,0") -set(SLIC3R_RC_VERSION_DOTS "2.2.46.0") +set(SLIC3R_RC_VERSION "2,2,47,0") +set(SLIC3R_RC_VERSION_DOTS "2.2.47.0")