Updated to use new apis

.github/workflows/ccpp_mac.yml

@@ -14,6 +14,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: Install Autoconf
       run: |
         brew update
@@ -22,7 +30,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure
@@ -47,6 +55,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: check autoconf version
       run: autoconf --version
     - name: update automake for mpfr

.github/workflows/ccpp_mac_arm.yml

@@ -22,7 +22,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure

.github/workflows/ccpp_mac_arm_debug.yml

@@ -19,7 +19,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure

.github/workflows/ccpp_mac_arm_rc.yml

@@ -19,7 +19,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure

.github/workflows/ccpp_mac_debug.yml

@@ -11,6 +11,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: Install Autoconf
       run: |
         brew update
@@ -19,7 +27,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure
@@ -44,6 +52,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: check autoconf version
       run: autoconf --version
     - name: update automake for mpfr

.github/workflows/ccpp_mac_rc.yml

@@ -4,13 +4,22 @@ on:
   push:
     branches:
       - rc
+      - rc-macintel
 
 jobs:
   build_dep:
     runs-on: macos-13
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: Install Autoconf
       run: |
         brew update
@@ -19,7 +28,7 @@ jobs:
       run: autoconf --version
     - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        curl -O -L https://github.com/supermerill/SuperSlicer_deps/releases/download/automake/automake-1.16.5.tar.gz
         tar -xzf automake-1.16.5.tar.gz
         cd automake-*
         ./configure
@@ -44,6 +53,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: New cmake
+      run: cmake --version
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: "3.31.x"
+    - name: Use cmake
+      run: cmake --version
     - name: dep cache
       id: cache-action
       uses: actions/cache@v3

.github/workflows/ccpp_ubuntu_gtk2_rc.yml

@@ -10,6 +10,8 @@ jobs:
   build:
     runs-on: ubuntu-22.04
 
+    env:
+      EXEC_NAME: "${{ github.event.repository.name }}"
     steps:
     - uses: actions/checkout@v3
       with:

.github/workflows/ccpp_win.yml

@@ -87,19 +87,15 @@ jobs:
     - name: copy dll
       working-directory: ./build
       run: msbuild /m /P:Configuration=RelWithDebInfo src\slic3rDllsCopy.vcxproj
-    - name: create directory and copy into it
-      working-directory: ./build
-      run: ls
-    - name: create directory and copy into it
+    - name: create package directory
       working-directory: ./build
       shell: powershell
-        #todo: add the opengl folder
       run: mkdir package
-    - name: copy from release
+    - name: download dll package
       working-directory: ./build
       shell: powershell
       run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/1.8/Slic3r_win_build.zip", "Slic3r_win_build.zip")'
-    - name: unzip
+    - name: unzip dll package
       working-directory: ./build
       shell: cmd
       run: '"C:/Program Files/7-Zip/7z.exe" x Slic3r_win_build.zip'
@@ -131,3 +127,61 @@ jobs:
       with:
         name: nightly_win64
         path: build/package/
