using /opt/projects/gemc/g4install/macosx26-clang21-arm64 instead of /opt/projects/gemc/g4install/macosx26-clang21-arm64/gemc/dev for installation paths in ci builds

Author: maureeungaro

.github/workflows/codeql.yml

@@ -54,7 +54,15 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
-      
+        with:
+          fetch-depth: 0
+
+      - name: Verify CodeQL source root
+        shell: bash
+        run: |
+          git rev-parse --show-toplevel
+          test "$(git rev-parse --show-toplevel)" = "${GITHUB_WORKSPACE}"
+
       # Add any setup steps before running the `GitHub/codeql-action/init` action.
       # This includes steps like installing compilers or runtimes (`actions/setup-node`
       # or others). This is typically only required for manual builds.

.github/workflows/update-binder.yml

@@ -4,6 +4,9 @@ on:
   release:
     types: [ published ]
 
+permissions:
+  contents: read
+
 jobs:
   update-binder-repo:
     runs-on: ubuntu-latest
@@ -37,4 +40,4 @@ jobs:
           REPO="gemc%2Fbinder-tutorials"
           curl -s "https://mybinder.org/build/gh/${REPO}/main" \
             --max-time 300 --no-buffer | tail -5
-          echo "Binder pre-warm triggered for ${TAG}"
+          echo "Binder pre-warm triggered for ${TAG}"

ci/dockerfile_creator.py

@@ -46,7 +46,7 @@ def install_gemc(geant4_version: str, gemc_version: str) -> str:
     commands += f"     && DOCKER_ENTRYPOINT_SOURCE_ONLY=1 . {remote_entrypoint()} \\\n"
     commands += f'     && module load geant4/{geant4_version} \\\n'
     commands += f'     &&  ./ci/build.sh  \\\n'
-    commands += f'     && echo "module load gemc" >> {remote_entrypoint_addon()} \n'
+    commands += f'     && echo ". \\${{SIM_HOME}}/gemc/gemc.sh" >> {remote_entrypoint_addon()} \n'
     return commands
 
 

ci/env.sh

@@ -40,7 +40,7 @@ function show_gemc_installation {
 
 function meson_setup_options {
     # valid options: address, thread, undefined, memory, leak
-    local install_dir="${GEMC:?GEMC not set}"
+    local install_dir="${SIM_HOME:?SIM_HOME not set}/gemc"
 
     meson_options=""
     buildtype=" -Dbuildtype=debug "
@@ -87,6 +87,8 @@ function meson_setup_options {
     echo "${args[@]}"
 }
 
+export GEMC="${SIM_HOME:?SIM_HOME not set}/gemc"
+
 log_dir=$SIM_HOME/logs
 test_interactive_option=""
 
@@ -105,10 +107,6 @@ else
 	log_dir=/root/src/logs
 fi
 
-
-export GEMC=${SIM_HOME}/gemc/dev
-
-
 # detect cores and cap at 16
 cores=$(getconf _NPROCESSORS_ONLN 2>/dev/null || nproc)
 jobs=$((cores < 16 ? cores : 16))

meson/gemc.csh.in

@@ -0,0 +1,29 @@
+# Source this file to use this GEMC installation from csh or tcsh.
+
+setenv GEMC_HOME "@GEMC_PREFIX@"
+
+if ( $?PATH ) then
+    setenv PATH "${GEMC_HOME}/@GEMC_BINDIR@:${GEMC_HOME}/api:${PATH}"
+else
+    setenv PATH "${GEMC_HOME}/@GEMC_BINDIR@:${GEMC_HOME}/api"
+endif
+
+if ( $?LD_LIBRARY_PATH ) then
+    setenv LD_LIBRARY_PATH "${GEMC_HOME}/@GEMC_LIBDIR@:${LD_LIBRARY_PATH}"
+else
+    setenv LD_LIBRARY_PATH "${GEMC_HOME}/@GEMC_LIBDIR@"
+endif
+
+if ( $?DYLD_LIBRARY_PATH ) then
+    setenv DYLD_LIBRARY_PATH "${GEMC_HOME}/@GEMC_LIBDIR@:${DYLD_LIBRARY_PATH}"
+else
+    setenv DYLD_LIBRARY_PATH "${GEMC_HOME}/@GEMC_LIBDIR@"
+endif
+
+# GEMC's API modules live in GEMC_HOME/api. The analyzer package is installed
+# as GEMC_HOME/analyzer, so GEMC_HOME itself must also be on PYTHONPATH.
+if ( $?PYTHONPATH ) then
+    setenv PYTHONPATH "${GEMC_HOME}/api:${GEMC_HOME}:${PYTHONPATH}"
+else
+    setenv PYTHONPATH "${GEMC_HOME}/api:${GEMC_HOME}"
+endif

meson/gemc.sh.in

@@ -0,0 +1,11 @@
+# Source this file to use this GEMC installation from a Bourne-compatible shell.
+
+export GEMC_HOME="@GEMC_PREFIX@"
+
+export PATH="${GEMC_HOME}/@GEMC_BINDIR@:${GEMC_HOME}/api${PATH:+:${PATH}}"
+export LD_LIBRARY_PATH="${GEMC_HOME}/@GEMC_LIBDIR@${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+export DYLD_LIBRARY_PATH="${GEMC_HOME}/@GEMC_LIBDIR@${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}"
+
+# GEMC's API modules live in GEMC_HOME/api. The analyzer package is installed
+# as GEMC_HOME/analyzer, so GEMC_HOME itself must also be on PYTHONPATH.
+export PYTHONPATH="${GEMC_HOME}/api:${GEMC_HOME}${PYTHONPATH:+:${PYTHONPATH}}"

releases/0.2.md

@@ -79,4 +79,5 @@ Both x86_64 and ARM64 platforms are supported.
   on `PATH`
 - Cleaned up Meson test behavior by fixing duplicate test names and making
   ROOT-dependent tests conditional on ROOT availability
+- Using $SIM_HOME instead of $GEMC for installation paths
 - Various code cleanups