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

Merge branch 'migration' into 'master' 

fix patch application

See merge request !20
parents 24045c23 ee0464da
No related branches found
No related tags found
1 merge request!20fix patch application
Pipeline #6775594 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Makefile
    + 1
    − 1
    View file @ 17ccfd8e
    ...@@ -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/python; patch -p1 <../../../../../jetToolbox_120X.patch) && \ (cd JMEAnalysis/JetToolbox; patch -p1 <../../../../jetToolbox_120X.patch) && \
    git clone $(ORIGIN) Core git clone $(ORIGIN) Core
    tables: tables:
    ......
    darwin.xml
    + 1
    − 1
    View file @ 17ccfd8e
    <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"/>
    ......
    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