easy-builder: the immediate build retry does not fix the random linking issue on...

[xonotic/netradiant.git] / easy-builder

diff --git a/easy-builder b/easy-builder
index 82c08d90836a84dc99d4b832d77f780d554bceff..f38d0fc2692893c6980bdb72e906f7ede90d1432 100755 (executable)
--- a/easy-builder
+++ b/easy-builder
@@ -14,6 +14,11 @@ install_dir="${project_source_dir}/install${SUBDIR:+/${SUBDIR}}"
 install_target='install/strip'
 build_type='Release'
 
+if [ "$(uname -s)" = 'FreeBSD' ]
+then
+       install_target='install'
+fi
+
 _job_count=4
 
 _nproc () {
@@ -25,9 +30,13 @@ _nproc () {
                        'Linux')
                                egrep "^processor" /proc/cpuinfo | wc -l
                                ;;
-                       'FreeBSD'|'Darwin')
+                       'FreeBSD')
                                sysctl -n hw.ncpu
                                ;;
+                       'Darwin')
+                               sysctl -n hw.logicalcpu \
+                               || sysctl -n hw.ncpu
+                               ;;
                        'MSYS_NT-'*|'CYGWIN_NT-'*|'MINGW'*'_NT-'*)
                                if command -v 'wmic' >/dev/null
                                then
@@ -77,22 +86,52 @@ do
        fi
 done
 
+case "$(uname -s)" in
+       'Darwin')
+               cmake_user_opts[${#cmake_user_opts[@]}]='-DBUILTIN_GTKGLEXT=ON -DBUILTIN_GTKTHEME_MOJAVE=ON'
+               ;;
+esac
+
+task_enter_build_dir () {
+       mkdir -pv "${build_dir}"
+       cd "${build_dir}"
+}
+
+task_fetch_submodules () {
+       "${fetch_submodules_cmd[@]}"
+}
+
+task_configure () {
+       cmake \
+               -G'Unix Makefiles' \
+               -D'CMAKE_INSTALL_PREFIX'="${install_dir}" \
+               -D'CMAKE_BUILD_TYPE'="${build_type}" \
+               "${cmake_user_opts[@]}" \
+               "${project_source_dir}"
+}
+
+task_build_builtins () {
+       make -j"${job_count}" builtins
+}
+
+task_build () {
+       make -j"${job_count}"
+}
+
+task_install () {
+       make "${install_target}"
+}
+
 set -x
 
-"${fetch_submodules_cmd[@]}"
+task_enter_build_dir
+
+task_fetch_submodules
+
+task_configure
 
-mkdir -pv "${build_dir}"
-cd "${build_dir}"
+task_build_builtins
 
-cmake \
-       -G'Unix Makefiles' \
-       -D'CMAKE_INSTALL_PREFIX'="${install_dir}" \
-       -D'CMAKE_BUILD_TYPE'="${build_type}" \
-       "${cmake_user_opts[@]}" \
-       "${project_source_dir}"
+task_build
 
-cmake \
-       --build "${build_dir}" \
-       -- \
-       -j"${job_count}" \
-       "${install_target}"
+task_install