From 8fd49a25da9f7ae2fa86bf7d8b14ae041b8a1772 Mon Sep 17 00:00:00 2001
From: Louis Moureaux <louis.moureaux@cern.ch>
Date: Mon, 22 Jan 2024 17:27:10 +0100
Subject: [PATCH] Rename ProtoDarwin to Darwin and update remote
---
CMakeLists.txt | 10 +++++-----
Makefile | 12 ++++++------
protodarwin.xml => darwin.xml | 2 +-
protodarwin.xml.in => darwin.xml.in | 0
4 files changed, 12 insertions(+), 12 deletions(-)
rename protodarwin.xml => darwin.xml (93%)
rename protodarwin.xml.in => darwin.xml.in (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9bda2f..4f38d74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,16 +42,16 @@ ExternalProject_Add(TUnfold
configure_file(tunfold.xml.in tunfold.xml)
install(FILES "${CMAKE_BINARY_DIR}/tunfold.xml" TYPE SYSCONF)
-ExternalProject_Add(ProtoDarwin
- GIT_REPOSITORY https://gitlab.cern.ch/paconnor/ProtoDarwin.git
+ExternalProject_Add(Darwin
+ GIT_REPOSITORY https://gitlab.cern.ch/Proto/Darwin.git
GIT_TAG origin/master
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/ProtoDarwin"
+ SOURCE_DIR "${CMAKE_SOURCE_DIR}/Darwin"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
TEST_AFTER_INSTALL ON
)
-configure_file(protodarwin.xml.in protodarwin.xml)
-install(FILES "${CMAKE_BINARY_DIR}/protodarwin.xml" TYPE SYSCONF)
+configure_file(darwin.xml.in darwin.xml)
+install(FILES "${CMAKE_BINARY_DIR}/darwin.xml" TYPE SYSCONF)
ExternalProject_Add(tables
GIT_REPOSITORY https://gitlab.cern.ch/DasAnalysisSystem/tables.git
diff --git a/Makefile b/Makefile
index 5a108b2..dc2d1e9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ TABLES ?= $(GITLAB)/DasAnalysisSystem/tables.git
.NOTPARALLEL: all
-all: $(CMSSW) libgit2 TUnfold ProtoDarwin tables
+all: $(CMSSW) libgit2 TUnfold Darwin tables
cd $(CMSSW) && \
eval `scramv1 runtime -sh` && \
scram b
@@ -36,12 +36,12 @@ FastNLO:
# TODO
# TODO: improve make statement & better interface with content of xml file (using `xmllint` --> check availability in CI)
-ProtoDarwin: $(CMSSW) libgit2 tables
- git clone $(GITLAB)/paconnor/ProtoDarwin.git
+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)/ProtoDarwin && make -j BOOST=$$BOOST && \
- cd $(BASE)/$(CMSSW) && scram setup $(BASE)/protodarwin.xml
+ 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
@@ -56,4 +56,4 @@ tables:
git clone $(TABLES) $@
clean:
- @rm -rf $(CMSSW) TUnfold ProtoDarwin tables
+ @rm -rf $(CMSSW) TUnfold Darwin tables
diff --git a/protodarwin.xml b/darwin.xml
similarity index 93%
rename from protodarwin.xml
rename to darwin.xml
index 40a3937..3d5d029 100644
--- a/protodarwin.xml
+++ b/darwin.xml
@@ -6,7 +6,7 @@
<lib name="DarwinDict"/>
<info url="https://protodarwin.docs.cern.ch"/>
<client>
- <environment name="DARWIN" default="$CMSSW_BASE/../ProtoDarwin"/>
+ <environment name="DARWIN" default="$CMSSW_BASE/../Darwin"/>
<environment name="INCLUDE" default="$DARWIN/interface"/>
<environment name="LIBDIR" default="$DARWIN/build/lib"/>
</client>
diff --git a/protodarwin.xml.in b/darwin.xml.in
similarity index 100%
rename from protodarwin.xml.in
rename to darwin.xml.in
--
GitLab