Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

make-binaries: Apply minor simplifications

Browse Source
This commit is contained in:
Holger Weiss 2023-07-23 15:06:40 +02:00
parent ec86079747
commit 121acd1da7
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/make-binaries
View File

@ -118,7 +118,6 @@ rel_tar="$rel_name-$mix_vsn.tar.gz"
ct_jobs=$(nproc) ct_jobs=$(nproc)
src_dir="$root_dir/src" src_dir="$root_dir/src"
platform=$(gcc -dumpmachine) platform=$(gcc -dumpmachine)
platform_libc=$(echo $platform | sed "s/\-/\ /g" | awk '{print $NF}')
targets='x86_64-linux-gnu aarch64-linux-gnu' targets='x86_64-linux-gnu aarch64-linux-gnu'
build_start=$(date '+%F %T') build_start=$(date '+%F %T')
have_current_deps='false' have_current_deps='false'
@ -347,10 +346,10 @@ add_otp_path()
if [ "$mode" = 'native' ] if [ "$mode" = 'native' ]
then native_otp_bin="$prefix/bin" then native_otp_bin="$prefix/bin"
# for github runners to build for non-native systems elif [ ! -z "${INSTALL_DIR_FOR_OTP+x}" ] && [ ! -z "${INSTALL_DIR_FOR_ELIXIR+x}" ]
# https://github.com/marketplace/actions/setup-erlang-otp-with-optional-elixir-and-mix-and-or-rebar3
elif [ ! -z "${INSTALL_DIR_FOR_OTP-}" ] && [ ! -z "${INSTALL_DIR_FOR_ELIXIR-}" ]
then then
# For github runners to build for non-native systems:
# https://github.com/erlef/setup-beam#environment-variables
native_otp_bin="$INSTALL_DIR_FOR_OTP/bin" native_otp_bin="$INSTALL_DIR_FOR_OTP/bin"
native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR/bin" native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR/bin"
export PATH="$native_elixir_bin:$PATH" export PATH="$native_elixir_bin:$PATH"
@ -472,8 +471,8 @@ build_toolchain()
{ {
local target="$1" local target="$1"
local prefix="$2" local prefix="$2"
local libc="$3"
local arch=$(arch_name "$target") local arch=$(arch_name "$target")
local libc="${target##*-}"
if [ -d "$prefix" ] if [ -d "$prefix" ]
then then
@ -513,8 +512,8 @@ build_deps()
local mode="$1" local mode="$1"
local target="$2" local target="$2"
local prefix="$3" local prefix="$3"
local libc="$4"
local arch="$(arch_name "$target")" local arch="$(arch_name "$target")"
local libc="${target##*-}"
local target_src_dir="$prefix/src" local target_src_dir="$prefix/src"
local saved_path="$PATH" local saved_path="$PATH"
@ -721,8 +720,8 @@ build_rel()
local mode="$1" local mode="$1"
local target="$2" local target="$2"
local prefix="$3" local prefix="$3"
local libc="$4"
local arch="$(arch_name "$target")" local arch="$(arch_name "$target")"
local libc="${target##*-}"
local rel_dir="$PWD/_build/prod" local rel_dir="$PWD/_build/prod"
local target_data_dir="$prefix/$rel_name" local target_data_dir="$prefix/$rel_name"
local target_dst_dir="$prefix/$rel_name-$rel_vsn" local target_dst_dir="$prefix/$rel_name-$rel_vsn"
@ -761,7 +760,7 @@ build_rel()
fi fi
if [ $have_current_deps = false ] if [ $have_current_deps = false ]
then build_deps "$mode" "$target" "$prefix" "$libc" then build_deps "$mode" "$target" "$prefix"
fi fi
add_otp_path "$mode" "$prefix" add_otp_path "$mode" "$prefix"
@ -908,16 +907,15 @@ export LC_ALL='C.UTF-8' # Elixir insists on a UTF-8 environment.
for target in $targets for target in $targets
do do
libc="$(echo $target | sed "s/\-/\ /g" | awk '{print $NF}')" prefix="$build_dir/$target"
prefix="$build_dir/$(arch_name "$target")-$libc"
toolchain_dir="$ct_prefix_dir/$target" toolchain_dir="$ct_prefix_dir/$target"
if [ "$(uname -m)-linux-$platform_libc" = "$target" ] if [ "$platform" = "$target" ]
then mode='native' then mode='native'
else mode='cross' else mode='cross'
fi fi
build_toolchain "$target" "$toolchain_dir" "$libc" build_toolchain "$target" "$toolchain_dir"
build_rel "$mode" "$target" "$prefix" "$libc" build_rel "$mode" "$target" "$prefix"
done done
save_built_dep_vsns save_built_dep_vsns