Commit 3f0b7f3c authored by David Blyth's avatar David Blyth

Shifting NPDet away from lcgeo and other legacy dependencies

* Removed unnecessary packages
* NPDet updated
* DD4hep customized until we can get a PR through for preventing CMake "install" by DD4hep cmake functions

Also...
* Added GenFit to /opt for now
* Added env variables that LCIO wants when loaded in cling
parent 968cddcd
......@@ -143,16 +143,17 @@ RUN git clone https://github.com/iLCSoft/LCIO.git \
&& cd ../ \
&& rm -rf build LCIO
ENV ROOT_INCLUDE_PATH=/usr/local/include
ENV ROOT_INCLUDE_PATH=/usr/local:/usr/local/include
# DD4hep
ENV DD4HEP_CHECKOUT=ddbe5a9eb839953dc5ce396952556506cc600bcc
ENV DD4HEP_CHECKOUT=88ef8dffd27d95233c92ccfe0b4e90467af284f8 \
DD4HEP_REPO=https://github.com/decibelcooper/DD4hep.git
RUN sudo pacman -S --noconfirm \
boost \
&& sudo rm -rf /var/cache/pacman/pkg
RUN git clone https://github.com/AIDASoft/DD4hep.git \
RUN git clone $DD4HEP_REPO \
&& cd DD4hep \
&& git checkout $DD4HEP_CHECKOUT \
&& cd .. \
......@@ -177,42 +178,6 @@ ENV DD4hepINSTALL=/usr/local \
DD4hep_DIR=/usr/local \
PYTHONPATH=/usr/local/python:${PYTHONPATH}
# lcgeo
ENV LCGEO_RELEASE=v00-14
RUN git clone https://github.com/iLCSoft/lcgeo.git \
&& cd lcgeo \
&& git checkout tags/$LCGEO_RELEASE \
&& sed -i 's/^\(#!.*python\>\)/\12/' $(find -type f) \
&& mkdir build \
&& cd build \
&& CXXFLAGS=-std=c++14 cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local \
../ \
&& make -j $BUILD_THREADS \
&& sudo make install \
&& cd ../../ \
&& rm -rf lcgeo
ENV PYTHONPATH=/usr/local/lib/python:${PYTHONPATH}
# iLCUtil
ENV ILCUTIL_RELEASE=v01-04
RUN git clone https://github.com/iLCSoft/iLCUtil.git \
&& cd iLCUtil \
&& git checkout tags/$ILCUTIL_RELEASE \
&& mkdir build \
&& cd build \
&& CXXFLAGS=-std=c++14 cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DCMAKE_BUILD_TYPE=Release \
../ \
&& make -j $BUILD_THREADS \
&& sudo make install \
&& cd ../../ \
&& rm -rf iLCUtil
# Protobuf
ENV PROTOBUF_RELEASE=v3.4.1
......@@ -267,7 +232,7 @@ RUN sudo mkdir $GOPATH \
&& rm -rf $GOPATH/src
# NPDet
ENV NPDET_CHECKOUT=8d0f7cd194fd6c4be654f57f3aebcb64b0236263
ENV NPDET_CHECKOUT=f06786106cd09e6b6a54ff20fefe360feb87d348
RUN git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \
&& cd NPDet \
......@@ -283,14 +248,40 @@ RUN git clone https://eicweb.phy.anl.gov/EIC/NPDet.git \
&& cd ../../ \
&& rm -rf NPDet
# GenFit
ENV GENFIT_CHECKOUT=70c408ff7424bdfd572ddc175b9673e8a1e91bbb \
GENFIT_PATH=/opt/GenFit
RUN sudo pacman -S --noconfirm \
eigen \
&& sudo rm -rf /var/cache/pacman/pkg
RUN git clone https://github.com/GenFit/GenFit.git $GENFIT_PATH \
&& cd $GENFIT_PATH \
&& git checkout $GENFIT_CHECKOUT \
&& sed -i.bak 's/\(CPP_STANDARD\) c++11/\1 c++14/' CMakeLists.txt \
&& mkdir build \
&& cd build \
&& cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DCMAKE_BUILD_TYPE=Release \
../ \
&& make -j $BUILD_THREADS \
&& make install \
&& cd ../ \
&& rm -rf build
# Convenience tools
RUN sudo pacman -S --noconfirm \
ipython \
ipython2 \
mesa-demos \
openssh \
procps-ng \
tigervnc \
vim \
wget \
which \
xfce4 \
&& sudo rm -rf /var/cache/pacman/pkg
......@@ -6,8 +6,7 @@ variety of uses in the context of EIC studies at ANL.
* CLHEP
* DD4hep
* GEANT4
* iLCUtil
* lcgeo
* GenFit
* LCIO
* NPDet
* proio
......
Markdown is supported
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