added archlinux, root not used if not found, improved build.sh

Author: maureeungaro

.github/workflows/build_and_test.yml

@@ -30,6 +30,9 @@ jobs:
             echo ""
             echo "For amd64 CPUS (for example, MacOS silicon):"
             echo '```bash'
+            echo 'VPORTS=(-p 6080:6080 -p 5900:5900)'
+            echo 'VNC_PASS=(-e X11VNC_PASSWORD=change-me)'
+            echo 'VNC_BIND=(-e VNC_BIND=0.0.0.0)'
             echo 'VPLATFORM="--platform=linux/amd64"'
             echo '```'
             echo "---"
@@ -111,6 +114,7 @@ jobs:
           # Add -amd64 suffix to the arch-specific image tag
           tags: ${{ steps.meta.outputs.tags }}-amd64
           labels: ${{ steps.meta.outputs.labels }}
+          # Comment these if the cache is old
           #cache-from: type=registry,ref=${{ needs.discover.outputs.image }}:cache-amd64
           #cache-to: type=registry,ref=${{ needs.discover.outputs.image }}:cache-amd64,mode=max
 
@@ -225,6 +229,7 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}-arm64
           labels: ${{ steps.meta.outputs.labels }}
+          # Comment these if the cache is old
           #cache-from: type=registry,ref=${{ needs.discover.outputs.image }}:cache-arm64
           #cache-to: type=registry,ref=${{ needs.discover.outputs.image }}:cache-arm64,mode=max
 

ci/build.sh

@@ -31,72 +31,67 @@ 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 " > Geant-config: $(which geant4-config) : $(geant4-config --version)" | tee $setup_log
 echo " > Root-config: $(which root-config) : $(root-config --version)" | tee -a $setup_log
 
 setup_options=" --native-file=core.ini $meson_option -Dprefix=$GEMC --wipe "
 
-echo " > Running build Configure with setup build options: $setup_options"  | tee -a $setup_log
-meson setup build $=setup_options  >> $setup_log
-if [ $? -ne 0 ]; then
-	echo "Build Configure failed. Log: "
-	cat $setup_log
-  exit 1
-else
-  echo Build Configure Successful
-  echo ; echo
-fi
+local mode="${1:-release}"
+local install_dir="${GEMC:?GEMC not set}"
+
+local args=(
+  "--native-file=core.ini"
+  "-Di_test=true"
+  "-Droot=enabled"
+  "-Dprefix=${install_dir}"
+)
 
-echo " > Applying patch to version 0.8.0"  | tee -a $setup_log
+echo " > Applying patch to version 0.8.0" | tee -a $setup_log
 meson subprojects update yaml-cpp --reset
-meson setup --reconfigure build
 
-cd build  || exit 1
-echo " > Running meson compile -v  -j $max_threads"  | tee $compile_log
-meson compile -v  -j $max_threads >> $compile_log
+echo " > Running build Configure with setup build options: ${args[@]}" | tee -a $setup_log
+	meson setup build "${args[@]}" --wipe >> $setup_log
 if [ $? -ne 0 ]; then
-	echo "Compile failed. Log: "
-	cat $compile_log
+  echo "Build Configure failed. Log: "
+  cat $setup_log
   exit 1
 else
-  echo Compile Successful
-  echo ; echo
+  echo Build Configure Successful
+  echo
+  echo
 fi
 
 
-echo " > Current directory: $(pwd) content:"  | tee -a  $compile_log
-ls -l  >> $compile_log
-
-echo " > Running meson install"   | tee -a $compile_log
-meson install   >> $compile_log
+echo " > Running meson install -v  -j $max_threads" | tee $compile_log
+	meson install -C build -v -j $max_threads >> $compile_log
 if [ $? -ne 0 ]; then
-	echo "Install failed. Log: "
-	cat $compile_log
+  echo "Compile or Install failed. Log: "
+  cat $compile_log
   exit 1
 else
-  echo Install Successful
-  echo ; echo
+  echo Compile Successful
+  echo
+  echo
 fi
 
-echo " > $GEMC recursive content:"  | tee -a $compile_log
-ls -lR $GEMC  >> $compile_log
+
+echo " > $GEMC recursive content:" | tee -a $compile_log
+ls -lR $GEMC >>$compile_log
 
 # if $1 is NOT one of sanitize option, run meson test
 if [[ $1 != @(address|thread|undefined|memory|leak) ]]; then
-  echo " > Running meson test" | tee  $test_log
-  meson test  -j 1 --print-errorlogs --no-rebuild --num-processes 1 >>  $test_log
+  echo " > Running meson test" | tee $test_log
+  meson test -C build  -j 1 --print-errorlogs --no-rebuild --num-processes 1 >>$test_log
   echo Successful: $(cat $test_log | grep "Ok:" | awk '{print $2}')
   echo Failures: $(cat $test_log | grep "Fail:" | awk '{print $2}')
 fi
 
 echo
-echo " ldd of $GEMC/bin/gemc:"   | tee -a $compile_log
+echo " ldd of $GEMC/bin/gemc:" | tee -a $compile_log
 
 # if on unix, use ldd , if on mac, use otool -L
 if [[ "$(uname)" == "Darwin" ]]; then
   otool -L $GEMC/bin/gemc
 else
