updated build scripts

Author: maureeungaro

ci/build.sh

@@ -8,53 +8,24 @@
 # ./ci/build.sh
 
 source ci/env.sh
-
-# module gemc gives $GEMC (used in meson prefix) and PKG_CONFIG_PATH
-# not strickly necessary, one could set those manually
-module load gemc/dev
-echo GEMC for prefix set to: $GEMC
-echo
-
 meson_option=$(meson_options $1)
 
-mkdir -p /root/src/logs
-setup_log=/root/src/logs/setup.log
-compile_log=/root/src/logs/build.log
-test_log=/root/src/logs/test.log
-
-touch $setup_log $compile_log $test_log
-
-echo Logs:
-
-ls -l $setup_log
-ls -l $compile_log
-ls -l $test_log
-
 echo " > Geant-config: $(which geant4-config) : $(geant4-config --version)" | tee $setup_log
 echo " > Root-config: $(which root-config) : $(root-config --version)" | tee -a $setup_log
+echo Meson Options: $meson_option
+exit
 
-setup_options=" --native-file=core.ini $meson_option -Dprefix=$GEMC --wipe "
-
-local mode="${1:-release}"
-local install_dir="${GEMC:?GEMC not set}"
-
-local args=(
-  "--native-file=core.ini"
-  "-Droot=enabled"
-  "-Dprefix=${install_dir}"
-)
-
-# detect cores and cap at 32
+# detect cores and cap at 16
 cores=$(getconf _NPROCESSORS_ONLN 2>/dev/null || nproc)
-jobs=$((cores < 32 ? cores : 32))
+jobs=$((cores < 16 ? cores : 16))
 
 meson subprojects download yaml-cpp
 meson subprojects download assimp
 echo " > Applying patch to version 0.8.0" | tee -a $setup_log
 meson subprojects update yaml-cpp --reset
 echo
 echo " > Running meson setup build ${args[@]}" | tee -a $setup_log
-meson setup build "${args[@]}" - >> $setup_log
+meson setup build "meson_option" - >> $setup_log
 if [ $? -ne 0 ]; then
   echo "Build Configure failed. Log: "
   cat $setup_log

ci/env.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env zsh
 
-
-DetectorDirNotExisting() {
-	echo "System directory: $system not existing"
-	exit 3
+# enable git describe --tags, needed by meson
+function enable_git_describe {
+  is_shallow=$(git rev-parse --is-shallow-repository)
+  if [ "$is_shallow" = "true" ]; then
+    echo "Repository is_shallow: $is_shallow"
+    echo " > Fetching all tags"
+    git fetch --tags --unshallow
+  fi
 }
 
-function show_installation {
+function show_gemc_installation {
   echo
   echo "- Content of \$GEMC=$GEMC"
   ls -lrt $GEMC
@@ -20,8 +24,9 @@ function show_installation {
   fi
 }
 
-function meson_options {
+function meson_setup_options {
     # valid options: address, thread, undefined, memory, leak
+    local install_dir="${GEMC:?GEMC not set}"
 
     meson_options=""
     buildtype=" -Dbuildtype=debug "
@@ -55,35 +60,45 @@ function meson_options {
             ;;
     esac
 
-    echo $meson_options $buildtype
-}
+    additional_args=(
+                    		"--native-file=core.ini"
+                    		"-Di_test=true"
+                    		"-Droot=enabled"
+                    		"-Dprefix=${install_dir}"
+                    		"-Dpkg_config_path=$PKG_CONFIG_PATH:${install_dir}/lib/pkgconfig"
+                    	)
 
+    echo $meson_options $buildtype "${additional_args[@]}"
+}
 
-	# recent versions of Git refuse to touch a repository whose on-disk owner
-	# doesn’t match the UID that is running the command
-	# mark the workspace (and any nested path) as safe
-	echo "Marking workspace as safe for Git"
-	git config --global --add safe.directory '*'
 
-is_shallow=$(git rev-parse --is-shallow-repository)
+# recent versions of Git refuse to touch a repository whose on-disk owner
+# doesn’t match the UID that is running the command
+# mark the workspace (and any nested path) as safe
+echo "Marking workspace as safe for Git"
+git config --global --add safe.directory '*'
 
-if [ "$is_shallow" = "true" ]; then
-  echo "Repository is_shallow: $is_shallow"
-  echo " > Fetching all tags"
-  git fetch --tags --unshallow
-fi
+enable_git_describe
+log_dir=$SIM_HOME/logs
 
 # if we are in the docker container, we need to load the modules
 if [[ -z "${AUTOBUILD}" ]]; then
 	echo "\nNot in container"
 else
 	echo "\nIn docker container."
-	if [[ -n "${GITHUB_WORKFLOW}" ]]; then
-		echo "GITHUB_WORKFLOW: ${GITHUB_WORKFLOW}"
-	fi
-	source /etc/profile.d/local_g4setup.sh
-	echo
+	log_dir=/root/src/logs
 fi
 
-export ARTIFACT_DIR=$RUNNER_TEMP/artifacts
-mkdir -p $ARTIFACT_DIR
+export $GEMC=$SIM_HOME/gemc/dev
+
+setup_log=/root/src/logs/setup.log
+compile_log=/root/src/logs/build.log
+test_log=/root/src/logs/test.log
+
+touch $setup_log $compile_log $test_log
+
+echo Logs:
+
+ls -l $setup_log
+ls -l $compile_log
+ls -l $test_log