Merge remote-tracking branch 'remotes/supermerill/CI' into stable

.github/workflows/ccpp_mac.yml

@@ -13,7 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: change date in version
-      run: sed "s/+UNKNOWN/_$(date '+%F')/" version.inc
+      run: |
+        sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc
+        mv version.date.inc version.inc
     - name: mkdir in deps
       run: mkdir deps/build
     - name: cmake deps
@@ -33,6 +35,9 @@ jobs:
     - name: make slic3r
       working-directory: ./build
       run: make slic3r
+    - name: update Info.plist
+      working-directory: ./build/src
+      run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist
     - name: create directory and copy into it
       working-directory: ./build
       run: |
@@ -46,14 +51,22 @@ jobs:
       working-directory: ./build
       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 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
+        cp src/Info.date.plist Slic3r++/Slic3r++.app/Contents/Info.plist
-        echo -n -e '\xff\xfeAPPL\x3f\x00\x3f\x00\x3f\x00\x3f\x00\x0a\x00' > PkgInfo
+        echo -n -e 'APPL????\x0a' > PkgInfo
+        cp PkgInfo Slic3r++/Slic3r++.app/Contents/PkgInfo
+#        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++
-        chmod 777 Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++
+        chmod u+x Slic3r++/Slic3r++.app/Contents/MacOS/slic3r++
+        tar -cvf slic3r++.tar Slic3r++
+    - name: create dmg
+      working-directory: ./build
+      run: |
+        hdiutil create -ov -fs HFS+ -volname "Slic3r++" -srcfolder "Slic3r++" temp.dmg
+        hdiutil convert temp.dmg -format UDZO -o Slic3r++.dmg
 #    - name: signing resources (creating CodeResources inside _CodeSignature)
 #      working-directory: .
 #      run: codesign -s <identity> resources
@@ -61,5 +74,10 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: nightly_macos
+        name: nightly_macos.tar
-        path: build/Slic3r++/
+        path: build/slic3r++.tar
+    - name: Upload artifact
+      uses: actions/upload-artifact@v1.0.0
+      with:
+        name: nightly_macos.dmg
+        path: build/Slic3r++.dmg

.github/workflows/ccpp_ubuntu.yml

@@ -14,8 +14,12 @@ jobs:
     - uses: actions/checkout@v1
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
+    - name: update clock
+      run: sudo hwclock -s
+    - name: update apt
+      run: sudo apt update
     - name: install gtk2 glew
-      run: sudo apt-get install libgtk2.0-dev libglew-dev libudev-dev
+      run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev
     - name: mkdir in deps
       run: mkdir deps/build
     - name: cmake deps
@@ -48,9 +52,12 @@ jobs:
       run: cp -f src/slic3r++ package/bin/slic3r++
     - 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++
+      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 .
     - name: Upload artifact
       uses: actions/upload-artifact@v1.0.0
       with:
-        name: nightly_linux
+        name: nightly_linux.tar
-        path: build/package/
+        path: build/slic3r++.tar

src/platform/osx/Info.plist.in

@@ -13,7 +13,7 @@
   <key>CFBundleShortVersionString</key>
   <string>@SLIC3R_APP_NAME@ @SLIC3R_BUILD_ID@</string>
   <key>CFBundleIdentifier</key>
-  <string>com.prusa3d.slic3r/</string>
+  <string>com.merill.slic3r/</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundlePackageType</key>
@@ -111,7 +111,7 @@
       </dict>
     </array>
     <key>LSMinimumSystemVersion</key>
-    <string>10.14</string>
+    <string>10.13</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>NSHighResolutionCapable</key>