Allow to build AliPhysics using ninja (#1272)

alisw · Oct 4, 2018 · 1353afa · 1353afa
1 parent 8716cc0
commit 1353afa
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 6 deletions.
diff --git a/aliphysics.sh b/aliphysics.sh
@@ -11,7 +11,7 @@ env:
 prepend_path:
   ROOT_INCLUDE_PATH: "$ALIPHYSICS_ROOT/include"
 incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
+  cmake --build . -- ${JOBS:+-j$JOBS} install
   ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
   cp -v compile_commands.json ${INSTALLROOT}
   DEVEL_SOURCES="$(readlink "$SOURCEDIR" || echo "$SOURCEDIR")"
@@ -37,6 +37,7 @@ cmake "$SOURCEDIR"                                                 \
       -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                        \
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON                           \
       -DROOTSYS="$ROOT_ROOT"                                       \
+      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                    \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"}  \
       ${ALIEN_RUNTIME_ROOT:+-DALIEN="$ALIEN_RUNTIME_ROOT"}         \
       ${FASTJET_ROOT:+-DFASTJET="$FASTJET_ROOT"}                   \
@@ -45,7 +46,7 @@ cmake "$SOURCEDIR"                                                 \
       ${GMP_ROOT:+-DGMP="$GMP_ROOT"}                               \
       -DALIROOT="$ALIROOT_ROOT"
 
-make ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
+cmake --build . -- ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
 # ctest will succeed if no load_library tests were found
 ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
 

diff --git a/aliroot.sh b/aliroot.sh
@@ -18,7 +18,7 @@ prepend_path:
   ROOT_INCLUDE_PATH: "$ALIROOT_ROOT/include"
 source: https://github.com/alisw/AliRoot
 incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
+  cmake --build . -- ${JOBS:+-j$JOBS} install
   ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
   cp -v ${BUILDDIR}/compile_commands.json ${INSTALLROOT}
   DEVEL_SOURCES="$(readlink "$SOURCEDIR" || echo "$SOURCEDIR")"
@@ -53,6 +53,7 @@ cmake $SOURCEDIR                                                     \
       -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                          \
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON                             \
       -DROOTSYS="$ROOT_ROOT"                                         \
+      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                      \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"}    \
       ${ALIEN_RUNTIME_ROOT:+-DALIEN="$ALIEN_RUNTIME_ROOT"}           \
       ${FASTJET_ROOT:+-DFASTJET="$FASTJET_ROOT"}                     \
@@ -68,7 +69,7 @@ cmake $SOURCEDIR                                                     \
       ${ALICE_SHUTTLE:+-DSHUTTLE=ON -DApMon=$ALIEN_RUNTIME_ROOT}     \
       -DOCDB_INSTALL=PLACEHOLDER
 
-make ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
+cmake --build . -- ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
 # ctest will succeed if no load_library tests were found
 ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
 [[ $ALICE_DAQ && ! $ALICE_DISABLE_DA_RPMS ]] && { make daqDA-all-rpm && make ${JOBS+-j $JOBS} install; }

diff --git a/defaults-root6-ninja.sh b/defaults-root6-ninja.sh
@@ -0,0 +1,72 @@
+package: defaults-root6-ninja
+version: v1
+env:
+  CXXFLAGS: "-fPIC -g -O2 -std=c++11"
+  CFLAGS: "-fPIC -g -O2"
+  CMAKE_BUILD_TYPE: "RELWITHDEBINFO"
+  CMAKE_GENERATOR: "Ninja"
+overrides:
+  CMake:
+    version: "%(tag_basename)s"
+    tag: "v3.11.0"
+    prefer_system_check: |
+      which cmake && case `cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3 | head -n1` in [0-2]*|3.[0-9].*|3.10.*) exit 1 ;; esac
+  GCC-Toolchain:
+    tag: v7.3.0-alice1
+    prefer_system_check: |
+      set -e
+      which gfortran || { echo "gfortran missing"; exit 1; }
+      which cc && test -f $(dirname $(which cc))/c++ && printf "#define GCCVER ((__GNUC__ << 16)+(__GNUC_MINOR__ << 8)+(__GNUC_PATCHLEVEL__))\n#if (GCCVER < 0x070300)\n#error \"System's GCC cannot be used: we need at least GCC 7.X. We are going to compile our own version.\"\n#endif\n" | cc -xc++ - -c -o /dev/null
+  XRootD:
+    build_requires:
+      - CMake
+      - "OpenSSL:(?!osx)"
+      - "osx-system-openssl:(osx.*)"
+      - ApMon-CPP
+      - libxml2
+      - "GCC-Toolchain:(?!osx)"
+      - ninja
+  ROOT:
+    tag: "v6-10-08"
+    source: https://github.com/root-mirror/root
+    requires:
+      - AliEn-Runtime:(?!.*ppc64)
+      - GSL
+      - opengl:(?!osx)
+      - Xdevel:(?!osx)
+      - FreeType:(?!osx)
+      - Python-modules
+      - "GCC-Toolchain:(?!osx)"
+      - libpng
+      - lzma
+    build_requires:
+      - CMake
+      - "Xcode:(osx.*)"
+      - ninja
+  GSL:
+    prefer_system_check: |
+      printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc  -I$(brew --prefix gsl)/include -xc++ - -o /dev/null
+  AliRoot:
+    version: "%(commit_hash)s_ROOT6"
+    tag: v5-09-38
+    build_requires:
+      - CMake
+      - "Xcode:(osx.*)"
+      - AliTPCCommon
+      - ninja
+  AliPhysics:
+    version: "%(commit_hash)s_ROOT6"
+    tag: v5-09-38-01
+    build-requires:
+      - "Xcode:(osx.*)"
+      - ninja
+  GEANT4:
+    tag: v10.3.3
+    source: https://gitlab.cern.ch/geant4/geant4.git
+  GEANT4_VMC:
+    tag: "v3-5"
+    source: https://github.com/vmc-project/geant4_vmc
+---
+# This file is included in any build recipe and it's only used to set
+# environment variables. Which file to actually include can be defined by the
+# "--defaults" option of alibuild.
diff --git a/xrootd.sh b/xrootd.sh
@@ -29,8 +29,7 @@ cmake "$SOURCEDIR"                                      \
       ${OPENSSL_ROOT:+-DOPENSSL_ROOT_DIR=$OPENSSL_ROOT} \
       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-Wno-error"     \
       -DZLIB_ROOT=$ZLIB_ROOT
-make ${JOBS:+-j$JOBS}
-make install
+cmake --build . -- ${JOBS:+-j$JOBS} install
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"