Skip to content
Snippets Groups Projects
Commit 24045c23 authored by Patrick Louis S Connor's avatar Patrick Louis S Connor
Browse files

Merge branch 'migration' into 'master' 

Migration (cont'd)

See merge request !19
parents 62920479 9eba39c4
No related branches found
No related tags found
1 merge request!19Migration (cont'd)
Pipeline #6775048 failed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Makefile
    + 1
    − 1
    View file @ 24045c23
    ...@@ -50,7 +50,7 @@ $(CMSSW): ...@@ -50,7 +50,7 @@ $(CMSSW):
    scramv1 project CMSSW $(CMSSW) scramv1 project CMSSW $(CMSSW)
    cd $(CMSSW)/src && eval `scramv1 runtime -sh` && \ cd $(CMSSW)/src && eval `scramv1 runtime -sh` && \
    git clone https://github.com/cms-jet/JetToolbox.git JMEAnalysis/JetToolbox -b jetToolbox_120X && \ git clone https://github.com/cms-jet/JetToolbox.git JMEAnalysis/JetToolbox -b jetToolbox_120X && \
    (cd JMEAnalysis/JetToolbox; patch -p1 ../../../../jetToolbox_120X.patch) && \ (cd JMEAnalysis/JetToolbox/python; patch -p1 <../../../../../jetToolbox_120X.patch) && \
    git clone $(ORIGIN) Core git clone $(ORIGIN) Core
    tables: tables:
    ......
    darwin.xml.in
    + 3
    − 4
    View file @ 24045c23
    <tool name="protodarwin" version="1.0"> <!-- TODO --> <tool name="darwin" version="1.0"> <!-- TODO -->
    <lib name="DarwinUserInfo"/> <lib name="DarwinUserInfo"/>
    <lib name="DarwinMetaInfo"/> <lib name="DarwinMetaInfo"/>
    <lib name="DarwinOptions"/> <lib name="DarwinOptions"/>
    <lib name="DarwinObjects"/> <lib name="DarwinObjects"/>
    <info url="https://protodarwin.docs.cern.ch"/> <info url="https://protodarwin.docs.cern.ch"/>
    <client> <client>
    <environment name="DARWIN" default="${CMAKE_SOURCE_DIR}"/> <environment name="INCLUDE" default="${CMAKE_INSTALL_FULL_INCLUDEDIR}/Darwin"/>
    <environment name="INCLUDE" default="${CMAKE_INSTALL_FULL_INCLUDEDIR}/ProtoDarwin"/>
    <environment name="LIBDIR" default="${CMAKE_INSTALL_FULL_LIBDIR}"/> <environment name="LIBDIR" default="${CMAKE_INSTALL_FULL_LIBDIR}"/>
    </client> </client>
    <use name="boost" /> <use name="boost" />
    <use name="boost_program_options" /> <use name="boost_program_options" />
    <runtime name="DARWIN_BASE" value="${CMAKE_SOURCE_DIR}" type="path"/> <runtime name="DARWIN_BASE" value="${CMAKE_SOURCE_DIR}/Darwin" type="path"/>
    <runtime name="DARWIN_FIRE_AND_FORGET" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/><!-- TODO --> <runtime name="DARWIN_FIRE_AND_FORGET" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/><!-- TODO -->
    <runtime name="PATH" value="${CMAKE_INSTALL_FULL_BINDIR}" type="path"/> <runtime name="PATH" value="${CMAKE_INSTALL_FULL_BINDIR}" type="path"/>
    <runtime name="LD_LIBRARY_PATH" value="${CMAKE_INSTALL_FULL_LIBDIR}" type="path"/> <runtime name="LD_LIBRARY_PATH" value="${CMAKE_INSTALL_FULL_LIBDIR}" type="path"/>
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment