Cross compiling improvements + macOS universal binary (#1458)
* chore(resources): rename macos_arm64.txt to macos-arm64.txt This matches the platform-arch convention like many other parts of the project. * chore(resources/cross): rename wasm.txt to unknown-wasm32.txt * refactor(scripts/common.sh): use parameter expansion instead of if else * feat(scripts/common.sh): support custom arch and platform for get_default_build_dir * feat(scripts/build.sh): add --cross-platform, --cross-arch and --cross-file * feat(scripts/package.sh): add --cross-platform and --cross-arch * feat(build-packages.sh): add support for new options in build.sh and packages.sh * ci(build): make arm64 binaries in CI * ci(build): do not install external libraries * ci(build): fix invalid artifact name * ci(build): fix INSTALL_NAME * ci(build): change name for macos artifacts * ci(build): add script to build universal dmgs from individual dmgs * ci(build): build universal dmgs * fix(make-universal-binaries): fix wrong path for hdiutil * ci(build): rename macos action * fix(make-universal-binaries.sh): fix wrong pathname for ditto * ci(release): build macos universal binaries * ci(release): remove useless variables * ci(release): fix wrong dependency * ci(build): fix old ubuntu version This version will be restored once I complete some container-specific fixes. * ci(build): make build_macos_universal depend on release * ci(build): fix wrong dmg dir * style(ci): capitalize 'universal' for CI name * fix(make-universal-binaries.sh): fix truncated dmg name when it contains dots * ci: styling changes * ci(release): install appdmg only
This commit is contained in:
Takase
+78
-25
@@ -13,19 +13,26 @@ show_help() {
|
||||
echo
|
||||
echo "Available options:"
|
||||
echo
|
||||
echo "-b --builddir DIRNAME Sets the name of the build directory (not path)."
|
||||
echo " Default: '$(get_default_build_dir)'."
|
||||
echo " --debug Debug this script."
|
||||
echo "-f --forcefallback Force to build dependencies statically."
|
||||
echo "-h --help Show this help and exit."
|
||||
echo "-p --prefix PREFIX Install directory prefix. Default: '/'."
|
||||
echo "-B --bundle Create an App bundle (macOS only)"
|
||||
echo "-P --portable Create a portable binary package."
|
||||
echo "-O --pgo Use profile guided optimizations (pgo)."
|
||||
echo "-U --windows-lua-utf Use the UTF8 patch for Lua."
|
||||
echo " macOS: disabled when used with --bundle,"
|
||||
echo " Windows: Implicit being the only option."
|
||||
echo "-r --release Compile in release mode."
|
||||
echo "-b --builddir DIRNAME Sets the name of the build directory (not path)."
|
||||
echo " Default: '$(get_default_build_dir)'."
|
||||
echo " --debug Debug this script."
|
||||
echo "-f --forcefallback Force to build dependencies statically."
|
||||
echo "-h --help Show this help and exit."
|
||||
echo "-p --prefix PREFIX Install directory prefix. Default: '/'."
|
||||
echo "-B --bundle Create an App bundle (macOS only)"
|
||||
echo "-P --portable Create a portable binary package."
|
||||
echo "-O --pgo Use profile guided optimizations (pgo)."
|
||||
echo "-U --windows-lua-utf Use the UTF8 patch for Lua."
|
||||
echo " macOS: disabled when used with --bundle,"
|
||||
echo " Windows: Implicit being the only option."
|
||||
echo "-r --release Compile in release mode."
|
||||
echo " --cross-platform PLATFORM Cross compile for this platform."
|
||||
echo " The script will find the appropriate"
|
||||
echo " cross file in 'resources/cross'."
|
||||
echo " --cross-arch ARCH Cross compile for this architecture."
|
||||
echo " The script will find the appropriate"
|
||||
echo " cross file in 'resources/cross'."
|
||||
echo " --cross-file CROSS_FILE Cross compile with the given cross file."
|
||||
echo
|
||||
}
|
||||
|
||||
@@ -40,6 +47,10 @@ main() {
|
||||
local portable
|
||||
local pgo
|
||||
local patch_lua
|
||||
local cross
|
||||
local cross_platform
|
||||
local cross_arch
|
||||
local cross_file
|
||||
|
||||
local lua_subproject_path
|
||||
|
||||
@@ -87,6 +98,24 @@ main() {
|
||||
patch_lua="true"
|
||||
shift
|
||||
;;
|
||||
--cross-arch)
|
||||
cross="true"
|
||||
cross_arch="$2"
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
--cross-platform)
|
||||
cross="true"
|
||||
cross_platform="$2"
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
--cross-file)
|
||||
cross="true"
|
||||
cross_file="$2"
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
-r|--release)
|
||||
build_type="release"
|
||||
shift
|
||||
@@ -107,19 +136,43 @@ main() {
|
||||
portable=""
|
||||
fi
|
||||
|
||||
if [[ $CROSS_ARCH != "" ]]; then
|
||||
if [[ $platform == "macos" ]]; then
|
||||
macos_version_min=10.11
|
||||
if [[ $CROSS_ARCH == "arm64" ]]; then
|
||||
cross_file="--cross-file resources/cross/macos_arm64.txt"
|
||||
macos_version_min=11.0
|
||||
# if CROSS_ARCH is used, it will be picked up
|
||||
cross="${cross:-$CROSS_ARCH}"
|
||||
if [[ -n "$cross" ]]; then
|
||||
if [[ -n "$cross_file" ]] && ([[ -z "$cross_arch" ]] || [[ -z "$cross_platform" ]]); then
|
||||
echo "Warning: --cross-platform or --cross-platform not set; guessing it from the filename."
|
||||
# remove file extensions and directories from the path
|
||||
cross_file_name="${cross_file##*/}"
|
||||
cross_file_name="${cross_file_name%%.*}"
|
||||
# cross_platform is the string before encountering the first hyphen
|
||||
if [[ -z "$cross_platform" ]]; then
|
||||
cross_platform="${cross_file_name%%-*}"
|
||||
echo "Warning: Guessing --cross-platform $cross_platform"
|
||||
fi
|
||||
# cross_arch is the string after encountering the first hyphen
|
||||
if [[ -z "$cross_arch" ]]; then
|
||||
cross_arch="${cross_file_name#*-}"
|
||||
echo "Warning: Guessing --cross-arch $cross_arch"
|
||||
fi
|
||||
export MACOSX_DEPLOYMENT_TARGET=$macos_version_min
|
||||
export MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET=$macos_version_min
|
||||
export CFLAGS=-mmacosx-version-min=$macos_version_min
|
||||
export CXXFLAGS=-mmacosx-version-min=$macos_version_min
|
||||
export LDFLAGS=-mmacosx-version-min=$macos_version_min
|
||||
fi
|
||||
platform="${cross_platform:-$platform}"
|
||||
arch="${cross_arch:-$arch}"
|
||||
cross_file=("--cross-file" "${cross_file:-resources/cross/$platform-$arch.txt}")
|
||||
# reload build_dir because platform and arch might change
|
||||
build_dir="$(get_default_build_dir "$platform" "$arch")"
|
||||
fi
|
||||
|
||||
# arch and platform specific stuff
|
||||
if [[ "$platform" == "macos" ]]; then
|
||||
macos_version_min="10.11"
|
||||
if [[ "$arch" == "arm64" ]]; then
|
||||
macos_version_min="11.0"
|
||||
fi
|
||||
export MACOSX_DEPLOYMENT_TARGET="$macos_version_min"
|
||||
export MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET="$macos_version_min"
|
||||
export CFLAGS="-mmacosx-version-min=$macos_version_min"
|
||||
export CXXFLAGS="-mmacosx-version-min=$macos_version_min"
|
||||
export LDFLAGS="-mmacosx-version-min=$macos_version_min"
|
||||
fi
|
||||
|
||||
rm -rf "${build_dir}"
|
||||
@@ -137,7 +190,7 @@ main() {
|
||||
CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS meson setup \
|
||||
--buildtype=$build_type \
|
||||
--prefix "$prefix" \
|
||||
$cross_file \
|
||||
"${cross_file[@]}" \
|
||||
$force_fallback \
|
||||
$bundle \
|
||||
$portable \
|
||||
|
||||
Reference in New Issue
Block a user