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 000000000..04a2be211 Binary files /dev/null and b/resources/icons/Slic3r.icns differ diff --git a/src/platform/msw/PrusaSlicer.rc.in b/src/platform/msw/PrusaSlicer.rc.in index 731ceaa4e..5c5f0836f 100644 --- a/src/platform/msw/PrusaSlicer.rc.in +++ b/src/platform/msw/PrusaSlicer.rc.in @@ -12,7 +12,7 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@ VALUE "ProductName", "@SLIC3R_APP_NAME@" VALUE "ProductVersion", "@SLIC3R_BUILD_ID@" VALUE "InternalName", "@SLIC3R_APP_NAME@" - VALUE "LegalCopyright", "Copyright \251 2011-2019 Alessandro Ranelucci, \251 2016-2019 Prusa Research, \251 2018-2019 Supermerill" + VALUE "LegalCopyright", "Copyright \251 2011-2019 Alessandro Ranelucci, \251 2016-2019 Prusa Research, \251 2018-2019 Remi Durand" VALUE "OriginalFilename", "slic3r.exe" } } diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in index d09f015b9..8f0a5c78a 100644 --- a/src/platform/osx/Info.plist.in +++ b/src/platform/osx/Info.plist.in @@ -5,9 +5,9 @@ CFBundleExecutable @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")