Commit 222b4bb9 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

medialibrary-win: Fix build folder deletion

parent e73fc135
Pipeline #7714 passed with stage
in 34 minutes and 12 seconds
FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349
ENV IMAGE_DATE=201906211545
ENV IMAGE_DATE=201906251034
USER root
RUN mkdir /buildml && chown videolan /buildml && \
RUN mkdir -p /build/ml && chown videolan /build && chown videolan /build/ml && \
mkdir -p /prefix && chown videolan /prefix
USER videolan
......@@ -14,7 +14,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \
RAPIDJSON_VERSION=1.1.0 \
RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \
mkdir -p /buildml && cd /buildml && \
mkdir -p /build/ml && cd /build/ml && \
git clone --depth=1 https://git.videolan.org/git/vlc.git && \
cd vlc && \
cd extras/tools && ./bootstrap && make -j`nproc` && \
......@@ -26,7 +26,7 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
--disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \
--disable-qtquickcontrols2 --disable-qtsvg && \
make -j`nproc` && \
cd /buildml/vlc && ./bootstrap && mkdir build && cd build && \
cd /build/ml/vlc && ./bootstrap && mkdir build && cd build && \
../configure --host=$TARGET_TRIPLE \
--disable-lua --disable-qt --disable-skins2 \
--disable-nls --disable-aom \
......@@ -35,22 +35,22 @@ RUN TARGET_TRIPLE=i686-w64-mingw32 \
mkdir -p /prefix/dll && \
cp src/.libs/libvlccore.dll /prefix/dll/ && \
cp lib/.libs/libvlc.dll /prefix/dll && \
cd /buildml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
cd /build/ml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \
tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \
./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \
make -j`nproc` && make install && \
cd /buildml && \
cd /build/ml && \
wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \
tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \
make -j`nproc` && make install && \
cd /buildml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
cd /build/ml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \
tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \
cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \
make install && \
rm -rf /buildml
rm -rf /build/ml
FROM registry.videolan.org:5000/vlc-debian-llvm-mingw:20190621125349
ENV IMAGE_DATE=201906211545
ENV IMAGE_DATE=201906251034
USER root
RUN mkdir /buildml && chown videolan /buildml && \
RUN mkdir -p /build/ml && chown videolan /build && chown videolan /build/ml && \
mkdir -p /prefix && chown videolan /prefix
USER videolan
......@@ -14,7 +14,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
JPEGTURBO_SHA256=9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f \
RAPIDJSON_VERSION=1.1.0 \
RAPIDJSON_SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e && \
mkdir -p /buildml && cd /buildml && \
mkdir -p /build/ml && cd /build/ml && \
git clone --depth=1 https://git.videolan.org/git/vlc.git && \
cd vlc && \
cd extras/tools && ./bootstrap && make -j`nproc` && \
......@@ -26,7 +26,7 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
--disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols \
--disable-qtquickcontrols2 --disable-qtsvg && \
make -j`nproc` && \
cd /buildml/vlc && ./bootstrap && mkdir build && cd build && \
cd /build/ml/vlc && ./bootstrap && mkdir build && cd build && \
../configure --host=$TARGET_TRIPLE \
--disable-lua --disable-qt --disable-skins2 \
--disable-nls --disable-aom \
......@@ -35,22 +35,22 @@ RUN TARGET_TRIPLE=x86_64-w64-mingw32 \
mkdir -p /prefix/dll && \
cp src/.libs/libvlccore.dll /prefix/dll/ && \
cp lib/.libs/libvlc.dll /prefix/dll && \
cd /buildml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
cd /build/ml && wget -q https://www.sqlite.org/2018/$SQLITE_VERSION.tar.gz && \
echo $SQLITE_SHA256 $SQLITE_VERSION.tar.gz | sha256sum -c && \
tar xzf $SQLITE_VERSION.tar.gz && cd $SQLITE_VERSION && \
./configure --prefix=/prefix --host=$TARGET_TRIPLE --disable-shared && \
make -j`nproc` && make install && \
cd /buildml && \
cd /build/ml && \
wget -q https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.0/libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
echo $JPEGTURBO_SHA256 libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz | sha256sum -c && \
tar xzf libjpeg-turbo-$JPEGTURBO_VERSION.tar.gz && \
cd libjpeg-turbo-$JPEGTURBO_VERSION && ./configure --host=$TARGET_TRIPLE --prefix=/prefix --disable-shared && \
make -j`nproc` && make install && \
cd /buildml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
cd /build/ml && wget -q https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz && \
echo $RAPIDJSON_SHA256 v$RAPIDJSON_VERSION.tar.gz | sha256sum -c && \
tar xzf v1.1.0.tar.gz && cd rapidjson-1.1.0/ && \
cmake -DCMAKE_INSTALL_PREFIX=/prefix -DRAPIDJSON_BUILD_DOC=OFF \
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF . && \
make install && \
rm -rf /buildml
rm -rf /build/ml
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