Changeset d77b51d in git for doc/update_fastjet.sh

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• doc/update_fastjet.sh (modified) (3 diffs)

doc/update_fastjet.sh

@@ -1 @@
-version=3.1.0
+version=3.1.2
 
-#wget http://fastjet.fr/repo/fastjet-${version}.tar.gz
+wget http://fastjet.fr/repo/fastjet-${version}.tar.gz
 
 tar -zxf fastjet-${version}.tar.gz
@@ -83 +83 @@
 cp -a ../../fastjet-${version}/plugins/SISCone/siscone/siscone/*.cpp SISCone
 cp -a ../../fastjet-${version}/plugins/SISCone/fastjet/*.hh SISCone/fastjet
-rename .cpp .cc SISCone/*.cpp
-
+rename 's/\.cpp$/.cc/' SISCone/*.cpp
 
 mkdir -p TrackJet/fastjet
@@ -90 +89 @@
 cp -a ../../fastjet-${version}/plugins/TrackJet/fastjet/*.hh TrackJet/fastjet
 
-sed -i 's/#include "fastjet\//#include "/' D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
-sed -i 's/#include "fastjet\//#include "/' D0RunICone/fastjet/D0RunIConePlugin.hh
+sed -i 's/#include "fastjet\/D0RunIBaseConePlugin.hh"/#include "D0RunIBaseConePlugin.hh"/' D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
+sed -i 's/#include "fastjet\/D0RunIBaseConePlugin.hh"/#include "D0RunIBaseConePlugin.hh"/' D0RunICone/fastjet/D0RunIConePlugin.hh
 
 sed -i 's/#include "siscone\//#include "/' SISCone/SISConePlugin.cc