Better parametrization and defaults for madx build script

hibtc · Dec 15, 2024 · 0888fba · 0888fba
1 parent b7c6615
commit 0888fba
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.github/build/linux/cpymad.sh b/.github/build/linux/cpymad.sh
@@ -12,7 +12,7 @@
 set -ex
 
 # Build variables:
-export MADXDIR=$(readlink -nf "$1")
+export MADXDIRDIR="$(readlink -nf "${1:-/mnt/dist/MAD-X}")"
 export X11=0 BLAS=0 LAPACK=0
 export CFLAGS="-fno-lto"
 export LDFLAGS="-fno-lto"

diff --git a/.github/build/linux/madx.sh b/.github/build/linux/madx.sh
@@ -5,21 +5,22 @@
 #
 # Arguments:
 #   <SRCDIR>: root directory of MAD-X sources
-#
-# Outputs:
-#   <SRCDIR>/build: cmake build directory
-#   <SRCDIR>/dist:  MAD-X installation directory (binary distribution)
+#   <BUILDDIR>: cmake build directory
+#   <INSTALLDIR>: MAD-X installation directory (binary distribution)
 set -ex
 
-cd "$1"
-mkdir -p build
-cd build
+SRCDIR="$(readlink -nf "${1:-/mnt/src/MAD-X}")"
+BUILDDIR="$(readlink -nf "${2:-/mnt/build/MAD-X}")"
+INSTALLDIR="$(readlink -nf "${3:-/mnt/dist/MAD-X}")"
+
+mkdir -p "$BUILDDIR"
+cd "$BUILDDIR"
 
 if [[ ! -f CMakeCache.txt ]]; then
-    cmake .. \
+    cmake "$SRCDIR" \
         -DBUILD_SHARED_LIBS=OFF \
         -DMADX_STATIC=ON \
-        -DCMAKE_INSTALL_PREFIX=../dist \
+        -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_C_FLAGS="-fvisibility=hidden" \
         -DCMAKE_CXX_FLAGS="-fvisibility=hidden" \

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
             -w /mnt \
             -v `pwd`:/mnt \
             builder \
-            .github/build/linux/madx.sh src/MAD-X
+            .github/build/linux/madx.sh src/MAD-X build/MAD-X dist/MAD-X
         shell: bash
 
       - name: Build cpymad wheels
@@ -73,14 +73,16 @@ jobs:
             -w /mnt \
             -v `pwd`:/mnt \
             builder \
-            .github/build/linux/cpymad.sh src/MAD-X/dist
+            .github/build/linux/cpymad.sh dist/MAD-X
         shell: bash
 
       - name: Upload cpymad wheels
         uses: actions/upload-artifact@v4
         with:
           name: dist-linux-${{ matrix.base }}
-          path: dist
+          path: |
+            dist/
+            !dist/MAD-X
 
   build_windows:
     name: "Build: Windows"