-  ldd $GEMC/bin/gemc  | tee -a $compile_log
+  ldd $GEMC/bin/gemc | tee -a $compile_log
 fi
-

ci/distros_tags.sh

@@ -20,6 +20,7 @@ build_matrix() {
   {"osname":"fedora",    "image":"$(get_geant4_tag)-fedora-$(get_fedora_latest)",       "gemc_tag":"$(get_gemc_tag)", "geant4_tag":"$(get_geant4_tag)"},
   {"osname":"almalinux", "image":"$(get_geant4_tag)-almalinux-$(get_almalinux_latest)", "gemc_tag":"$(get_gemc_tag)", "geant4_tag":"$(get_geant4_tag)"},
   {"osname":"debian",    "image":"$(get_geant4_tag)-debian-$(get_debian_latest)",       "gemc_tag":"$(get_gemc_tag)", "geant4_tag":"$(get_geant4_tag)"}
+  {"osname":"archlinux", "image":"$(get_geant4_tag)-archlinux-$(get_archlinux_latest)", "gemc_tag":"$(get_gemc_tag)", "geant4_tag":"$(get_geant4_tag)"}
 ]}
 EOF
 	)
@@ -30,10 +31,6 @@ EOF
 	fi
 }
 
-#  {"image":"debian-$(get_debian_latest)", "gemc_tag":"$(get_gemc_tag)"}
-#  {"image":"archlinux-$(get_archlinux_latest)", "gemc_tag":"$(get_gemc_tag)"},
-
-
 # portable lowercasing (works on old bash, dash, zsh)
 lc() { printf '%s' "$1" | tr '[:upper:]' '[:lower:]'; }
 

ci/test.sh

@@ -1,5 +1,10 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
 
+with_gui = ['']
+if get_option('i_test')
+    with_gui = ['-gui']
+endif
+
 example_source = files('examples/test_dbselect.cc')
 examples_dir = get_option('prefix') + '/test/' + sub_dir_name
 dbhost = ['-sql=' + examples_dir + '/gemc.db']
@@ -10,12 +15,6 @@ verbosity = ['-verbosity.dbselect=2',
              '-verbosity.gsystem=2',
              '-debug.gsystem=true']
 
-with_gui = ['']
-if get_option('i_test')
-    with_gui = ['-gui']
-endif
-
-
 sources = files(
     'dbselect_options.cc',
     'dbselectView.cc',

dbselect/meson.build

@@ -33,23 +33,12 @@ examples = {
 }
 
 
-if get_option('i_test')
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
-        'examples' : examples
-    }
-else
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
-    }
-endif
+LD += {
+    'name' : sub_dir_name,
+    'sources' : sources,
+    'headers' : headers,
+    'moc_headers' : moc_headers,
+    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
+    'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
+    'examples' : examples
+}

g4dialog/meson.build

@@ -31,23 +31,12 @@ examples = {
 }
 
 
-if get_option('i_test')
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['gboard'],
-        'examples' : examples
-    }
-else
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['gboard'],
-    }
-endif
+LD += {
+    'name' : sub_dir_name,
+    'sources' : sources,
+    'headers' : headers,
+    'moc_headers' : moc_headers,
+    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
+    'additional_includes' : ['gboard'],
+    'examples' : examples
+}

gboard/meson.build

@@ -20,23 +20,13 @@ examples = {
     'test_gqtbuttons_widget' : [files('examples/gqtbuttons_example.cc'), ['-gui']],
 }
 
-if get_option('i_test')
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'qrc_examples_sources' : qrc_examples_sources,
-        'dependencies' : [yaml_cpp_dep, qt6_deps],
-        'examples' : examples
-    }
-else
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'moc_headers' : moc_headers,
-        'qrc_examples_sources' : qrc_examples_sources,
-        'dependencies' : [yaml_cpp_dep, qt6_deps]
-    }
-endif
+LD += {
+    'name' : sub_dir_name,
+    'sources' : sources,
+    'headers' : headers,
+    'moc_headers' : moc_headers,
+    'qrc_examples_sources' : qrc_examples_sources,
+    'dependencies' : [yaml_cpp_dep, qt6_deps],
+    'examples' : examples
+}
+

gqtbuttonswidget/meson.build

@@ -29,21 +29,11 @@ examples = {
 }
 
 
-if get_option('i_test')
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'qrc_examples_sources' : qrc_examples_sources,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, geant4_deps, expat_dep],
-        'examples' : examples
-    }
-else
-    LD += {
-        'name' : sub_dir_name,
-        'sources' : sources,
-        'headers' : headers,
-        'qrc_examples_sources' : qrc_examples_sources,
-        'dependencies' : [yaml_cpp_dep, qt6_deps, geant4_deps, expat_dep]
-    }
-endif
+LD += {
+    'name' : sub_dir_name,
+    'sources' : sources,
+    'headers' : headers,
+    'qrc_examples_sources' : qrc_examples_sources,
+    'dependencies' : [yaml_cpp_dep, qt6_deps, geant4_deps, expat_dep],
+    'examples' : examples
+}