-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #388 from alicevision/pr-release-2019.1.0
Release 2019.1.0
- Loading branch information
Showing
5 changed files
with
82 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ LABEL maintainer="AliceVision Team [email protected]" | |
ENV MESHROOM_DEV=/opt/Meshroom \ | ||
MESHROOM_BUILD=/tmp/Meshroom_build \ | ||
MESHROOM_BUNDLE=/opt/Meshroom_bundle \ | ||
QT_DIR=/opt/qt/5.11.0/gcc_64 \ | ||
QT_DIR=/opt/qt/5.11.1/gcc_64 \ | ||
PATH="${PATH}:${MESHROOM_BUNDLE}" | ||
|
||
COPY . "${MESHROOM_DEV}" | ||
|
@@ -40,21 +40,32 @@ RUN yum install -y centos-release-scl | |
RUN yum install -y rh-python36 | ||
|
||
# Install Meshroom requirements and freeze bundle | ||
RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" | ||
RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \ | ||
find ${MESHROOM_BUNDLE} -name "*Qt5Web*" -delete && \ | ||
find ${MESHROOM_BUNDLE} -name "*Qt5Designer*" -delete && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libclang.so* && \ | ||
rm -rf ${MESHROOM_BUNDLE}/lib/PySide2/typesystems/ ${MESHROOM_BUNDLE}/lib/PySide2/examples/ ${MESHROOM_BUNDLE}/lib/PySide2/include/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/translations/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/resources/ && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libQt5* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/QtWeb* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/libicu* && \ | ||
rm ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-lupdate ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-rcc ${MESHROOM_BUNDLE}/lib/PySide2/shiboken2 | ||
|
||
# Install Qt (to build plugins) | ||
WORKDIR /tmp/qt | ||
RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run | ||
RUN chmod u+x qt-unified-linux-x64-online.run | ||
RUN ./qt-unified-linux-x64-online.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" | ||
RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run && \ | ||
chmod u+x qt-unified-linux-x64-online.run && \ | ||
./qt-unified-linux-x64-online.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \ | ||
rm ./qt-unified-linux-x64-online.run | ||
|
||
WORKDIR ${MESHROOM_BUILD} | ||
# Temporary workaround for qmlAlembic build | ||
RUN rm -rf "${AV_INSTALL}/lib" && ln -s "${AV_INSTALL}/lib64" "${AV_INSTALL}/lib" | ||
|
||
# Build Meshroom plugins | ||
RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DQT_DIR="${QT_DIR}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins" | ||
RUN make -j8 | ||
RUN make -j8 && cd /tmp && rm -rf ${MESHROOM_BUILD} | ||
|
||
RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision" | ||
RUN rm -rf ${MESHROOM_BUNDLE}/aliceVision/share/doc ${MESHROOM_BUNDLE}/aliceVision/share/eigen3 ${MESHROOM_BUNDLE}/aliceVision/share/fonts ${MESHROOM_BUNDLE}/aliceVision/share/lemon ${MESHROOM_BUNDLE}/aliceVision/share/libraw ${MESHROOM_BUNDLE}/aliceVision/share/man/ aliceVision/share/pkgconfig | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
__version__ = "2018.1.0" | ||
__version__ = "2019.1.0" | ||
|
||
import os | ||
# Allow override from env variable | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Multiview pipeline version | ||
__version__ = "1.0" | ||
__version__ = "2.1" | ||
|
||
import os | ||
|
||
|