dev
This commit is contained in:
+24
-23
@@ -53,35 +53,12 @@ RUN mkdir -p /soft/tmp && cd /soft/tmp \
|
||||
&& cp -rfv /soft/tmp/libmicrohttpd-*-w32-bin/${WIN_ARCH2}/MinGW/static/mingw${WIN_BITS}/* ${INSTALL_DIR}/ \
|
||||
&& rm -rf /soft/tmp
|
||||
|
||||
# curl
|
||||
#RUN git clone -b curl-${CUR_CURL_VERSION} --depth 1 https://github.com/curl/curl \
|
||||
# && mkdir curl_build && cd curl_build \
|
||||
# && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=0 -DBUILD_LIBCURL_DOCS=0 -DBUILD_MISC_DOCS=0 ../curl \
|
||||
# && make -j${JOBS_COUNT} && make install && cd /soft && rm -rf curl curl_build
|
||||
RUN unzip -o /soft/curl-8.11.0_2-win${WIN_BITS}-mingw.zip -d /soft/tmp \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/bin/* ${INSTALL_DIR}/bin/ \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/lib/* ${INSTALL_DIR}/lib/ \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/include/* ${INSTALL_DIR}/include/ \
|
||||
&& rm -rf /soft/tmp
|
||||
|
||||
|
||||
#
|
||||
# Build another libraries and tools
|
||||
# compile and install
|
||||
#
|
||||
|
||||
# assimp
|
||||
WORKDIR /soft
|
||||
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
|
||||
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
|
||||
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
|
||||
&& mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
|
||||
&& cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
|
||||
-DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
|
||||
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
|
||||
|
||||
|
||||
# GTest
|
||||
WORKDIR /soft
|
||||
RUN git clone -b v1.17.x https://github.com/google/googletest.git \
|
||||
@@ -117,6 +94,18 @@ RUN wget -v http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
|
||||
&& rm -rf /soft/fftw-*
|
||||
|
||||
|
||||
# assimp
|
||||
WORKDIR /soft
|
||||
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
|
||||
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
|
||||
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
|
||||
&& mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
|
||||
&& cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
|
||||
-DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
|
||||
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
|
||||
&& make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
|
||||
|
||||
|
||||
# markdown
|
||||
RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount
|
||||
WORKDIR /soft
|
||||
@@ -204,6 +193,18 @@ RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake
|
||||
|
||||
|
||||
# curl (should be last)
|
||||
#RUN git clone -b curl-${CUR_CURL_VERSION} --depth 1 https://github.com/curl/curl \
|
||||
# && mkdir curl_build && cd curl_build \
|
||||
# && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=0 -DBUILD_LIBCURL_DOCS=0 -DBUILD_MISC_DOCS=0 ../curl \
|
||||
# && make -j${JOBS_COUNT} && make install && cd /soft && rm -rf curl curl_build
|
||||
RUN unzip -o /soft/curl-8.11.0_2-win${WIN_BITS}-mingw.zip -d /soft/tmp \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/bin/* ${INSTALL_DIR}/bin/ \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/lib/* ${INSTALL_DIR}/lib/ \
|
||||
&& cp -rfv /soft/tmp/curl*win${WIN_BITS}-mingw/include/* ${INSTALL_DIR}/include/ \
|
||||
&& rm -rf /soft/tmp
|
||||
|
||||
|
||||
RUN chmod +r ${INSTALL_DIR}/bin/*
|
||||
|
||||
ENV BUILD_TYPE=Release
|
||||
|
||||
Reference in New Issue
Block a user