update version, replaced UNKNOWN by the totay date, better macOsX handling...

#129

.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 <identity> resources

.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

.github/workflows/ccpp_win.yml

@@ -23,10 +23,12 @@ jobs:
       run: mkdir build
     - name: cmake
       working-directory: ./build
-      run: |
+      run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\Slic3r\Slic3r\deps\build\destdir\usr\local"
-        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
-        #msbuild /m /P:Configuration=Release ALL_BUILD.vcxproj
+      shell: powershell
-        msbuild /m /P:Configuration=Release INSTALL.vcxproj
+      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

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"
   }
  }

src/platform/osx/Info.plist.in

@@ -5,9 +5,9 @@
   <key>CFBundleExecutable</key>
   <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleGetInfoString</key>
-  <string>@SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2019 Prusa Reseach</string>
+  <string>@SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2019 Prusa Reseach, (C) 2018-2019 Remi Durand</string>
   <key>CFBundleIconFile</key>
-  <string>PrusaSlicer.icns</string>
+  <string>Slic3r.icns</string>
   <key>CFBundleName</key>
   <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleShortVersionString</key>
@@ -48,7 +48,7 @@
           <string>OBJ</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>PrusaSlicer.icns</string>
+        <string>Slic3r.icns</string>
         <key>CFBundleTypeName</key>
         <string>STL</string>
         <key>CFBundleTypeRole</key>
@@ -65,7 +65,7 @@
           <string>AMF</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>PrusaSlicer.icns</string>
+        <string>Slic3r.icns</string>
         <key>CFBundleTypeName</key>
         <string>AMF</string>
         <key>CFBundleTypeRole</key>
@@ -82,7 +82,7 @@
           <string>3MF</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>PrusaSlicer.icns</string>
+        <string>Slic3r.icns</string>
         <key>CFBundleTypeName</key>
         <string>3MF</string>
         <key>CFBundleTypeRole</key>
@@ -111,7 +111,7 @@
       </dict>
     </array>
     <key>LSMinimumSystemVersion</key>
-    <string>10.9</string>
+    <string>10.14</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>NSHighResolutionCapable</key>

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 "2,2,47,0")
-set(SLIC3R_RC_VERSION_DOTS "2.2.46.0")
+set(SLIC3R_RC_VERSION_DOTS "2.2.47.0")