diff --git a/.travis/install.sh b/.travis/install.sh index fa29d2ef8..e53f1bf04 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -6,7 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libgl1-mesa-dev + sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio2-dev libgl1-mesa-dev source /opt/qt*/bin/qt*-env.sh fi diff --git a/appveyor-build.sh b/appveyor-build.sh deleted file mode 100644 index d87bf6c54..000000000 --- a/appveyor-build.sh +++ /dev/null @@ -1,58 +0,0 @@ -# Set architecture -ARCH=x86_64 -MINGW_PATH=mingw64 -NSISDEF=-DX64 - -# Update packages -pacman -Syu --noconfirm - -# Install necessary packages -pacman -S --noconfirm --needed mingw-w64-$ARCH-toolchain mingw-w64-$ARCH-cmake mingw-w64-$ARCH-ninja mingw-w64-$ARCH-qt5 mingw-w64-$ARCH-ffmpeg mingw-w64-$ARCH-openimageio mingw-w64-$ARCH-opencolorio - -# Generate Ninja Makefiles -cmake . -G "Ninja" -DCMAKE_BUILD_TYPE=Debug - -# Compile -ninja - -# Get Git hash -GITHASH=$(git rev-parse --short=7 HEAD) - -# Build finished, time to package -mkdir olive - -# Copy main executable in -cd olive -cp ../app/olive-editor.exe . - -# Inject Qt libraries -windeployqt --debug olive-editor.exe - -# Inject all other libraries (loops over dependency output from ldd) -ldd olive-editor.exe | while read -r dep -do - # Acquire full path to dependency - dep_output=( $dep ) - dep_path=${dep_output[2]} - - # If this is a mingw dependency, copy it into the deploy folder - if [[ $dep_path == /$MINGW_PATH* ]] - then - cp $dep_path . - fi -done - -# For some reason, this dep doesn't get listed by ldd but is necessary regardless -cp /$MINGW_PATH/bin/libcrypto*.dll . - -# Create package name -PKGNAME=Olive-$GITHASH-Windows-$ARCH - -# Package installer -cd .. -cp app/packaging/windows/nsis/* . -"/c/Program Files (x86)/NSIS/makensis.exe" -V4 $NSISDEF "-XOutFile $PKGNAME.exe" olive.nsi - -# Package portable -touch olive/portable -7z a $PKGNAME.zip olive