File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1010source ci/env.sh
1111meson_option=$( meson_setup_options $1 )
1212
13- echo " > Geant-config: $( which geant4-config) : $( geant4-config --version) " | tee $setup_log
14- echo " > Root-config: $( which root-config) : $( root-config --version) " | tee -a $setup_log
15- echo
16- echo " > Meson Interactive Options: $test_interactive_option "
17- echo " > Meson Setup Options: $meson_option "
18- echo " > Using $jobs cores"
19- echo
20-
21-
22- echo
23- echo " > Running meson setup build $=meson_option" | tee -a $setup_log
24- meson setup build $=meson_option >> $setup_log
13+ {
14+ echo " > Geant-config: $( command -v geant4-config) : $( geant4-config --version) "
15+ echo " > Root-config: $( command -v root-config) : $( root-config --version) "
16+ echo
17+ echo " > Meson Interactive Options: $test_interactive_option "
18+ echo " > Meson Setup Options: $meson_option "
19+ echo " > Using $jobs cores"
20+ echo
21+ } | tee -a " $setup_log "
22+
23+
24+ {
25+ echo
26+ echo " > Removing $GEMC directory"
27+ rm -rf $GEMC
28+ echo " > Running meson setup build $=meson_option"
29+ meson setup build $=meson_option
30+ } | tee -a $setup_log
31+
32+
2533if [ $? -ne 0 ]; then
2634 echo " > Meson Configure failed. Log: "
2735 cat $setup_log
You can’t perform that action at this time.
0 commit comments