+
+# MSI CREATION
+  # create_msi:
+    # runs-on: windows-2022
+    # needs: build
+
+    # steps:
+    # - uses: actions/checkout@v3
+    # - name: Download build artifact
+      # uses: actions/download-artifact@v4
+      # with:
+        # name: nightly_win64
+        # path: build/package
+    - name: Install WiX Toolset
+      run: choco install wixtoolset -y
+    - name: Prepare license file for MSI
+      shell: powershell
+      working-directory: ./build
+      run: |
+        # Convert LICENSE to RTF format for WiX installer
+        $licenseContent = Get-Content ..\LICENSE -Raw
+        $rtfContent = "{\rtf1\ansi\deff0 {\fonttbl {\f0 Times New Roman;}}{\f0\fs20 " + $licenseContent.Replace('\', '\\').Replace("`n", "\par ") + "}}"
+        $rtfContent | Out-File -FilePath "package\LICENSE.rtf" -Encoding ASCII
+    - name: Harvest files for MSI
+      shell: cmd
+      working-directory: ./build
+      run: |
+        heat.exe dir package -dr INSTALLFOLDER -cg Package -gg -sreg -srd -var var.SourceDir -out files.wxs -sfrag
+    - name: Generate installer version
+      shell: powershell
+      run: |
+        $fullVersion = (Get-Content version.inc | Select-String -Pattern 'set\(SLIC3R_VERSION_FULL \"(.*?)\"\)' | ForEach-Object { $_.Matches.Groups[1].Value })
+        $dateSuffix = (Get-Date -Format 'yyMMdd')
+        $env:InstallerVersion = "$fullVersion$dateSuffix" -replace '\.0', '.'
+        echo "InstallerVersion=$env:InstallerVersion" >> $env:GITHUB_ENV
+        $env:ReleaseSuffix = "-Beta-Nightly"
+        echo "ReleaseSuffix=$env:ReleaseSuffix" >> $env:GITHUB_ENV
+    - name: Check version number is not empty
+      shell: powershell
+      run: |
+        if ([string]::IsNullOrWhiteSpace($env:InstallerVersion)) {
+          Write-Warning "InstallerVersion is empty or null. Setting default version to 0.0.0.0"
+          $env:InstallerVersion = "0.0.0.0"
+          echo "InstallerVersion=$env:InstallerVersion" >> $env:GITHUB_ENV
+        }
+        Write-Host "Version validation passed: $env:InstallerVersion"
+    - name: Build MSI installer
+      shell: cmd
+      working-directory: ./build
+      run: |
+        set MSIFileName=${{ github.event.repository.name }}_%InstallerVersion%.msi
+        candle.exe -dSourceDir="package" -dInstallerVersion="%InstallerVersion%" -dReleaseSuffix="%ReleaseSuffix%" src\winInstaller.wxs files.wxs
+        light.exe -b package -ext WixUIExtension winInstaller.wixobj files.wixobj -o %MSIFileName% -sw1076
+    - name: Upload MSI artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: nightly_${{ github.event.repository.name }}-win64-${{ env.InstallerVersion }}.msi
+        path: build/${{ github.event.repository.name }}_${{ env.InstallerVersion }}.msi

.github/workflows/ccpp_win_debug.yml

@@ -25,11 +25,11 @@ jobs:
       name: build deps if new cache
       working-directory: ./deps/build
       run: |
-        cmake .. -G "Visual Studio 16 2019" -A x64
+        cmake .. -G "Visual Studio 17 2022" -A x64
         msbuild /m ALL_BUILD.vcxproj
 
   build_pot:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: build_dep
 
     steps:
@@ -38,16 +38,17 @@ jobs:
     - name: update submodule profiles
       working-directory: ./resources/profiles
       run: git submodule update --init
-    - run: mkdir deps/destdir
+#    - run: mkdir deps/destdir
     - name: dep cache
       id: cache-action
       uses: actions/cache@v3
       with:
-        key: win_2.7
+        key: win_debug_2.7
         path: deps/build/destdir
     - run: dir deps
-    - run: dir deps/destdir
-    - run: dir deps/destdir/usr
+    - run: dir deps/build
+    - run: dir deps/build/destdir
+    - run: dir deps/build/destdir/usr
     - run: mkdir msgfmt_bin
     - name: copy gettext
       working-directory: ./msgfmt_bin
@@ -64,7 +65,7 @@ jobs:
     - run: mkdir build
     - name: cmake
       working-directory: ./build
-      run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\destdir\usr\local"
+      run: cmake .. -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\build\destdir\usr\local"
     - name: make .mo
       working-directory: ./build
       run: msbuild /m /P:Configuration=RelWithDebInfo gettext_po_to_mo.vcxproj
@@ -73,7 +74,7 @@ jobs:
       run: msbuild /m /P:Configuration=RelWithDebInfo gettext_make_pot.vcxproj
 
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: build_dep
 
     steps:

.github/workflows/ccpp_win_rc.yml

@@ -85,13 +85,9 @@ jobs:
     - name: copy dll
       working-directory: ./build
       run: msbuild /m /P:Configuration=Release src\slic3rDllsCopy.vcxproj
-    - name: create directory and copy into it
-      working-directory: ./build
-      run: ls
-    - name: create directory and copy into it
+    - name: create package directory
       working-directory: ./build
       shell: powershell
-        #todo: add the opengl folder
       run: mkdir package
     - name: copy from release
       working-directory: ./build
@@ -131,3 +127,65 @@ jobs:
       with:
         name: rc_win64
         path: build/package/
+
+# MSI CREATION (need files from the slic3r build, can't be its own step)
+  # create_msi:
+    # runs-on: windows-2022
+    # needs: build
+
+    # steps:
+    # - uses: actions/checkout@v3
+    # - name: Download build artifact
+      # uses: actions/download-artifact@v4
+      # with:
+        # name: rc_win64
+        # path: build/package
+    - name: Check inside of 'build'
+      working-directory: ./build
+      run: dir
+    - name: Install WiX Toolset
+      run: choco install wixtoolset -y
+    - name: Prepare license file for MSI
+      shell: powershell
+      working-directory: ./build
+      run: |
+        # Convert LICENSE to RTF format for WiX installer
+        $licenseContent = Get-Content ..\LICENSE -Raw
+        $rtfContent = "{\rtf1\ansi\deff0 {\fonttbl {\f0 Times New Roman;}}{\f0\fs20 " + $licenseContent.Replace('\', '\\').Replace("`n", "\par ") + "}}"
+        $rtfContent | Out-File -FilePath "package\LICENSE.rtf" -Encoding ASCII
+    - name: Harvest files for MSI
+      shell: cmd
+      working-directory: ./build
+      run: |
+        heat.exe dir package -dr INSTALLFOLDER -cg Package -gg -sreg -srd -var var.SourceDir -out files.wxs -sfrag
+    - name: Generate installer version
+      shell: powershell
+      run: |
+        $fullVersion = (Get-Content version.inc | Select-String -Pattern 'set\(SLIC3R_VERSION_FULL \"(.*?)\"\)' | ForEach-Object { $_.Matches.Groups[1].Value })
+        $env:InstallerVersion = "$fullVersion" -replace '\.0', '.'
+        echo "InstallerVersion=$env:InstallerVersion" >> $env:GITHUB_ENV
+        $env:ReleaseSuffix = ""
+        echo "ReleaseSuffix=$env:ReleaseSuffix" >> $env:GITHUB_ENV
+    - name: Check version number is not empty
+      shell: powershell
+      run: |
+        if ([string]::IsNullOrWhiteSpace($env:InstallerVersion)) {
+          Write-Warning "InstallerVersion is empty or null. Setting default version to 0.0.0.0"
+          $env:InstallerVersion = "0.0.0.0"
+          echo "InstallerVersion=$env:InstallerVersion" >> $env:GITHUB_ENV
+        }
+        Write-Host "Version validation passed: $env:InstallerVersion"
+    - name: Build MSI installer
+      shell: cmd
+      working-directory: ./build
+      run: |
+        set MSIFileName=${{ github.event.repository.name }}_%InstallerVersion%.msi
+        candle.exe -dSourceDir="package" -dInstallerVersion="%InstallerVersion%" -dReleaseSuffix="%ReleaseSuffix%" src\winInstaller.wxs files.wxs
+        light.exe -b package -ext WixUIExtension winInstaller.wixobj files.wixobj -o %MSIFileName% -sw1076
+    - run: dir ./build
+    - name: Upload MSI artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: rc_${{ github.event.repository.name }}-win64.msi
+        path: build/${{ github.event.repository.name }}_${{ env.InstallerVersion }}.msi
+