Merge branch 'merill-merge' (2.3.57.10) into dev

2 files changed, 4 insertions, 156 deletions

diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml
index 069f81226..6934b6147 100644
--- a/.github/workflows/ccpp_mac.yml
+++ b/.github/workflows/ccpp_mac.yml
@@ -14,84 +14,8 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: 'Nigthly'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
-    - name: change date in version
-      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
-      working-directory: ./deps/build
-      run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13"
-    - name: make deps
-      working-directory: ./deps/build
-      run: make
-    - name: ls libs
-      working-directory: ./deps/build
-      run: ls ./destdir/usr/local/lib
-    - name: rename wxscintilla
-      working-directory: ./deps/build/destdir/usr/local/lib
-      run: cp libwxscintilla-3.1.a libwx_osx_cocoau_scintilla-3.1.a
-    - name: ls libs
-      working-directory: ./deps/build
-      run: ls ./destdir/usr/local/lib
-    - name: clean deps
-      working-directory: ./deps/build
-      run: rm -rf dep_*
-    - name: mkdir build
-      run: mkdir build
-    - name: cmake
-      working-directory: ./build
-      run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1
-    - name: make Slic3r
-      working-directory: ./build
-      run: make Slic3r
-    - name: make .mo
-      working-directory: ./build
-      run: make gettext_po_to_mo
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - 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: |
-        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
-    - 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
-        echo -n -e 'APPL????\x0a' > PkgInfo
-        cp PkgInfo pack/Slic3r/Slic3r.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
-    - 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
-#    - name: signing Resources (creating CodeResources inside _CodeSignature)
-#      working-directory: .
-#      run: codesign -s <identity> Resources
-# maybe i should just try to do that on a separate pc and copy the file here, more secure as a signing process.
+    - name: build deps & slicer
+      run: ./BuildMacOS.sh -i
     - name: Upload artifact
       uses: actions/upload-artifact@v1.0.0
       with:
diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml
index 2a104a551..39d1ba8c6 100644
--- a/.github/workflows/ccpp_mac_rc.yml
+++ b/.github/workflows/ccpp_mac_rc.yml
@@ -14,84 +14,8 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: 'rc'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
-    - name: change date in version
-      run: |
-        sed "s/+UNKNOWN//" version.inc > version.date.inc
-        mv version.date.inc version.inc
-    - name: mkdir in deps
-      run: mkdir deps/build
-    - name: cmake deps
-      working-directory: ./deps/build
-      run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13"
-    - name: make deps
-      working-directory: ./deps/build
-      run: make
-    - name: ls libs
-      working-directory: ./deps/build
-      run: ls ./destdir/usr/local/lib
-    - name: rename wxscintilla
-      working-directory: ./deps/build/destdir/usr/local/lib
-      run: cp libwxscintilla-3.1.a libwx_osx_cocoau_scintilla-3.1.a
-    - name: ls libs
-      working-directory: ./deps/build
-      run: ls ./destdir/usr/local/lib
-    - name: clean deps
-      working-directory: ./deps/build
-      run: rm -rf dep_*
-    - name: mkdir build
-      run: mkdir build
-    - name: cmake
-      working-directory: ./build
-      run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1
-    - name: make Slic3r
-      working-directory: ./build
-      run: make Slic3r
-    - name: make .mo
-      working-directory: ./build
-      run: make gettext_po_to_mo
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - 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: |
-        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
-    - 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
-        echo -n -e 'APPL????\x0a' > PkgInfo
-        cp PkgInfo pack/Slic3r/Slic3r.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
-    - 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
-#    - name: signing Resources (creating CodeResources inside _CodeSignature)
-#      working-directory: .
-#      run: codesign -s <identity> Resources
-# maybe i should just try to do that on a separate pc and copy the file here, more secure as a signing process.
+    - name: build deps & slicer
+      run: ./BuildMacOS.sh -i
     - name: Upload artifact
       uses: actions/upload-artifact@v1.0.0
       with: