Skip to content

Commit 5b0ba12

Browse files
SoftFeverSoftFever
committed
Change Application name to OrcaSlicer
1 parent 81ca772 commit 5b0ba12

File tree

93 files changed

+5612
-10204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+5612
-10204
lines changed

‎.github/workflows/build_linux.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
branches:
66
- SoftFever
7+
pull_request:
8+
branches:
9+
- SoftFever
710

811
jobs:
912
appimage-builder:
@@ -16,24 +19,24 @@ jobs:
1619
- name: Install dependencies
1720
run: |
1821
sudo apt-get update
19-
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 automake -y
22+
sudo apt-get install cmake libgl1-mesa-dev libgtk-3-dev libxkbcommon-dev libunwind-dev libfuse2 -y
2023
- name: Install dependencies from BuildLinux.sh
2124
shell: bash
2225
run: sudo ./BuildLinux.sh -ur
2326
- name: Fix permissions
2427
shell: bash
2528
run: sudo chown $USER -R ./
26-
- name: build deps
29+
- name: Build deps
2730
id: cache_deps
2831
uses: actions/cache@v3
2932
env:
30-
cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
33+
cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
3134
with:
3235
path: ${{ github.workspace }}/deps/build/destdir
3336
key: build-${{ env.cache-name }}
3437

3538
- if: ${{ steps.cache_deps.outputs.cache-hit != 'true' }}
36-
name: build deps
39+
name: Build deps
3740
working-directory: ${{ github.workspace }}
3841
continue-on-error: true
3942
run: ./BuildLinux.sh -dr
@@ -44,4 +47,4 @@ jobs:
4447
- uses: actions/upload-artifact@v3
4548
with:
4649
name: OrcaSlicer_Linux
47-
path: './build/BambuStudio_ubu64.AppImage'
50+
path: './build/OrcaSlicer_ubu64.AppImage'

‎.github/workflows/build_mac_arm64.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
branches:
66
- SoftFever
7+
pull_request:
8+
branches:
9+
- SoftFever
710

811
jobs:
912
build_win64:
@@ -16,14 +19,14 @@ jobs:
1619
- name: Install tools
1720
run: |
1821
brew install cmake git gettext zstd
19-
- run: mkdir -p ${{ github.workspace }}/deps/build
20-
# - run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
22+
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64
23+
- run: mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_x86_64
2124

2225
# - name: build deps
2326
# id: cache_deps
2427
# uses: actions/cache@v3
2528
# env:
26-
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_arm64
29+
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_arm64
2730
# with:
2831
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2932
# key: build-${{ env.cache-name }}
@@ -36,11 +39,11 @@ jobs:
3639
- name: Download and extract deps
3740
working-directory: ${{ github.workspace }}
3841
run: |
39-
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_arm64_21-01-2023.tar.gz
40-
tar -zxvf BambuStudio_dep_arm64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
41-
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
42-
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
43-
rm BambuStudio_dep_arm64_21-01-2023.tar.gz
42+
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
43+
tar -zxvf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build
44+
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
45+
ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
46+
rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
4447
4548
4649
- name: Build studio
@@ -50,5 +53,5 @@ jobs:
5053
- name: Upload artifacts
5154
uses: actions/upload-artifact@v3
5255
with:
53-
name: OrcaSlicer_Mac
54-
path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
56+
name: OrcaSlicer_Mac_AppleSilicon
57+
path: ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer*.zip

‎.github/workflows/build_mac_x64.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
branches:
66
- SoftFever
7+
pull_request:
8+
branches:
9+
- SoftFever
710

811
jobs:
912
build_win64:
@@ -16,14 +19,14 @@ jobs:
1619
- name: Install tools
1720
run: |
1821
brew install cmake git gettext
19-
- run: mkdir -p ${{ github.workspace }}/deps/build
20-
- run: mkdir -p ${{ github.workspace }}/deps/build/OrcaSlicer_dep
22+
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64
23+
- run: mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
2124

2225
# - name: build deps
2326
# id: cache_deps
2427
# uses: actions/cache@v3
2528
# env:
26-
# cache-name: ${{ runner.os }}-cache-bambustudio_deps_x64
29+
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps_x64
2730
# with:
2831
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2932
# key: build-${{ env.cache-name }}
@@ -37,11 +40,11 @@ jobs:
3740
- name: Download and extract deps
3841
working-directory: ${{ github.workspace }}
3942
run: |
40-
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2/BambuStudio_dep_x86_64_21-01-2023.tar.gz
41-
tar -zxvf BambuStudio_dep_x86_64_21-01-2023.tar.gz -C ${{ github.workspace }}/deps/build
42-
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/OrcaSlicer_dep
43-
ls -l ${{ github.workspace }}/deps/build/OrcaSlicer_dep
44-
rm BambuStudio_dep_x86_64_21-01-2023.tar.gz
43+
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
44+
tar -zxvf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
45+
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
46+
ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
47+
rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
4548
4649
4750
- name: Build studio
@@ -51,5 +54,5 @@ jobs:
5154
- name: Upload artifacts
5255
uses: actions/upload-artifact@v3
5356
with:
54-
name: OrcaSlicer_Mac
55-
path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip
57+
name: OrcaSlicer_Mac_Intel
58+
path: ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer*.zip

‎.github/workflows/build_ubuntu.yml

-44
This file was deleted.

‎.github/workflows/build_win.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ on:
44
push:
55
branches:
66
- SoftFever
7-
7+
pull_request:
8+
branches:
9+
- SoftFever
810

911
jobs:
1012
build_win64:
@@ -21,19 +23,19 @@ jobs:
2123
- run: mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
2224
- name: download deps
2325
shell: powershell
24-
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")'
26+
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")'
2527
- name: extract deps
2628
working-directory: ${{ github.workspace }}/deps/build
2729
shell: cmd
28-
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\BambuStudio_dep_9Mar2023.zip'
30+
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_12Mar2023.zip'
2931

3032
- run: dir "${{ github.workspace }}\deps\build\OrcaSlicer_dep"
3133

3234
# - name: build deps
3335
# id: cache_deps
3436
# uses: actions/cache@v3
3537
# env:
36-
# cache-name: ${{ runner.os }}-cache-bambustudio_deps
38+
# cache-name: ${{ runner.os }}-cache-orcaslicer_deps
3739
# with:
3840
# path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
3941
# key: ${{ runner.os }}-build-${{ env.cache-name }}

‎Build.PL

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ EOF
124124
}
125125

126126
print "\n";
127-
print "In the next step, you need to build the BambuStudio C++ library.\n";
127+
print "In the next step, you need to build the OrcaSlicer C++ library.\n";
128128
print "1) Create a build directory and change to it\n";
129129
print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
130130
print "3) run make\n";

‎BuildLinux.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ function check_available_memory_and_disk() {
1515
MIN_DISK_KB=$((10 * 1024 * 1024))
1616

1717
if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
18-
echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
18+
echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
1919
echo && free -h && echo
2020
exit 2
2121
fi
2222

2323
if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then
24-
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)"
24+
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)"
2525
echo && df -h . && echo
2626
exit 1
2727
fi
@@ -192,7 +192,7 @@ then
192192
make -j$NCORES
193193
echo "done"
194194

195-
# rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
195+
# rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
196196
# echo "[5/9] Renaming wxscintilla library..."
197197
# pushd destdir/usr/local/lib
198198
# if [[ -z "$FOUND_GTK3_DEV" ]]
@@ -234,7 +234,7 @@ then
234234

235235
# make Slic3r
236236
echo "[8/9] Building Slic3r..."
237-
make -j$NCORES BambuStudio # Slic3r
237+
make -j$NCORES OrcaSlicer # Slic3r
238238

239239
# make .mo
240240
# make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?

0 commit comments

Comments
 (0)