Update to ubuntu 2024

Author: rennu

build.sh

@@ -1,13 +1,7 @@
-set -e
-echo ubuntu soft core unlimited >> /etc/security/limits.conf
-echo ubuntu hard core unlimited >> /etc/security/limits.conf
+export TMP=/tmp/build
 export DEBIAN_FRONTEND=noninteractive
-cd /tmp
+apt-get update -qq && apt-get upgrade -qq
 
-# Upgrade system
-apt-get -y update && apt-get upgrade -y
-
-# Install dependencies
 apt-get install -y  \
   build-essential \
   cmake \
@@ -24,7 +18,6 @@ apt-get install -y  \
   libboost-graph-dev \
   libcgal-dev \
   libcgal-qt5-dev \
-  libeigen3-dev \
   libfreeimage-dev \
   libgflags-dev \
   libglew-dev \
@@ -45,50 +38,60 @@ apt-get install -y  \
   qtbase5-dev \
   libatlas-base-dev \
   libsuitesparse-dev
-mkdir /tmp/build
 
-# Install openmvg
-git clone --recursive https://github.com/openMVG/openMVG.git /tmp/build/openmvg
-mkdir /tmp/build/openmvg_build && cd /tmp/build/openmvg_build 
-cmake -DCMAKE_BUILD_TYPE=RELEASE . /tmp/build/openmvg/src -DCMAKE_INSTALL_PREFIX=/opt/openmvg 
-make -j4  && make install 
+mkdir -p $TMP && cd $TMP
+
+# Install OpenMVG
+git clone -b develop --recursive https://github.com/openMVG/openMVG.git ${TMP}/openmvg && \
+  mkdir ${TMP}/openmvg_build && cd ${TMP}/openmvg_build && \
+  cmake -DCMAKE_BUILD_TYPE=RELEASE . ../openmvg/src -DCMAKE_INSTALL_PREFIX=/opt/openmvg && \
+  make -j4  && \
+  make install
 
 # Install eigen
-hg clone https://bitbucket.org/eigen/eigen#3.2 /tmp/build/eigen 
-mkdir /tmp/build/eigen_build && cd /tmp/build/eigen_build 
-cmake . ../eigen 
-make -j4 && make install 
+git clone https://gitlab.com/libeigen/eigen.git --branch 3.2 ${TMP}/eigen && \
+  mkdir ${TMP}/eigen_build && cd ${TMP}/eigen_build && \
+  cmake . ../eigen && \
+  make -j4 && \
+  make install 
 
 # Get vcglib
-git clone https://github.com/cdcseacave/VCG.git /tmp/build/vcglib 
+git clone https://github.com/cdcseacave/VCG.git ${TMP}/vcglib
 
 # Install ceres solver
-git clone https://ceres-solver.googlesource.com/ceres-solver /tmp/build/ceres_solver
-cd /tmp/build/ceres_solver && git checkout tags/1.14.0
-mkdir /tmp/build/ceres_build && cd /tmp/build/ceres_build
-cmake . ../ceres_solver/ -DMINIGLOG=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF 
-make -j4
-make install
+git clone https://ceres-solver.googlesource.com/ceres-solver ${TMP}/ceres_solver && \
+  cd ${TMP}/ceres_solver && git checkout tags/1.14.0 && \
+  mkdir ${TMP}/ceres_build && cd ${TMP}/ceres_build && \
+  cmake . ../ceres_solver/ -DMINIGLOG=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF && \
+  make -j4 && \
+  make install
 
 # Install openmvs
-git clone https://github.com/cdcseacave/openMVS.git /tmp/build/openmvs 
-mkdir /tmp/build/openmvs_build && cd /tmp/build/openmvs_build
-cmake . ../openmvs -DCMAKE_BUILD_TYPE=Release -DVCG_DIR="/tmp/build/vcglib" -DCMAKE_INSTALL_PREFIX=/opt/openmvs 
-make -j4
-make install
+git clone https://github.com/cdcseacave/openMVS.git ${TMP}/openmvs && \
+  mkdir ${TMP}/openmvs_build && cd ${TMP}/openmvs_build && \
+  cmake . ../openmvs -DCMAKE_BUILD_TYPE=Release -DVCG_DIR="../vcglib" -DCMAKE_INSTALL_PREFIX=/opt/openmvs && \
+  make -j4 && \
+  make install
 
 # Install cmvs-pmvs
-git clone https://github.com/pmoulon/CMVS-PMVS /tmp/build/cmvs-pmvs
-mkdir /tmp/build/cmvs-pmvs_build && cd /tmp/build/cmvs-pmvs_build
-cmake ../cmvs-pmvs/program -DCMAKE_INSTALL_PREFIX=/opt/cmvs
-make -j4
-make install
+git clone https://github.com/pmoulon/CMVS-PMVS ${TMP}/cmvs-pmvs && \
+  mkdir ${TMP}/cmvs-pmvs_build && cd ${TMP}/cmvs-pmvs_build && \
+  cmake ../cmvs-pmvs/program -DCMAKE_INSTALL_PREFIX=/opt/cmvs && \
+  make -j4 && \
+  make install
 
 # Install colmap
-git clone -b master https://github.com/colmap/colmap /tmp/build/colmap
-mkdir -p /tmp/build/colmap_build && cd /tmp/build/colmap_build
-cmake . ../colmap -DCMAKE_INSTALL_PREFIX=/opt/colmap
-make -j4
-make install
+# master and dev broken so commenting for now
+#git clone -b master https://github.com/colmap/colmap /tmp/build/colmap && \
+#  mkdir -p /tmp/build/colmap_build && cd /tmp/build/colmap_build && \
+#  cmake . ../colmap -DCMAKE_INSTALL_PREFIX=/opt/colmap && \
+#  make -j4 && \
+#  make install
+
+# Install dpg
+git clone https://github.com/rennu/dpg.git /opt/dpg
+
+echo 'Add following to your .bashrc file to add commands to your PATH'
+echo 'PATH=/opt/openmvs/bin/OpenMVS:/opt/openmvg/bin:/opt/cmvs/bin:/opt/colmap/bin:/opt/dpg:$PATH'
+
 
-rm -rf /tmp/build