From 69d21915fb5c11f07040fd1787862781178ed68e Mon Sep 17 00:00:00 2001
From: Louis Moureaux <louis.moureaux@cern.ch>
Date: Mon, 25 Mar 2024 00:14:13 +0100
Subject: [PATCH] Remove the Makefile and files it uses
The Makefile build system was replaced by CMake, which uses a different
approach to create the xml files for darwin and tunfold.
---
.gitlab-ci.yml | 9 --------
Makefile | 60 --------------------------------------------------
darwin.xml | 22 ------------------
tunfold.xml | 13 -----------
4 files changed, 104 deletions(-)
delete mode 100644 Makefile
delete mode 100644 darwin.xml
delete mode 100644 tunfold.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8084f41..374f3c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,6 @@
image: gitlab-registry.cern.ch/ci-tools/ci-worker:cc7
compilation:
- stage: build
- tags:
- - cvmfs
- script:
- - source /cvmfs/cms.cern.ch/cmsset_default.sh
- - yum install -y openssl-devel python3 zsh
- - make
-
-cmake:
stage: build
tags:
- cvmfs
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c8fd9ae..0000000
--- a/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-CMSSW ?= CMSSW_12_4_0
-GITLAB ?= https://gitlab.cern.ch
-ORIGIN ?= $(GITLAB)/cms-analysis/general/DasAnalysisSystem/Core.git
-BASE ?= $(PWD)
-TABLES ?= $(GITLAB)/cms-analysis/general/DasAnalysisSystem/tables.git
-
-.PHONY: all clean
-
-.NOTPARALLEL: all
-
-all: $(CMSSW) libgit2 TUnfold Darwin tables
- cd $(CMSSW) && \
- eval `scramv1 runtime -sh` && \
- scram b
-
-TUnfold: $(CMSSW)
- wget https://www.desy.de/~sschmitt/TUnfold/TUnfold_V17.9.tgz
- mkdir -p TUnfold TUnfold/lib
- mv TUnfold_V17.9.tgz TUnfold
- cd TUnfold && tar xvzf TUnfold_V17.9.tgz
- cd $(CMSSW) && eval `scramv1 runtime -sh` && \
- cd $(BASE)/TUnfold && make lib TUNFOLDVERSION='V17' -j && \
- mv -f libunfold.so lib/libtunfold.so && \
- mv -f TUnfoldV17Dict_rdict.pcm lib/ && \
- cd $(BASE)/$(CMSSW) && scram setup $(BASE)/tunfold.xml
-
-PlottingHelper: $(CMSSW)
- git clone $(GITLAB)/cms-analysis/general/DasAnalysisSystem/PlottingHelper.git
- cd $(CMSSW) && eval `scramv1 runtime -sh` && cd - && \
- make -C PlottingHelper all -j2
-
-KinFitter: $(CMSSW)
- # TODO
-
-FastNLO:
- # TODO
-
-# TODO: improve make statement & better interface with content of xml file (using `xmllint` --> check availability in CI)
-Darwin: $(CMSSW) libgit2 tables
- git clone $(GITLAB)/Proto/Darwin.git
- cd $(CMSSW) && eval `scramv1 runtime -sh` && \
- BOOST=$$(scram tool tag boost_header BOOSTHEADER_BASE) && \
- cd $(BASE)/Darwin && make -j BOOST=$$BOOST && \
- cd $(BASE)/$(CMSSW) && scram setup $(BASE)/darwin.xml
-
-libgit2: $(CMSSW)
- cd $(BASE)/$(CMSSW) && eval `scramv1 runtime -sh` && scram setup $(BASE)/libgit2.xml
-
-$(CMSSW):
- scramv1 project CMSSW $(CMSSW)
- cd $(CMSSW)/src && eval `scramv1 runtime -sh` && \
- git clone https://github.com/cms-jet/JetToolbox.git JMEAnalysis/JetToolbox -b jetToolbox_120X && \
- (cd JMEAnalysis/JetToolbox; patch -p1 <../../../../jetToolbox_120X.patch) && \
- git clone $(ORIGIN) Core
-
-tables:
- git clone $(TABLES) $@
-
-clean:
- @rm -rf $(CMSSW) TUnfold Darwin tables
diff --git a/darwin.xml b/darwin.xml
deleted file mode 100644
index 11f8a61..0000000
--- a/darwin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<tool name="darwin" version="1.0"> <!-- TODO -->
- <lib name="DarwinUserInfo"/>
- <lib name="DarwinMetaInfo"/>
- <lib name="DarwinOptions"/>
- <lib name="DarwinObjects"/>
- <lib name="DarwinDict"/>
- <info url="https://protodarwin.docs.cern.ch"/>
- <client>
- <environment name="DARWIN" default="$CMSSW_BASE/../Darwin"/>
- <environment name="INCLUDE" default="$DARWIN/interface"/>
- <environment name="LIBDIR" default="$DARWIN/build/lib"/>
- </client>
- <use name="boost" />
- <use name="boost_program_options" />
- <runtime name="DARWIN_BASE" value="$DARWIN" type="path"/>
- <runtime name="DARWIN_FIRE_AND_FORGET" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/>
- <runtime name="PATH" value="$DARWIN/build/bin" type="path"/>
- <runtime name="LD_LIBRARY_PATH" value="$DARWIN/build/lib" type="path"/>
- <runtime name="PYTHON3PATH" value="$DARWIN/build/python" type="path"/>
- <runtime name="DARWIN_GIT_REPO" value="$CMSSW_BASE/src/Core" type="path"/>
- <runtime name="DARWIN_TABLES" value="$CMSSW_BASE/../tables" type="path"/>
-</tool>
diff --git a/tunfold.xml b/tunfold.xml
deleted file mode 100644
index 473bf61..0000000
--- a/tunfold.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<tool name="tunfold" version="17.9">
- <lib name="tunfold"/>
- <info url="https://www.desy.de/~sschmitt/tunfold.html"/>
- <client>
- <environment name="TUNFOLD_BASE" default="$CMSSW_BASE/../TUnfold"/>
- <environment name="INCLUDE" default="$TUNFOLD_BASE"/>
- <environment name="LIBDIR" default="$TUNFOLD_BASE/lib"/>
- </client>
- <use name="root_cxxdefaults"/>
- <lib name="XMLIO" />
- <lib name="XMLParser" />
- <runtime name="LD_LIBRARY_PATH" value="$LIBDIR" type="path"/>
-</tool>
--
GitLab