Merge branch 'js/mingw-res-rebuild'

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 5bd06fe900d44916fd11875fa5641e9b97e90540..06c3546e1ed4e1a78cea4d7a1801145066a895d8 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -8,9 +8,16 @@
 P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
 LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
 
-case "${TRAVIS_OS_NAME:-linux}" in
-linux)
-       export GIT_TEST_HTTPD=YesPlease
+case "$jobname" in
+linux-clang|linux-gcc)
+       sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+       sudo apt-get -q update
+       sudo apt-get -q -y install language-pack-is git-svn apache2
+       case "$jobname" in
+       linux-gcc)
+               sudo apt-get -q -y install gcc-8
+               ;;
+       esac
 
        mkdir --parents "$P4_PATH"
        pushd "$P4_PATH"
@@ -26,7 +33,7 @@ linux)
                cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
        popd
        ;;
-osx)
+osx-clang|osx-gcc)
        brew update --quiet
        # Uncomment this if you want to run perf tests:
        # brew install gnu-time
@@ -34,11 +41,25 @@ osx)
        brew link --force gettext
        brew install caskroom/cask/perforce
        ;;
+StaticAnalysis)
+       sudo apt-get -q update
+       sudo apt-get -q -y install coccinelle
+       ;;
+Documentation)
+       sudo apt-get -q update
+       sudo apt-get -q -y install asciidoc xmlto
+       ;;
 esac
 
-echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
-p4d -V | grep Rev.
-echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
-p4 -V | grep Rev.
-echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
-git-lfs version
+if type p4d >/dev/null && type p4 >/dev/null
+then
+       echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
+       p4d -V | grep Rev.
+       echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
+       p4 -V | grep Rev.
+fi
+if type git-lfs >/dev/null
+then
+       echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
+       git-lfs version
+fi