修改Mac编译脚本
This commit is contained in:
parent
fe136ed6cf
commit
b095652bd8
@ -156,7 +156,7 @@ function pack_deps() {
|
|||||||
set -x
|
set -x
|
||||||
mkdir -p "$DEPS"
|
mkdir -p "$DEPS"
|
||||||
cd "$DEPS_BUILD_DIR"
|
cd "$DEPS_BUILD_DIR"
|
||||||
tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "OrcaSlicer_dep_$ARCH"
|
tar -zcvf "CreatWare_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "CreatWare_dep_$ARCH"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ function build_slicer() {
|
|||||||
-G "${SLICER_CMAKE_GENERATOR}" \
|
-G "${SLICER_CMAKE_GENERATOR}" \
|
||||||
-DBBL_RELEASE_TO_PUBLIC=1 \
|
-DBBL_RELEASE_TO_PUBLIC=1 \
|
||||||
-DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
|
-DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
|
||||||
-DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
|
-DCMAKE_INSTALL_PREFIX="$PWD/CreatWare" \
|
||||||
-DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
|
-DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
|
||||||
-DCMAKE_MACOSX_RPATH=ON \
|
-DCMAKE_MACOSX_RPATH=ON \
|
||||||
-DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
|
-DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
|
||||||
@ -191,18 +191,18 @@ function build_slicer() {
|
|||||||
echo "Fix macOS app package..."
|
echo "Fix macOS app package..."
|
||||||
(
|
(
|
||||||
cd "$PROJECT_BUILD_DIR"
|
cd "$PROJECT_BUILD_DIR"
|
||||||
mkdir -p OrcaSlicer
|
mkdir -p CreatWare
|
||||||
cd OrcaSlicer
|
cd CreatWare
|
||||||
# remove previously built app
|
# remove previously built app
|
||||||
rm -rf ./OrcaSlicer.app
|
rm -rf ./CreatWare.app
|
||||||
# fully copy newly built app
|
# fully copy newly built app
|
||||||
cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
|
cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/CreatWare.app" ./CreatWare.app
|
||||||
# fix resources
|
# fix resources
|
||||||
resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
|
resources_path=$(readlink ./CreatWare.app/Contents/Resources)
|
||||||
rm ./OrcaSlicer.app/Contents/Resources
|
rm ./CreatWare.app/Contents/Resources
|
||||||
cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
|
cp -R "$resources_path" ./CreatWare.app/Contents/Resources
|
||||||
# delete .DS_Store file
|
# delete .DS_Store file
|
||||||
find ./OrcaSlicer.app/ -name '.DS_Store' -delete
|
find ./CreatWare.app/ -name '.DS_Store' -delete
|
||||||
)
|
)
|
||||||
|
|
||||||
# extract version
|
# extract version
|
||||||
@ -214,7 +214,7 @@ function build_slicer() {
|
|||||||
# ver=${ver}_dev
|
# ver=${ver}_dev
|
||||||
# fi
|
# fi
|
||||||
|
|
||||||
# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
|
# zip -FSr CreatWare${ver}_Mac_${ARCH}.zip CreatWare.app
|
||||||
}
|
}
|
||||||
|
|
||||||
function build_universal() {
|
function build_universal() {
|
||||||
@ -226,7 +226,7 @@ function build_universal() {
|
|||||||
ARCH="x86_64"
|
ARCH="x86_64"
|
||||||
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
||||||
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
||||||
DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
|
DEPS="$DEPS_BUILD_DIR/CreatWare_dep_$ARCH"
|
||||||
build_deps
|
build_deps
|
||||||
build_slicer
|
build_slicer
|
||||||
|
|
||||||
@ -234,7 +234,7 @@ function build_universal() {
|
|||||||
ARCH="arm64"
|
ARCH="arm64"
|
||||||
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
||||||
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
||||||
DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
|
DEPS="$DEPS_BUILD_DIR/CreatWare_dep_$ARCH"
|
||||||
build_deps
|
build_deps
|
||||||
build_slicer
|
build_slicer
|
||||||
|
|
||||||
@ -242,23 +242,23 @@ function build_universal() {
|
|||||||
ARCH="$ORIGINAL_ARCH"
|
ARCH="$ORIGINAL_ARCH"
|
||||||
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
PROJECT_BUILD_DIR="$PROJECT_DIR/build_$ARCH"
|
||||||
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
DEPS_BUILD_DIR="$DEPS_DIR/build_$ARCH"
|
||||||
DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep_$ARCH"
|
DEPS="$DEPS_BUILD_DIR/CreatWare_dep_$ARCH"
|
||||||
|
|
||||||
# Create universal binary
|
# Create universal binary
|
||||||
echo "Creating universal binary..."
|
echo "Creating universal binary..."
|
||||||
PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
|
PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
|
||||||
mkdir -p "$PROJECT_BUILD_DIR/OrcaSlicer"
|
mkdir -p "$PROJECT_BUILD_DIR/CreatWare"
|
||||||
UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/Universal_OrcaSlicer.app"
|
UNIVERSAL_APP="$PROJECT_BUILD_DIR/CreatWare/Universal_CreatWare.app"
|
||||||
rm -rf "$UNIVERSAL_APP"
|
rm -rf "$UNIVERSAL_APP"
|
||||||
cp -R "$PROJECT_DIR/build_x86_64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP"
|
cp -R "$PROJECT_DIR/build_x86_64/CreatWare/CreatWare.app" "$UNIVERSAL_APP"
|
||||||
|
|
||||||
# Get the binary path inside the .app bundle
|
# Get the binary path inside the .app bundle
|
||||||
BINARY_PATH="Contents/MacOS/OrcaSlicer"
|
BINARY_PATH="Contents/MacOS/CreatWare"
|
||||||
|
|
||||||
# Create universal binary using lipo
|
# Create universal binary using lipo
|
||||||
lipo -create \
|
lipo -create \
|
||||||
"$PROJECT_DIR/build_x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
|
"$PROJECT_DIR/build_x86_64/CreatWare/CreatWare.app/$BINARY_PATH" \
|
||||||
"$PROJECT_DIR/build_arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
|
"$PROJECT_DIR/build_arm64/CreatWare/CreatWare.app/$BINARY_PATH" \
|
||||||
-output "$UNIVERSAL_APP/$BINARY_PATH"
|
-output "$UNIVERSAL_APP/$BINARY_PATH"
|
||||||
|
|
||||||
echo "Universal binary created at $UNIVERSAL_APP"
|
echo "Universal binary created at $UNIVERSAL_APP"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user