juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-09 18:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build script as it was not working on some platforms

Browse Source
This commit is contained in:
ExPikaPaka
2026-06-04 12:28:25 +02:00
parent 1c1cee7784
commit 7fa650e410
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build_orca.yml vendored
View File

@@ -59,9 +59,10 @@ jobs:
- name: Install codegen tools and generate config sources - name: Install codegen tools and generate config sources
run: | run: |
python3 -m venv /tmp/codegen_venv if [ "$(uname)" = "Linux" ]; then
/tmp/codegen_venv/bin/pip install grpcio-tools pip3 install grpcio-tools
/tmp/codegen_venv/bin/python tools/run_codegen.py fi
python3 tools/run_codegen.py
if: runner.os != 'Windows' if: runner.os != 'Windows'
shell: bash shell: bash
@@ -113,7 +114,7 @@ jobs:
if: runner.os == 'macOS' && !inputs.macos-combine-only if: runner.os == 'macOS' && !inputs.macos-combine-only
run: | run: |
if [ -z "${{ vars.SELF_HOSTED }}" ]; then if [ -z "${{ vars.SELF_HOSTED }}" ]; then
brew install libtool brew install libtool protobuf
brew list brew list
fi fi
mkdir -p ${{ github.workspace }}/deps/build/${{ inputs.arch }} mkdir -p ${{ github.workspace }}/deps/build/${{ inputs.arch }}

2
CMakeLists.txt
View File

@@ -721,7 +721,6 @@ foreach(po_file ${BBL_L10N_PO_FILES})
add_custom_command( add_custom_command(
TARGET gettext_merge_po_with_pot PRE_BUILD TARGET gettext_merge_po_with_pot PRE_BUILD
COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot" COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot"
DEPENDS ${po_file}
) )
endforeach() endforeach()
add_custom_target(gettext_po_to_mo add_custom_target(gettext_po_to_mo
@@ -737,7 +736,6 @@ foreach(po_file ${BBL_L10N_PO_FILES})
TARGET gettext_po_to_mo PRE_BUILD TARGET gettext_po_to_mo PRE_BUILD
COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file} COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file}
#COMMAND msgfmt ARGS --check-compatibility -o ${mo_file} ${po_file} #COMMAND msgfmt ARGS --check-compatibility -o ${mo_file} ${po_file}
DEPENDS ${po_file}
) )
endforeach() endforeach()

4
build_release_macos.sh
View File

@@ -181,9 +181,7 @@ function pack_deps() {
function build_slicer() { function build_slicer() {
echo "Generating config sources from proto..." echo "Generating config sources from proto..."
python3 -m venv /tmp/codegen_venv python3 tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; }
/tmp/codegen_venv/bin/pip install grpcio-tools -q
/tmp/codegen_venv/bin/python tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; }
# iterate over two architectures: x86_64 and arm64 # iterate over two architectures: x86_64 and arm64
for _ARCH in x86_64 arm64; do for _ARCH in x86_64 arm64; do

4
src/CMakeLists.txt
View File

@@ -237,10 +237,6 @@ else ()
COMMAND ln -sf OrcaSlicer orca-slicer COMMAND ln -sf OrcaSlicer orca-slicer
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>" WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
VERBATIM) VERBATIM)
else ()
add_custom_command(TARGET OrcaSlicer POST_BUILD
WORKING_DIRECTORY "$<TARGET_FILE_DIR:OrcaSlicer>"
VERBATIM)
endif () endif ()
if (XCODE) if (XCODE)
# Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level # Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level

2
src/slic3r/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(libslic3r_gui) project(libslic3r_gui)
include(PrecompiledHeader) include(PrecompiledHeader)