diff --git a/.travis-before_install.sh b/.travis-before_install.sh index 7bd53f38..caf69821 100755 --- a/.travis-before_install.sh +++ b/.travis-before_install.sh @@ -44,6 +44,10 @@ if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then fi fi +# what available versions we can use +apt-cache search ^g[c+][c+]-[0-9] | grep -v '[0-9]-[a-zA-Z]' +apt-cache search ^clang-[0-9] | grep -v '[0-9]-[a-zA-Z]' + # INSTALL OUR DEPENDENCIES sudo $SCRIPTDIR/mk/linux/setupBuildDeps.sh --quiet diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index 867d0a7d..c24d4b1d 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -163,37 +163,58 @@ fi case $distribution in Debian) case $release in - 6.*|7.*) ;; - *) + 6|6.*|7|7.*) ;; + 8|8.*) if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" - # ^ static jpeg seems to work again, debian testing 18.01.2016 fi if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi ;; + *) + if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then + echo 'Turning ON dynamic FTGL, LUA, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" + fi + if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi + # ^ may be removed ~ when default clang's version will be 3.9+ + ;; esac ;; Ubuntu) case $release in 10.*|11.*|12.*|13.*|14.*) ;; - *) + 15.*|16.*) if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" - fi;; + fi + ;; + *) + if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then + echo 'Turning ON dynamic FTGL, LUA, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" + fi + ;; esac ;; LinuxMint) case $release in 13|13.*|14|15|16|17|17.*) ;; - *) + 18|18.*|19|19.*) if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" - fi;; + fi + ;; + *) + if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then + echo 'Turning ON dynamic FTGL, LUA, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" + fi + ;; esac ;; diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh index dbb39d4d..eba11620 100755 --- a/mk/linux/makedeps_folder.sh +++ b/mk/linux/makedeps_folder.sh @@ -22,7 +22,7 @@ sync_support_libs(){ local _cp="/bin/cp" #local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL" local skip_deps="" - local keep_deps="libcurl libgnu libgcrypt libnghttp libidn librtmp libssh libnettle libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc" + local keep_deps="libcurl libgnu libgcrypt libnghttp libidn librtmp libssh libnettle libicu liblua libjpeg libpng libircclient libminiupnpc libwx libgtk libgdk libftgl libfreetype libvlc" local scan_via_skiplist=1