Change Application name to OrcaSlicer

SoftFever · Mar 12, 2023 · 5b0ba12 · 5b0ba12
1 parent 81ca772
commit 5b0ba12
Show file tree

Hide file tree

Showing 93 changed files with 5,612 additions and 10,204 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -4,6 +4,9 @@ on:
     push:
       branches: 
        - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
 
 jobs:
   appimage-builder:
@@ -16,24 +19,24 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 automake -y
+          sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
       - name: Install dependencies from BuildLinux.sh
         shell: bash
         run: sudo ./BuildLinux.sh -ur
       - name: Fix permissions
         shell: bash
         run: sudo chown $USER -R ./
-      - name: build deps
+      - name: Build deps
         id: cache_deps
         uses: actions/cache@v3
         env:
-          cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
+          cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
         with:
           path: ${{ github.workspace }}/deps/build/destdir
           key: build-${{ env.cache-name }}
 
       - if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
-        name: build deps
+        name: Build deps
         working-directory: ${{ github.workspace }}
         continue-on-error: true
         run: ./BuildLinux.sh -dr
@@ -44,4 +47,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Linux
-          path: './build/BambuStudio_ubu64.AppImage'
+          path: './build/OrcaSlicer_ubu64.AppImage'
diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml
@@ -4,6 +4,9 @@ on:
     push:
       branches: 
        - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
 
 jobs:
   build_win64:
@@ -16,14 +19,14 @@ jobs:
       - name: Install tools
         run: |
           brew install cmake git gettext zstd
-      - run: mkdir -p ${{ github.workspace }}/deps/build
-      # - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+      - run: mkdir -p ${{ github.workspace }}/deps/build_arm64
+      - run: mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_x86_64
 
       # - name: build deps
       #   id: cache_deps
       #   uses: actions/cache@v3
       #   env:
-      #     cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_arm64
       #   with:
       #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       #     key: build-${{ env.cache-name }}
@@ -36,11 +39,11 @@ jobs:
       - name: Download and extract deps
         working-directory: ${{ github.workspace }}
         run: |
-          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
-          tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-          ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-          rm BambuStudio_dep_arm64_21-01-2023.tar.gz
+          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
+          tar -zxvf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build
+          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
+          ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
+          rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
 
 
       - name: Build studio
@@ -50,5 +53,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_Mac
-          path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
+          name: OrcaSlicer_Mac_AppleSilicon
+          path: ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer*.zip
diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml
@@ -4,6 +4,9 @@ on:
     push:
       branches: 
        - SoftFever
+    pull_request:
+      branches: 
+       - SoftFever
 
 jobs:
   build_win64:
@@ -16,14 +19,14 @@ jobs:
       - name: Install tools
         run: |
           brew install cmake git gettext
-      - run: mkdir -p ${{ github.workspace }}/deps/build
-      - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+      - run: mkdir -p ${{ github.workspace }}/deps/build_x86_64
+      - run: mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
 
       # - name: build deps
       #   id: cache_deps
       #   uses: actions/cache@v3
       #   env:
-      #     cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
       #   with:
       #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       #     key: build-${{ env.cache-name }}
@@ -37,11 +40,11 @@ jobs:
       - name: Download and extract deps
         working-directory: ${{ github.workspace }}
         run: |
-          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz
-          tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
-          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-          ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-          rm BambuStudio_dep_x86_64_21-01-2023.tar.gz
+          curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
+          tar -zxvf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
+          chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
+          ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
+          rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
 
 
       - name: Build studio
@@ -51,5 +54,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_Mac
-          path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
+          name: OrcaSlicer_Mac_Intel
+          path: ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer*.zip
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -4,7 +4,9 @@ on:
     push:
       branches: 
        - SoftFever
-
+    pull_request:
+      branches: 
+       - SoftFever 
 
 jobs:
   build_win64:
@@ -21,19 +23,19 @@ jobs:
       - run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       - name: download deps
         shell: powershell
-        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/3/BambuStudio_dep_9Mar2023.zip", "$env:temp\BambuStudio_dep_9Mar2023.zip")'
+        run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_12Mar2023.zip", "$env:temp\OrcaSlicer_dep_12Mar2023.zip")'
       - name: extract deps
         working-directory: ${{ github.workspace }}/deps/build
         shell: cmd
-        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_9Mar2023.zip'
+        run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_12Mar2023.zip'
 
       - run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
 
       # - name: build deps
       #   id: cache_deps
       #   uses: actions/cache@v3
       #   env:
-      #     cache-name: ${{ runner.os }}-cache-bambustudio_deps
+      #     cache-name: ${{ runner.os }}-cache-orcaslicer_deps
       #   with:
       #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
       #     key: ${{ runner.os }}-build-${{ env.cache-name }}

diff --git a/Build.PL b/Build.PL
@@ -124,7 +124,7 @@ EOF
 }
 
 print "\n";
-print "In the next step, you need to build the BambuStudio C++ library.\n";
+print "In the next step, you need to build the OrcaSlicer C++ library.\n";
 print "1) Create a build directory and change to it\n";
 print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
 print "3) run make\n";

diff --git a/BuildLinux.sh b/BuildLinux.sh
@@ -15,13 +15,13 @@ function check_available_memory_and_disk() {
     MIN_DISK_KB=$((10 * 1024 * 1024))
 
     if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
-        echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
+        echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
         echo && free -h && echo
         exit 2
     fi
 
     if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then 
-        echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
+        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
         echo && df -h . && echo
         exit 1
     fi
@@ -192,7 +192,7 @@ then
         make -j$NCORES
         echo "done"
 
-        # rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
+        # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
         # echo "[5/9] Renaming wxscintilla library..."
         # pushd destdir/usr/local/lib
         #     if [[ -z "$FOUND_GTK3_DEV" ]]
@@ -234,7 +234,7 @@ then
 
         # make Slic3r
         echo "[8/9] Building Slic3r..."
-        make -j$NCORES BambuStudio # Slic3r
+        make -j$NCORES OrcaSlicer # Slic3r
 
         # make .mo
         # make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?