hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Revert Travis docker changes

Browse Source
This commit is contained in:
Lukas W
2017-10-20 10:54:24 +02:00
parent 307deaef4c
commit ff958338e7
22 changed files with 130 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.travis/common/windows-build.sh
View File

@@ -1,18 +0,0 @@
#!/usr/bin/env bash
set -e
CPUS=$(grep -c bogo /proc/cpuinfo)
cd /lmms
mkdir build
cd build
../cmake/build_mingw"$1".sh
echo Building on "$CPUS" CPUs
make -j$((CPUS+1))
make package
mv -v lmms-*.exe /lmms

38
.travis/linux.cross.win32/Dockerfile
View File

@@ -1,38 +0,0 @@
FROM ubuntu:artful
MAINTAINER Tobias Junghans <tobydox@users.sf.net>
RUN \
apt-get update && \
apt-get install --no-install-recommends -y software-properties-common && \
add-apt-repository -y "ppa:tobydox/mingw-w64" && \
apt-get update && \
apt-get install --no-install-recommends -y --force-yes \
git \
cmake \
pkg-config \
make \
nsis \
tofrodos \
g++-mingw-w64 \
libz-mingw-w64-dev \
qt5base-mingw-w64 \
qt5tools-mingw-w64 \
qt5translations-mingw-w64 \
sdl-mingw-w64 \
libvorbis-mingw-w64 \
fluidsynth-mingw-w64 \
stk-mingw-w64 \
glib2-mingw-w64 \
portaudio-mingw-w64 \
libsndfile-mingw-w64 \
fftw-mingw-w64 \
flac-mingw-w64 \
fltk-mingw-w64 \
libsamplerate-mingw-w64 \
libgig-mingw-w64 \
libsoundio-mingw-w64 \
lame-mingw-w64 \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

5
.travis/linux.cross.win32/script.sh
View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
/lmms/.travis/common/windows-build.sh 32

38
.travis/linux.cross.win64/Dockerfile
View File

@@ -1,38 +0,0 @@
FROM ubuntu:artful
MAINTAINER Tobias Junghans <tobydox@users.sf.net>
RUN \
apt-get update && \
apt-get install --no-install-recommends -y software-properties-common && \
add-apt-repository -y "ppa:tobydox/mingw-w64" && \
apt-get update && \
apt-get install --no-install-recommends -y --force-yes \
git \
cmake \
pkg-config \
make \
nsis \
tofrodos \
g++-mingw-w64 \
libz-mingw-w64-dev \
qt5base-mingw-w64 \
qt5tools-mingw-w64 \
qt5translations-mingw-w64 \
sdl-mingw-w64 \
libvorbis-mingw-w64 \
fluidsynth-mingw-w64 \
stk-mingw-w64 \
glib2-mingw-w64 \
portaudio-mingw-w64 \
libsndfile-mingw-w64 \
fftw-mingw-w64 \
flac-mingw-w64 \
fltk-mingw-w64 \
libsamplerate-mingw-w64 \
libgig-mingw-w64 \
libsoundio-mingw-w64 \
lame-mingw-w64 \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

5
.travis/linux.cross.win64/script.sh
View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
/lmms/.travis/common/windows-build.sh 64

16
.travis/linux.win.download.sh Executable file
View File

@@ -0,0 +1,16 @@
#!/usr/bin/env bash
set -e
CACHE_DIR=$TRAVIS_BUILD_DIR/apt_mingw_cache/$1
mkdir -p "$CACHE_DIR"
pushd "$CACHE_DIR"
# shellcheck disable=SC2086
apt-get --print-uris --yes install $MINGW_PACKAGES | grep ^\' | cut -d\' -f2 > downloads.list
wget -N --input-file downloads.list
sudo cp ./*.deb /var/cache/apt/archives/
popd

4
.travis/linux.win32.before_install.sh
View File

@@ -2,5 +2,5 @@
set -e
docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win32/"
sudo add-apt-repository ppa:tobydox/mingw-x-trusty -y
sudo apt-get update -qq

28
.travis/linux.win32.install.sh
View File

@@ -2,3 +2,31 @@
set -e
if [ "$QT5" ]; then
MINGW_PACKAGES="mingw32-x-qt5base"
else
MINGW_PACKAGES="mingw32-x-qt"
fi
MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk
mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate
mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime
mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame $MINGW_PACKAGES"
export MINGW_PACKAGES
"$TRAVIS_BUILD_DIR/.travis/linux.win.download.sh" win32
PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32 $MINGW_PACKAGES"
# shellcheck disable=SC2086
sudo apt-get install -y $PACKAGES
# ccache 3.2 is needed because mingw32-x-gcc is version 4.9, which causes cmake
# to use @file command line passing, which in turn ccache 3.1.9 doesn't support
pushd /tmp
wget http://archive.ubuntu.com/ubuntu/pool/main/c/ccache/ccache_3.2.4-1_amd64.deb
sha256sum -c "$TRAVIS_BUILD_DIR/.travis/ccache.sha256"
sudo dpkg -i ccache_3.2.4-1_amd64.deb
popd

3
.travis/linux.win32.script.sh
View File

@@ -3,5 +3,4 @@
set -e
export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win32/script.sh
../cmake/build_mingw32.sh

3
.travis/linux.win64.before_install.sh
View File

@@ -2,5 +2,4 @@
set -e
docker build -t lmms-build "${TRAVIS_BUILD_DIR}/.travis/linux.cross.win64/"
"$TRAVIS_BUILD_DIR/.travis/linux.win32.before_install.sh"

21
.travis/linux.win64.install.sh
View File

@@ -2,3 +2,24 @@
set -e
# First, install 32-bit deps
"$TRAVIS_BUILD_DIR/.travis/linux.win32.install.sh"
if [ "$QT5" ]; then
MINGW_PACKAGES="mingw64-x-qt5base"
else
MINGW_PACKAGES="mingw64-x-qt"
fi
MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk
mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile
mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame $MINGW_PACKAGES"
export MINGW_PACKAGES
"$TRAVIS_BUILD_DIR/.travis/linux.win.download.sh" win64
# shellcheck disable=SC2086
sudo apt-get install -y $MINGW_PACKAGES

3
.travis/linux.win64.script.sh
View File

@@ -3,5 +3,4 @@
set -e
export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
docker run -v "${TRAVIS_BUILD_DIR}":/lmms:rw lmms-build /bin/sh /lmms/.travis/linux.cross.win64/script.sh
../cmake/build_mingw64.sh

4
.travis/script.sh
View File

@@ -10,10 +10,6 @@ if [ "$TYPE" = 'style' ]; then
# shellcheck disable=SC2046
shellcheck $(find -O3 "$TRAVIS_BUILD_DIR/.travis/" "$TRAVIS_BUILD_DIR/cmake/" -type f -name '*.sh' -o -name "*.sh.in")
elif [[ $TARGET_OS == "win32" || $TARGET_OS == "win64" ]] ; then
"$TRAVIS_BUILD_DIR/.travis/$TRAVIS_OS_NAME.$TARGET_OS.script.sh"
else
mkdir build