From 2342c2a317cdc0f30297bf85c147adae7246f719 Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Tue, 18 Feb 2025 10:49:33 +0100 Subject: [PATCH 1/3] chore: remove recipes for unused packages --- CHANGELOG.md | 1 + alidpg.sh | 27 --------- alien-cas.sh | 12 ---- alien-runtime.sh | 58 ------------------ alien-workqueue.sh | 35 ----------- aligenerators.sh | 50 ---------------- aligenmc.sh | 27 --------- aliphysics.sh | 70 ---------------------- aliroot-coverage.sh | 20 ------- aliroot-csa.sh | 32 ---------- aliroot-guntest.sh | 20 ------- aliroot-ocdb.sh | 24 -------- aliroot-test.sh | 70 ---------------------- aliroot.sh | 94 ----------------------------- apmon-cpp.sh | 35 ----------- arrow.sh | 51 ---------------- cern-get-sso-cookie.sh | 34 ----------- cpprestsdk.sh | 41 ------------- dds.sh | 42 ------------- defaults-release.sh | 6 -- epos-test.sh | 13 ---- epos.sh | 66 --------------------- flpproto.sh | 81 ------------------------- geantv.sh | 47 --------------- geekbench.sh | 29 --------- glog.sh | 33 ----------- hijing.sh | 36 ----------- igprof-packaging.sh | 98 ------------------------------ igprof.sh | 17 ------ libatomic_ops.sh | 15 ----- mesos-dds.sh | 35 ----------- mesos-workqueue.sh | 46 -------------- mesos.sh | 48 --------------- millepedeii.sh | 30 ---------- monalisa-gsoap-client.sh | 20 ------- motif.sh | 7 --- o2.sh | 125 --------------------------------------- o2checkcode.sh | 84 -------------------------- o2codechecker.sh | 39 ------------ ocdb-test.sh | 12 ---- osx-system-openssl.sh | 9 --- parquet-cpp.sh | 44 -------------- pda.sh | 39 ------------ rivet-test.sh | 50 ---------------- rivet.sh | 81 ------------------------- roounfold.sh | 34 ----------- sherpa.sh | 52 ---------------- sip-check.sh | 15 ----- template-recipe.sh | 36 ----------- thepeg-test.sh | 42 ------------- thepeg.sh | 95 ----------------------------- xalienfs.sh | 38 ------------ xcode.sh | 8 --- 53 files changed, 1 insertion(+), 2172 deletions(-) delete mode 100644 alidpg.sh delete mode 100644 alien-cas.sh delete mode 100644 alien-runtime.sh delete mode 100644 alien-workqueue.sh delete mode 100644 aligenerators.sh delete mode 100644 aligenmc.sh delete mode 100644 aliphysics.sh delete mode 100644 aliroot-coverage.sh delete mode 100644 aliroot-csa.sh delete mode 100644 aliroot-guntest.sh delete mode 100644 aliroot-ocdb.sh delete mode 100644 aliroot-test.sh delete mode 100644 aliroot.sh delete mode 100644 apmon-cpp.sh delete mode 100644 arrow.sh delete mode 100644 cern-get-sso-cookie.sh delete mode 100644 cpprestsdk.sh delete mode 100644 dds.sh delete mode 100644 epos-test.sh delete mode 100644 epos.sh delete mode 100644 flpproto.sh delete mode 100644 geantv.sh delete mode 100644 geekbench.sh delete mode 100644 glog.sh delete mode 100644 hijing.sh delete mode 100644 igprof-packaging.sh delete mode 100644 igprof.sh delete mode 100644 libatomic_ops.sh delete mode 100644 mesos-dds.sh delete mode 100644 mesos-workqueue.sh delete mode 100644 mesos.sh delete mode 100644 millepedeii.sh delete mode 100644 monalisa-gsoap-client.sh delete mode 100644 motif.sh delete mode 100644 o2.sh delete mode 100644 o2checkcode.sh delete mode 100644 o2codechecker.sh delete mode 100644 ocdb-test.sh delete mode 100644 osx-system-openssl.sh delete mode 100644 parquet-cpp.sh delete mode 100644 pda.sh delete mode 100644 rivet-test.sh delete mode 100644 rivet.sh delete mode 100644 roounfold.sh delete mode 100644 sherpa.sh delete mode 100644 sip-check.sh delete mode 100644 template-recipe.sh delete mode 100644 thepeg-test.sh delete mode 100644 thepeg.sh delete mode 100644 xalienfs.sh delete mode 100644 xcode.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index f11a2be..1ea9dd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it * Alpaca: Unused, unmaintained and doesn't include all relevant production mechanisms for our use +* Remove unused recipes ## [24.10](https://github.com/ShipSoft/shipdist/tree/24.10) diff --git a/alidpg.sh b/alidpg.sh deleted file mode 100644 index c890e5b..0000000 --- a/alidpg.sh +++ /dev/null @@ -1,27 +0,0 @@ -package: AliDPG -version: "%(tag_basename)s" -tag: master -source: https://github.com/alisw/AliDPG ---- -#!/bin/bash -e -rsync -a --exclude='**/.git' --delete --delete-excluded \ - $SOURCEDIR/ $INSTALLROOT/ - -# Modulefile -mkdir -p etc/modulefiles -cat > etc/modulefiles/$PKGNAME < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < etc/modulefiles/$PKGNAME < "$MODULEFILE" < $INSTALLROOT/etc/gcov-setup.sh -export GCOV_PREFIX=${GCOV_PREFIX:-"$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION"} -export GCOV_PREFIX_STRIP=$(echo $INSTALLROOT | sed -e 's|/$||;s|^/||;s|//*|/|g;s|[^/]||g' | wc -c | sed -e 's/[^0-9]*//') -EOF -source $INSTALLROOT/etc/gcov-setup.sh -fi - -cmake $SOURCEDIR \ - -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ - -DROOTSYS="$ROOT_ROOT" \ - ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"} \ - ${ALIEN_RUNTIME_ROOT:+-DALIEN="$ALIEN_RUNTIME_ROOT"} \ - ${FASTJET_ROOT:+-DFASTJET="$FASTJET_ROOT"} \ - ${DPMJET_ROOT:+-DDPMJET="$DPMJET_ROOT"} \ - ${ZEROMQ_ROOT:+-DZEROMQ=$ZEROMQ_ROOT} \ - ${ALICE_DAQ:+-DDA=ON -DDARPM=ON -DdaqDA=$DAQ_DALIB} \ - ${ALICE_DAQ:+-DAMORE_CONFIG=$AMORE_CONFIG} \ - ${ALICE_DAQ:+-DDATE_CONFIG=$DATE_CONFIG} \ - ${ALICE_DAQ:+-DDATE_ENV=$DATE_ENV} \ - ${ALICE_DAQ:+-DDIMDIR=$DAQ_DIM -DODIR=linux} \ - ${ALICE_SHUTTLE:+-DDIMDIR=$HOME/dim -DODIR=linux} \ - ${ALICE_SHUTTLE:+-DSHUTTLE=ON -DApMon=$ALIEN_RUNTIME_ROOT} \ - -DOCDB_INSTALL=PLACEHOLDER - -make ${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; } - -rsync -av $SOURCEDIR/test/ $INSTALLROOT/test - -[[ $CMAKE_BUILD_TYPE == COVERAGE ]] \ - && mkdir -p "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/" \ - && rsync -acv --filter='+ */' --filter='+ *.c' --filter='+ *.cxx' --filter='+ *.cpp' --filter='+ *.cc' --filter='+ *.hpp' --filter='+ *.h' --filter='+ *.gcno' --filter='- *' "$BUILDDIR/" "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/" - -# Modulefile -mkdir -p etc/modulefiles -cat > etc/modulefiles/$PKGNAME < etc/modulefiles/$PKGNAME < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < /dev/null 2>&1 || true -[ -d "$INST_SUBROOT/Unu/Lib/epos$EPOVSN" ] - -# Modulefile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" < etc/modulefiles/$PKGNAME < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" < post-install -#!/bin/sh -ldconfig -EOF - -fpm -s dir -t $PACKAGE_FORMAT \ - --after-install post-install \ - -d "libunwind = `echo $RPM_LIBUNWIND_VERSION | tr - _`" \ - --iteration $IGPROF_REVISION \ - -a $RPM_ARCH \ - -v $IGPROF_VERSION \ - -n igprof \ - -C igprof \ - usr/bin usr/lib usr/include - -fpm -s dir -t $PACKAGE_FORMAT --iteration $LIBUNWIND_REVISION -a $RPM_ARCH -v $RPM_LIBUNWIND_VERSION -n libunwind -C libunwind usr/lib usr/include -fpm -s dir -t $PACKAGE_FORMAT --iteration $LIBATOMIC_OPS_REVISION -a $RPM_ARCH -v $LIBATOMIC_OPS_VERSION -n libatomic_ops -C libatomic_ops usr/lib usr/include - -cat << EOF > packaging.yaml -architecture: $ARCHITECTURE -organization: igprof -description: IgProf test repository -format: $PACKAGE_FORMAT -labels: - - profiling - - development -packages: - - name: igprof - version: $IGPROF_VERSION - file: igprof$VERSION_SEP$IGPROF_VERSION-$IGPROF_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT - licenses: - - GPL-2.0 - vcs_url: "https://github.com/igprof/igprof.git" - website_url: http://igprof.org - labels: - - profiling - - development - - name: libunwind - version: $LIBUNWIND_VERSION - file: libunwind$VERSION_SEP$RPM_LIBUNWIND_VERSION-$LIBUNWIND_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT - licenses: - - GPL-2.0 - vcs_url: "https://github.com/igprof/libunwind" - labels: - - profiling - - development - - name: libatomic_ops - version: $RPM_LIBATOMIC_OPS_VERSION - file: $RPM_LIBATOMIC_OPS_NAME$VERSION_SEP$RPM_LIBATOMIC_OPS_VERSION-$LIBATOMIC_OPS_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT - licenses: - - GPL-2.0 - vcs_url: "https://github.com/igprof/libatomic_ops" - labels: - - profiling - - development -level: test -EOF - -ls -$SOURCEDIR/upload-bintray-distribution -u ktf packaging.yaml diff --git a/igprof.sh b/igprof.sh deleted file mode 100644 index 65ced18..0000000 --- a/igprof.sh +++ /dev/null @@ -1,17 +0,0 @@ -package: IgProf -version: 5.9.16 -source: https://github.com/igprof/igprof -tag: v5.9.16 -requires: - - libunwind - - CMake ---- -#!/bin/sh - -cmake $SOURCEDIR \ - -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - -DUNWIND_INCLUDE_DIR=$LIBUNWIND_ROOT/include \ - -DUNWIND_LIBRARY=$LIBUNWIND_ROOT/lib/libunwind.so \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -U_FORTIFY_SOURCE -Wno-attributes" -make ${JOBS+-j $JOBS} -make install diff --git a/libatomic_ops.sh b/libatomic_ops.sh deleted file mode 100644 index b87cefe..0000000 --- a/libatomic_ops.sh +++ /dev/null @@ -1,15 +0,0 @@ -package: libatomic_ops -version: libatomic_ops-7_4_2 -source: https://github.com/ivmai/libatomic_ops/ -tag: master -build_requires: - - autotools:(slc[56].*|ubt.*) ---- -#!/bin/sh -rsync -a $SOURCEDIR/ ./ -libtoolize -autoreconf -ivf -./configure --prefix=$INSTALLROOT - -make ${JOBS+-j $JOBS} -make install diff --git a/mesos-dds.sh b/mesos-dds.sh deleted file mode 100644 index 94ddea6..0000000 --- a/mesos-dds.sh +++ /dev/null @@ -1,35 +0,0 @@ -package: mesos-dds -version: master -source: https://github.com/alisw/mesos-dds -requires: -- mesos -- protobuf -- boost -- glog -- cpprestsdk -- DDS -build_requires: -- CMake -tag: master ---- -#!/bin/sh - -case $ARCHITECTURE in - osx*) - [[ ! $BOOST_ROOT ]] && BOOST_ROOT=$(brew --prefix boost) - [[ ! $MESOS_ROOT ]] && MESOS_ROOT=$(brew --prefix mesos) - ;; -esac - -cmake "$SOURCEDIR" \ - -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - -DPROTOBUF_ROOT=${PROTOBUF_ROOT} \ - ${MESOS_ROOT:+-DMESOS_ROOT=${MESOS_ROOT}} \ - ${BOOST_ROOT:+-DBOOST_ROOT=${BOOST_ROOT}} \ - -DGLOG_ROOT=${GLOG_ROOT} \ - -DCPPRESTSDK_ROOT=${CPPRESTSDK_ROOT} \ - -DDDS_ROOT=${DDS_ROOT} - -make ${JOBS:+-j $JOBS} -make install - diff --git a/mesos-workqueue.sh b/mesos-workqueue.sh deleted file mode 100644 index 416a0f5..0000000 --- a/mesos-workqueue.sh +++ /dev/null @@ -1,46 +0,0 @@ -package: mesos-workqueue -version: 0.0.2-%(short_hash)s -source: https://github.com/alisw/mesos-workqueue -tag: master -requires: -- mesos -- protobuf -- boost -- glog -build_requires: -- CMake ---- -case $ARCHITECTURE in - osx*) - [[ -z "$BOOST_ROOT" ]] && BOOST_ROOT=$(brew --prefix boost) - ;; -esac -cmake "$SOURCEDIR" \ - -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - -DPROTOBUF_ROOT=${PROTOBUF_ROOT} \ - -DMESOS_ROOT=${MESOS_ROOT} \ - ${BOOST_ROOT:+-DBOOST_ROOT=${BOOST_ROOT}} \ - -DGLOG_ROOT=${GLOG_ROOT} -make ${JOBS:+-j $JOBS} -make install - -#ModuleFile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" < "$MODULEFILE" < "$MODULEFILE" <\nint main() {}\n" | cc -xc - -o /dev/null ---- diff --git a/o2.sh b/o2.sh deleted file mode 100644 index 8494f41..0000000 --- a/o2.sh +++ /dev/null @@ -1,125 +0,0 @@ -package: O2 -version: dev -requires: - - FairRoot - - AliRoot - - DDS - - Vc - - hijing -source: https://github.com/AliceO2Group/AliceO2 -tag: dev -prepend_path: - ROOT_INCLUDE_PATH: "$O2_ROOT/include" -incremental_recipe: | - make ${JOBS:+-j$JOBS} install - mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles - # install the compilation database so that we can post-check the code - cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT} - - DEVEL_SOURCES="`readlink $SOURCEDIR || echo $SOURCEDIR`" - # This really means we are in development mode. We need to make sure we - # use the real path for sources in this case. We also copy the - # compile_commands.json file so that IDEs can make use of it directly, this - # is a departure from our "no changes in sourcecode" policy, but for a good reason - # and in any case the file is in gitignore. - if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then - perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json - ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json - fi - if [[ $ALIBUILD_O2_TESTS ]]; then - export O2_ROOT=$INSTALLROOT - CTEST_OUTPUT_ON_FAILURE=1 make test - fi -valid_defaults: - - o2 - - o2-daq - - o2-dev-fairroot ---- -#!/bin/sh -export ROOTSYS=$ROOT_ROOT - -# Making sure people do not have SIMPATH set when they build fairroot. -# Unfortunately SIMPATH seems to be hardcoded in a bunch of places in -# fairroot, so this really should be cleaned up in FairRoot itself for -# maximum safety. -unset SIMPATH - -case $ARCHITECTURE in - osx*) - # If we preferred system tools, we need to make sure we can pick them up. - [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost` - [[ ! $ZEROMQ_ROOT ]] && ZEROMQ_ROOT=`brew --prefix zeromq` - [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl` - [[ ! $PROTOBUF_ROOT ]] && PROTOBUF_ROOT=`brew --prefix protobuf` - SONAME=dylib - ;; - *) SONAME=so ;; -esac - -cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - -DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules_old" \ - -DFairRoot_DIR=$FAIRROOT_ROOT \ - -DALICEO2_MODULAR_BUILD=ON \ - -DROOTSYS=$ROOTSYS \ - ${PYTHIA6_ROOT:+-DPythia6_LIBRARY_DIR=$PYTHIA6_ROOT/lib} \ - ${GEANT3_ROOT:+-DGeant3_DIR=$GEANT3_ROOT} \ - ${GEANT4_ROOT:+-DGeant4_DIR=$GEANT4_ROOT} \ - -DFAIRROOTPATH=$FAIRROOT_ROOT \ - ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT} \ - ${DDS_ROOT:+-DDDS_PATH=$DDS_ROOT} \ - -DZMQ_DIR=$ZEROMQ_ROOT \ - -DZMQ_INCLUDE_DIR=$ZEROMQ_ROOT/include \ - -DALIROOT=$ALIROOT_ROOT \ - -DPROTOBUF_INCLUDE_DIR=$PROTOBUF_ROOT/include \ - -DPROTOBUF_PROTOC_EXECUTABLE=$PROTOBUF_ROOT/bin/protoc \ - -DPROTOBUF_LIBRARY=$PROTOBUF_ROOT/lib/libprotobuf.$SONAME \ - ${GSL_ROOT:+-DGSL_DIR=$GSL_ROOT} \ - ${PYTHIA_ROOT:+-DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include} \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - -if [[ $GIT_TAG == master ]]; then - CONTINUE_ON_ERROR=true -fi -make ${CONTINUE_ON_ERROR+-k} ${JOBS+-j $JOBS} install - -# install the compilation database so that we can post-check the code -cp compile_commands.json ${INSTALLROOT} - -DEVEL_SOURCES="`readlink $SOURCEDIR || echo $SOURCEDIR`" -# This really means we are in development mode. We need to make sure we -# use the real path for sources in this case. We also copy the -# compile_commands.json file so that IDEs can make use of it directly, this -# is a departure from our "no changes in sourcecode" policy, but for a good reason -# and in any case the file is in gitignore. -if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then - perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json - ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json -fi - -# Modulefile -mkdir -p etc/modulefiles -cat > etc/modulefiles/$PKGNAME < $BUILDDIR/changed - if [[ $(cat $BUILDDIR/changed | wc -l) -le 50 ]]; then - O2_CHECKCODE_CHANGEDFILES=$(while read FILE; do [[ -e "$O2_SRC/$FILE" ]] && echo "$FILE" || true; done < <(cat $BUILDDIR/changed) | \ - xargs echo | sed -e 's/ /:/g') - if [[ ! $O2_CHECKCODE_CHANGEDFILES ]]; then - echo "Nothing changed with respect to base commit: not checking anything" - exit 0 - fi - fi - popd -fi - -# Call a tool to filter out unwanted sources (ROOT dicts, etc) from the compilations database. -# Further, also optionally restrict the checks on a specific set of files, which can be passed here via means of the -# environment variable O2_CHECKCODE_CHANGEDFILES. The environment variable is supposed to hold a colon separated list of files. -ThinCompilationsDatabase.py -exclude-files '(?:.*G\_\_.*\.cxx|.*\.pb.cc)' ${O2_CHECKCODE_CHANGEDFILES:+-use-files ${O2_CHECKCODE_CHANGEDFILES}} -cp thinned_compile_commands.json compile_commands.json - -# List of enabled C++ checks (make sure they are all green) -CHECKS="${O2_CHECKER_CHECKS:--*,modernize-*,-modernize-use-default,-modernize-pass-by-value,-modernize-use-auto,-modernize-use-bool-literals,-modernize-use-using,-modernize-loop-convert,-modernize-use-bool-literals,-modernize-make-unique,aliceO2-member-name}" - -# Run C++ checks -run_O2CodeChecker.py -clang-tidy-binary $(which O2codecheck) -header-filter=.*SOURCES.* ${O2_CHECKER_FIX:+-fix} -checks=${CHECKS} 2>&1 | tee error-log.txt - -# Turn warnings into errors -sed -e 's/ warning:/ error:/g' error-log.txt > error-log.txt.0 && mv error-log.txt.0 error-log.txt - -# Run copyright notice check -COPYRIGHT="$(cat <<'EOF' -// Copyright CERN and copyright holders of ALICE O2. This software is -// distributed under the terms of the GNU General Public License v3 (GPL -// Version 3), copied verbatim in the file "COPYING". -// -// See https://alice-o2.web.cern.ch/ for full licensing information. -// -// In applying this license CERN does not waive the privileges and immunities -// granted to it by virtue of its status as an Intergovernmental Organization -// or submit itself to any jurisdiction. -EOF -)" -COPYRIGHT_LINES=$(echo "$COPYRIGHT" | wc -l) -set +x -while read FILE; do - FILE="$O2_SRC/$FILE" - [[ "$(head -n$COPYRIGHT_LINES "$FILE")" == "$COPYRIGHT" ]] || { printf "$FILE:1:1: error: missing or malformed copyright notice\n" >> error-log.txt; } -done < <([[ $O2_CHECKCODE_CHANGEDFILES ]] && echo "$O2_CHECKCODE_CHANGEDFILES" | sed -e 's/:/\n/g' \ - || (cd "$O2_SRC"; find . -name '*.cxx' -o -name '*.h')) - -# Tell user what to do in case of copyright notice error -if grep -q "malformed copyright notice" error-log.txt; then - printf "\nerror: Some files are missing the correct copyright notice on top.\n" - printf "error: Make sure all your source files begin with the following exact lines:\nerror:\n" - while read LINE; do printf "error: $LINE\n"; done < <(echo "$COPYRIGHT") - printf "error:\nerror: List of non-compliant files will follow.\n\n" -fi - -# Filter the actual errors from the log. Break with nonzero if errors are found -! ( grep " error:" error-log.txt ) diff --git a/o2codechecker.sh b/o2codechecker.sh deleted file mode 100644 index 08b23f6..0000000 --- a/o2codechecker.sh +++ /dev/null @@ -1,39 +0,0 @@ -package: o2codechecker -version: "%(tag_basename)s%(defaults_upper)s" -requires: - - Clang -build_requires: - - CMake -source: https://github.com/AliceO2Group/O2CodeChecker.git -tag: master -incremental_recipe: | - make ${JOBS+-j$JOBS} install - mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles ---- -#!/bin/bash -e -cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ - -DClang_DIR=$CLANG_ROOT/lib/cmake/clang \ - -DLLVM_DIR=$CLANG_ROOT/lib/cmake/llvm -make ${JOBS+-j$JOBS} install -ctest - -# Modulefile -mkdir -p etc/modulefiles -cat > etc/modulefiles/$PKGNAME <' | c++ -x c++ - -I`brew --prefix openssl`/include -c -o /dev/null ---- - diff --git a/parquet-cpp.sh b/parquet-cpp.sh deleted file mode 100644 index 5c68318..0000000 --- a/parquet-cpp.sh +++ /dev/null @@ -1,44 +0,0 @@ -package: parquet-cpp -version: release-0.1-rc0 -source: https://github.com/apache/parquet-cpp -build_requires: -- protobuf -- snappy -- zlib -- thrift -build_requires: -- CMake -- googletest ---- - -export THRIFT_HOME=$(brew --prefix thrift) -cmake $SOURCEDIR \ - -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ - ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT} \ - ${BOOST_ROOT:+-DBoost_DIR=$BOOST_ROOT} \ - ${BOOST_ROOT:+-DBoost_INCLUDE_DIR=$BOOST_ROOT/include} - -make ${JOBS+-j $JOBS} -make install - -#ModuleFile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" < etc/modulefiles/$PKGNAME < DIPSYpp_HepMC.in <<\EOF -read Tune27.in -cd /DIPSY -cp EventHandler LHCEventHandler -set LHCEventHandler:WFL stdProton -set LHCEventHandler:WFR stdProton -set LHCEventHandler:ConsistencyLevel 0 -set LHCEventHandler:XSecFn:CheckOffShell false -set LHCEventHandler:CascadeHandler NULL -set LHCEventHandler:HadronizationHandler NULL -set LHCEventHandler:DecayHandler NULL -create ThePEG::FixedCMSLuminosity LHCLumi -set LHCEventHandler:LuminosityFunction LHCLumi -cp Generator LHCGenerator -set LHCGenerator:EventHandler LHCEventHandler -set LHCEventHandler:EffectivePartonMode Colours -set LHCGenerator:EventHandler:DecayHandler /Defaults/Handlers/StandardDecayHandler -set LHCGenerator:EventHandler:HadronizationHandler Frag8 -set LHCEventHandler:WFL Proton -set LHCEventHandler:WFR Proton -set LHCEventHandler:EventFiller:SoftRemove NoValence -set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000 -create ThePEG::HepMCFile HepMCFile HepMCAnalysis.so -set LHCGenerator:AnalysisHandlers 0 HepMCFile -set HepMCFile:Filename DIPSYpp.hepmc -set HepMCFile:PrintEvent 10000000000 -set HepMCFile:Format GenEvent -set HepMCFile:Units GeV_mm -saverun DIPSYpp LHCGenerator -EOF - -setupThePEG -r $THEPEG_ROOT/lib/ThePEG/ThePEGDefaults.rpo \ - -I $THEPEG_ROOT/share/Ariadne \ - DIPSYpp_HepMC.in -runThePEG DIPSYpp.run -N100 --tics - -rivet-mkanalysis ALICE_Test -rivet-buildplugin RivetALICE_Test.so ALICE_Test.cc - -rivet --pwd -a ALICE_2010_S8625980 -a ALICE_Test DIPSYpp.hepmc - -rivet-cmphistos Rivet.yoda diff --git a/rivet.sh b/rivet.sh deleted file mode 100644 index 49456cd..0000000 --- a/rivet.sh +++ /dev/null @@ -1,81 +0,0 @@ -package: Rivet -version: "%(tag_basename)s%(defaults_upper)s" -tag: 2.5.1-alice1 -source: https://github.com/alisw/rivet -requires: - - GSL - - YODA - - fastjet - - HepMC - - boost -prepend_path: - PYTHONPATH: $RIVET_ROOT/lib64/python2.7/site-packages:$RIVET_ROOT/lib/python2.7/site-packages ---- -#!/bin/bash -e -case $ARCHITECTURE in - osx*) - # If we preferred system tools, we need to make sure we can pick them up. - [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl` - [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost` - ;; - *) - ARCH_LDFLAGS="-Wl,--no-as-needed" - ;; -esac - -rsync -a --exclude='**/.git' --delete --delete-excluded $SOURCEDIR/ ./ - -# MPFR and GMP are compiled statically, however in some cases there might be -# some "-lgmp" left somewhere and we have to deal with it with the correct path. -# Boost flags are also necessary -export LDFLAGS="$ARCH_LDFLAGS -L${MPFR_ROOT}/lib -L${GMP_ROOT}/lib -L${CGAL_ROOT}/lib -lCGAL" -export LIBRARY_PATH="$LD_LIBRARY_PATH" -export CXXFLAGS="$CXXFLAGS -I${MPFR_ROOT}/include -I${GMP_ROOT}/include -I${CGAL_ROOT}/include -DCGAL_DO_NOT_USE_MPZF" - -if [[ "$BOOST_ROOT" != '' ]]; then - export LDFLAGS="$LDFLAGS -L$BOOST_ROOT/lib" - export CXXFLAGS="$CXXFLAGS -I$BOOST_ROOT/include" -fi -if printf "int main(){}" | c++ $LDFLAGS -lboost_thread -lboost_system -xc++ - -o /dev/null; then - export LDFLAGS="$LDFLAGS -lboost_thread -lboost_system" -else - export LDFLAGS="$LDFLAGS -lboost_thread-mt -lboost_system-mt" -fi - -[[ "$CXXFLAGS" != *'-std=c++11'* ]] || CXX11=1 - -autoreconf -ivf -./configure \ - --prefix="$INSTALLROOT" \ - --disable-doxygen \ - --with-yoda="$YODA_ROOT" \ - ${GSL_ROOT:+--with-gsl="$GSL_ROOT"} \ - --with-hepmc="$HEPMC_ROOT" \ - --with-fastjet="$FASTJET_ROOT" \ - ${BOOST_ROOT:+--with-boost="$BOOST_ROOT"} \ - ${CXX11:+--enable-stdcxx11} -make -j$JOBS -make install - -# Modulefile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" < etc/modulefiles/$PKGNAME < fakewget/wget && chmod +x fakewget/wget - -PATH=$PATH:fakewget ./configure --prefix=$INSTALLROOT \ - --with-sqlite3=install \ - --enable-hepmc2=$HEPMC_ROOT \ - --enable-lhapdf=$LHAPDF5_ROOT - -make ${JOBS+-j $JOBS} -make install - -# Modulefile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" < "$MODULEFILE" < DIPSYpp_HepMC.in <<\EOF -read Tune27.in -cd /DIPSY -cp EventHandler LHCEventHandler -set LHCEventHandler:WFL stdProton -set LHCEventHandler:WFR stdProton -set LHCEventHandler:ConsistencyLevel 0 -set LHCEventHandler:XSecFn:CheckOffShell false -set LHCEventHandler:CascadeHandler NULL -set LHCEventHandler:HadronizationHandler NULL -set LHCEventHandler:DecayHandler NULL -create ThePEG::FixedCMSLuminosity LHCLumi -set LHCEventHandler:LuminosityFunction LHCLumi -cp Generator LHCGenerator -set LHCGenerator:EventHandler LHCEventHandler -set LHCEventHandler:EffectivePartonMode Colours -set LHCGenerator:EventHandler:DecayHandler /Defaults/Handlers/StandardDecayHandler -set LHCGenerator:EventHandler:HadronizationHandler Frag8 -set LHCEventHandler:WFL Proton -set LHCEventHandler:WFR Proton -set LHCEventHandler:EventFiller:SoftRemove NoValence -set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000 -create ThePEG::HepMCFile HepMCFile HepMCAnalysis.so -set LHCGenerator:AnalysisHandlers 0 HepMCFile -set HepMCFile:Filename DIPSYpp.hepmc -set HepMCFile:PrintEvent 10000000000 -set HepMCFile:Format GenEvent -set HepMCFile:Units GeV_mm -saverun DIPSYpp LHCGenerator -EOF - -setupThePEG -r $THEPEG_ROOT/lib/ThePEG/ThePEGDefaults.rpo \ - -I $THEPEG_ROOT/share/Ariadne \ - DIPSYpp_HepMC.in -runThePEG DIPSYpp.run -N100 --tics diff --git a/thepeg.sh b/thepeg.sh deleted file mode 100644 index 85494eb..0000000 --- a/thepeg.sh +++ /dev/null @@ -1,95 +0,0 @@ -package: ThePEG -version: "%(tag_basename)s%(defaults_upper)s" -source: https://github.com/alisw/thepeg -tag: "v2.0.4-alice1" -requires: - - Rivet - - pythia - - HepMC - - boost -build_requires: - - autotools -prepend_path: - LD_LIBRARY_PATH: "$THEPEG_ROOT/lib/ThePEG" - DYLD_LIBRARY_PATH: "$THEPEG_ROOT/lib/ThePEG" -env: - ThePEG_INSTALL_PATH: "$THEPEG_ROOT/lib/ThePEG" ---- -#!/bin/bash -e -case $ARCHITECTURE in - osx*) - # If we preferred system tools, we need to make sure we can pick them up. - [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl` - [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost` - ;; -esac - -export LDFLAGS="-Wl,--no-as-needed -L${MPFR_ROOT}/lib -L${GMP_ROOT}/lib -L${CGAL_ROOT}/lib" -export CXXFLAGS="-I${CGAL_ROOT}/include" -export LIBRARY_PATH="$LD_LIBRARY_PATH" - -if [[ "$BOOST_ROOT" != '' ]]; then - export LDFLAGS="$LDFLAGS -L$BOOST_ROOT/lib" - export CXXFLAGS="$CXXFLAGS -I$BOOST_ROOT/include" -fi -if printf "int main(){}" | c++ $LDFLAGS -lboost_thread -lboost_system -xc++ - -o /dev/null; then - export LDFLAGS="$LDFLAGS -lboost_thread -lboost_system" -else - export LDFLAGS="$LDFLAGS -lboost_thread-mt -lboost_system-mt" -fi - -rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./ - -# Override perl from AliEn-Runtime -mkdir -p fakeperl/bin -ln -nfs /usr/bin/perl fakeperl/bin/perl -export PATH="$PWD/fakeperl/bin:$PATH" - -# special treatment for ThePEG version used for DIPSY -if [[ "$PKGVERSION" =~ "v2015-08-11" ]]; then - sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/Config/interfaces.pl.in - sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/src/Makefile.am - sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/src/Makefile.in -fi - -autoreconf -ivf -export LDFLAGS="-L$LHAPDF_ROOT/lib" -./configure \ - --disable-silent-rules \ - --enable-shared \ - --enable-stdcxx11 \ - --disable-static \ - --without-javagui \ - --prefix="$INSTALLROOT" \ - ${GSL_ROOT:+--with-gsl="$GSL_ROOT"} \ - --with-pythia8="$PYTHIA_ROOT" \ - --with-hepmc="$HEPMC_ROOT" \ - --with-rivet="$RIVET_ROOT" \ - --with-lhapdf="$LHAPDF_ROOT" \ - --with-fastjet="$FASTJET_ROOT" \ - --enable-unitchecks 2>&1 | tee -a thepeg_configure.log -grep -q 'Cannot build TheP8I without a working Pythia8 installation.' thepeg_configure.log && false -make C_INCLUDE_PATH="${GSL_ROOT}/include" CPATH="${GSL_ROOT}/include" ${JOBS:+-j $JOBS} -make install - -# Modulefile -MODULEDIR="$INSTALLROOT/etc/modulefiles" -MODULEFILE="$MODULEDIR/$PKGNAME" -mkdir -p "$MODULEDIR" -cat > "$MODULEFILE" <' | clang++ -x c++ - -c -o /dev/null ---- From 2bd565fb9eb3069184645572b5b38b1b03685dc8 Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Tue, 18 Feb 2025 11:20:17 +0100 Subject: [PATCH 2/3] chore(pre-commit): set up, fix trailing whitespace --- .pre-commit-config.yaml | 10 ++++++++++ README.md | 2 ++ asiofi.sh | 2 -- bz2.sh | 1 - clhep.sh | 2 +- configuration.sh | 2 +- defaults-release.sh | 4 ++-- evtgen.sh | 4 ++-- fairlogger.sh | 1 - fmt.sh | 1 - g4py.sh | 2 +- genie.sh | 4 ++-- go.sh | 1 - gsoap.sh | 2 +- lcov.sh | 1 - libperl.sh | 1 - make.sh | 1 - messagepack.sh | 2 +- monitoring.sh | 2 +- opengl.sh | 1 - openssl.sh | 4 ++-- perl-modules.sh | 1 - pythia6.sh | 1 - rapidjson.sh | 2 +- sas.sh | 2 +- tauolapp.sh | 2 +- termcap.sh | 1 - xdevel.sh | 1 - xercesc.sh | 2 +- yacc-like.sh | 2 -- yaml-cpp.sh | 1 - 31 files changed, 30 insertions(+), 35 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e045998 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,10 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer +ci: + autofix_prs: true diff --git a/README.md b/README.md index a317dff..b3e1e78 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # shipdist +[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ShipSoft/shipdist/main.svg)](https://results.pre-commit.ci/latest/github/ShipSoft/shipdist/main) + Recipes to build `FairShip` and it's dependencies using `aliBuild` ## General information diff --git a/asiofi.sh b/asiofi.sh index b771e38..fdb6015 100644 --- a/asiofi.sh +++ b/asiofi.sh @@ -53,5 +53,3 @@ prepend-path LD_LIBRARY_PATH \$ASIOFI_ROOT/lib EoF MODULEDIR="$INSTALLROOT/etc/modulefiles" mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR - - diff --git a/bz2.sh b/bz2.sh index b6cd985..f001a95 100644 --- a/bz2.sh +++ b/bz2.sh @@ -8,4 +8,3 @@ system_requirement: ".*" system_requirement_check: | printf "#include \n" | gcc -xc++ - -c -o /dev/null --- - diff --git a/clhep.sh b/clhep.sh index a273f85..3d1b3ff 100644 --- a/clhep.sh +++ b/clhep.sh @@ -6,6 +6,6 @@ tag: CLHEP_2_2_0_8 #!/bin/sh cmake $SOURCEDIR \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT" - + make ${JOBS+-j $JOBS} make install diff --git a/configuration.sh b/configuration.sh index 1be4f9f..51e3707 100644 --- a/configuration.sh +++ b/configuration.sh @@ -40,7 +40,7 @@ proc ModulesHelp { } { set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@" # Dependencies -module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION +module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION # Our environment setenv Configuration_ROOT \$::env(BASEDIR)/$PKGNAME/\$version prepend-path PATH \$::env(Configuration_ROOT)/bin diff --git a/defaults-release.sh b/defaults-release.sh index 401d252..ab65f92 100644 --- a/defaults-release.sh +++ b/defaults-release.sh @@ -136,7 +136,7 @@ overrides: true log4cpp: tag: 1b9f8f7c031d6947c7468d54bc1da4b2f414558d - prefer_system_check: | + prefer_system_check: | ls $LOG4CPP_ROOT/include/ > /dev/null && \ ls $LOG4CPP_ROOT/lib/ > /dev/null && \ true @@ -251,7 +251,7 @@ overrides: ls $LHAPDF5_ROOT/lib/libLHAPDF.la > /dev/null && \ ls $LHAPDF5_ROOT/lib/libLHAPDF.a > /dev/null && \ ls $LHAPDF5_ROOT/lib64/python2.7/site-packages/lhapdf.py > /dev/null && \ - ls $LHAPDF5_ROOT/share/lhapdf > /dev/null + ls $LHAPDF5_ROOT/share/lhapdf > /dev/null XercesC: prefer_system_check: | ls $XERCESC_ROOT/ > /dev/null && \ diff --git a/evtgen.sh b/evtgen.sh index 0927e3f..56c51f4 100644 --- a/evtgen.sh +++ b/evtgen.sh @@ -16,9 +16,9 @@ export HEPMCLOCATION="$HEPMC_ROOT" rsync -a $SOURCEDIR/* . -./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" +./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" -make +make make install # Modulefile diff --git a/fairlogger.sh b/fairlogger.sh index 4e88261..77f739e 100644 --- a/fairlogger.sh +++ b/fairlogger.sh @@ -58,4 +58,3 @@ prepend-path ROOT_INCLUDE_PATH \$FAIRLOGGER_ROOT/include EoF MODULEDIR="$INSTALLROOT/etc/modulefiles" mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR - diff --git a/fmt.sh b/fmt.sh index dd02d86..2b32dfa 100644 --- a/fmt.sh +++ b/fmt.sh @@ -33,4 +33,3 @@ module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERS set FMT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version prepend-path ROOT_INCLUDE_PATH \$FMT_ROOT/include EoF - diff --git a/g4py.sh b/g4py.sh index 3ddb86a..9653f48 100644 --- a/g4py.sh +++ b/g4py.sh @@ -25,7 +25,7 @@ cmake $INSTALLROOT \ ${BOOST_VERSION:+-DBoost_NO_SYSTEM_PATH=TRUE}\ -DXERCESC_ROOT_DIR=${XERCESC_ROOT} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DBoost_NO_BOOST_CMAKE=TRUE + -DBoost_NO_BOOST_CMAKE=TRUE make ${JOBS:+-j $JOBS} make install diff --git a/genie.sh b/genie.sh index 0f5c935..dd5c6a8 100644 --- a/genie.sh +++ b/genie.sh @@ -42,7 +42,7 @@ $BUILDDIR/configure --prefix=$INSTALLROOT \ --with-log4cpp-inc=$LOG4CPP_ROOT/include/ \ --with-log4cpp-lib=$LOG4CPP_ROOT/lib/ \ --with-apfel-inc=$APFEL_ROOT/include/ \ - --with-apfel-lib=$APFEL_ROOT/lib/ + --with-apfel-lib=$APFEL_ROOT/lib/ make CXXFLAGS="-Wall $CXXFLAGS" CFLAGS="-Wall $CFLAGS" @@ -86,5 +86,5 @@ prepend-path LD_LIBRARY_PATH \$::env(GENIE_ROOT)/genie/lib prepend-path ROOT_INCLUDE_PATH \$::env(GENIE_ROOT)/genie/inc prepend-path ROOT_INCLUDE_PATH \$::env(GENIE_ROOT)/genie/src $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(GENIE_ROOT)/lib") -append-path PATH \$::env(GENIE_ROOT)/genie/bin +append-path PATH \$::env(GENIE_ROOT)/genie/bin EoF diff --git a/go.sh b/go.sh index 22434e8..1bb2de7 100644 --- a/go.sh +++ b/go.sh @@ -52,4 +52,3 @@ module load BASE/1.0 setenv GOROOT \$::env(BASEDIR)/$PKGNAME/\$version prepend-path PATH \$::env(GOROOT)/bin EoF - diff --git a/gsoap.sh b/gsoap.sh index 36ef43b..7baa191 100644 --- a/gsoap.sh +++ b/gsoap.sh @@ -13,7 +13,7 @@ rsync -a --exclude='**/.git' --delete --delete-excluded \ $SOURCEDIR/ ./ # On mac we use openssl coming from homebrew. -case $ARCHITECTURE in +case $ARCHITECTURE in osx*) [ ! "X$OPENSSL_ROOT" = X ] || OPENSSL_ROOT=`brew --prefix openssl` ;; diff --git a/lcov.sh b/lcov.sh index 7ccde84..8123a7b 100644 --- a/lcov.sh +++ b/lcov.sh @@ -26,4 +26,3 @@ setenv LCOV_ROOT \$::env(BASEDIR)/$PKGNAME/\$version prepend-path LD_LIBRARY_PATH \$::env(LCOV_ROOT)/lib $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(LCOV_ROOT)/lib") EoF - diff --git a/libperl.sh b/libperl.sh index aa37920..f49f580 100644 --- a/libperl.sh +++ b/libperl.sh @@ -5,4 +5,3 @@ system_requirement: ".*" system_requirement_check: | printf "#include \nint main(){}\n" | cc -xc -lperl -L`perl -MConfig -e 'print $Config{archlib}'`/CORE -I`perl -MConfig -e 'print $Config{archlib}'`/CORE - -o /dev/null && perl -MExtUtils::Embed -e 1 --- - diff --git a/make.sh b/make.sh index 9746bd6..3c6002c 100644 --- a/make.sh +++ b/make.sh @@ -8,4 +8,3 @@ system_requirement: ".*" system_requirement_check: | type make --- - diff --git a/messagepack.sh b/messagepack.sh index 4c87928..8da10ee 100644 --- a/messagepack.sh +++ b/messagepack.sh @@ -12,7 +12,7 @@ cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX:PATH="${INSTALLROOT}" \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DMSGPACK_CXX11=ON \ -DGTEST_DIR=$GOOGLETEST_ROOT \ - -DGTEST_ROOT=$GOOGLETEST_ROOT + -DGTEST_ROOT=$GOOGLETEST_ROOT make ${JOBS+-j $JOBS} make test diff --git a/monitoring.sh b/monitoring.sh index 81a2026..8445a5b 100644 --- a/monitoring.sh +++ b/monitoring.sh @@ -41,7 +41,7 @@ proc ModulesHelp { } { set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@ module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@" # Dependencies -module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${APMON_CPP_VERSION:+ApMon-CPP/$APMON_CPP_VERSION-$APMON_CPP_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION Configuration/$CONFIGURATION_VERSION-$CONFIGURATION_REVISION +module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${APMON_CPP_VERSION:+ApMon-CPP/$APMON_CPP_VERSION-$APMON_CPP_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION Configuration/$CONFIGURATION_VERSION-$CONFIGURATION_REVISION # Our environment setenv Monitoring_ROOT \$::env(BASEDIR)/$PKGNAME/\$version diff --git a/opengl.sh b/opengl.sh index 968b3f2..86bb9b4 100644 --- a/opengl.sh +++ b/opengl.sh @@ -13,4 +13,3 @@ system_requirement_check: | printf "#include \n" | cc -xc - -c -o /dev/null fi --- - diff --git a/openssl.sh b/openssl.sh index b1ed82d..ffc29e9 100644 --- a/openssl.sh +++ b/openssl.sh @@ -26,10 +26,10 @@ build_requires: rsync -av --delete --exclude="**/.git" $SOURCEDIR/ . case ${PKG_VERSION} in - v1.1*) + v1.1*) OPTS="" OPENSSLDIRPREFIX="" ;; - *) + *) OPTS="no-krb5" OPENSSLDIRPREFIX="etc/ssl" ;; diff --git a/perl-modules.sh b/perl-modules.sh index bf08ff1..cd51f5e 100644 --- a/perl-modules.sh +++ b/perl-modules.sh @@ -109,4 +109,3 @@ for x in $PACKAGES; do echo "Getting $x from CPAN" cpan -j MyConfig.pm $x done - diff --git a/pythia6.sh b/pythia6.sh index 345d261..1c8c5a3 100644 --- a/pythia6.sh +++ b/pythia6.sh @@ -40,4 +40,3 @@ prepend-path LD_LIBRARY_PATH \$::env(PYTHIA6_ROOT)/lib prepend-path AGILE_GEN_PATH \$::env(PYTHIA6_ROOT) $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(PYTHIA6_ROOT)/lib") EoF - diff --git a/rapidjson.sh b/rapidjson.sh index 31f272e..590f3b5 100644 --- a/rapidjson.sh +++ b/rapidjson.sh @@ -8,7 +8,7 @@ tag: v1.1.0 #!/bin/sh cmake $SOURCEDIR \ - -DCMAKE_INSTALL_PREFIX=$INSTALLROOT + -DCMAKE_INSTALL_PREFIX=$INSTALLROOT make ${JOBS:+-j$JOBS} install diff --git a/sas.sh b/sas.sh index 8587acf..275404e 100644 --- a/sas.sh +++ b/sas.sh @@ -9,6 +9,6 @@ requires: cmake $SOURCEDIR \ -DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT" \ -DLLVM_DEV_DIR=$CLANG_ROOT - + make ${JOBS+-j $JOBS} make install diff --git a/tauolapp.sh b/tauolapp.sh index 714cd91..5d7d171 100644 --- a/tauolapp.sh +++ b/tauolapp.sh @@ -16,7 +16,7 @@ rsync -a $SOURCEDIR/* . ./configure --with-hepmc=$HEPMC_ROOT --with-lhapdf=$LHAPDF_ROOT --with-pythia8=$PYTHIA_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" -make +make make install # Modulefile diff --git a/termcap.sh b/termcap.sh index fbb19a1..0380a24 100644 --- a/termcap.sh +++ b/termcap.sh @@ -5,4 +5,3 @@ system_requirement: ".*" system_requirement_check: | printf "#include \n" | gcc -xc++ - -c -o /dev/null --- - diff --git a/xdevel.sh b/xdevel.sh index e99d803..b439097 100644 --- a/xdevel.sh +++ b/xdevel.sh @@ -8,4 +8,3 @@ system_requirement: ".*" system_requirement_check: | printf "#include \n#include \n#include \n#include \n" | cc -xc - -I/opt/X11/include $(freetype-config --cflags 2> /dev/null || pkg-config freetype2 --cflags 2> /dev/null) -c -o /dev/null --- - diff --git a/xercesc.sh b/xercesc.sh index 9646abf..c4b98d0 100644 --- a/xercesc.sh +++ b/xercesc.sh @@ -11,7 +11,7 @@ env: #!/bin/sh cd $SOURCEDIR autoreconf -i -cd - +cd - echo "command $SOURCEDIR configure --prefix $INSTALLROOT CFLAGS $CFLAGS CXXFLAGS=$CFLAGS" $SOURCEDIR/configure --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" make ${JOBS+-j $JOBS} diff --git a/yacc-like.sh b/yacc-like.sh index 54be0d6..965fd81 100644 --- a/yacc-like.sh +++ b/yacc-like.sh @@ -7,5 +7,3 @@ system_requirement: ".*" system_requirement_check: | which bison && which flex --- - - diff --git a/yaml-cpp.sh b/yaml-cpp.sh index ae880d8..ea9fc42 100644 --- a/yaml-cpp.sh +++ b/yaml-cpp.sh @@ -46,4 +46,3 @@ module load BASE/1.0 ${BOOST_REVISION:+boost/$BOOST_VERSION-$BOOST_REVISION} set YAMLCPP \$::env(BASEDIR)/$PKGNAME/\$version prepend-path LD_LIBRARY_PATH \$YAMLCPP/lib EoF - From ac45cabff2917e14db1236e3a8a07e20063bf064 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:29:17 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- flatbuffers.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/flatbuffers.sh b/flatbuffers.sh index 0feee67..c3b3798 100644 --- a/flatbuffers.sh +++ b/flatbuffers.sh @@ -43,4 +43,3 @@ prepend-path PATH \$FLATBUFFERS_ROOT/bin prepend-path LD_LIBRARY_PATH \$FLATBUFFERS_ROOT/lib prepend-path PATH \$FLATBUFFERS_ROOT/bin EoF -