Browse Source

Less verbosity and try to run under jdk8

MeFisto94 9 years ago
parent
commit
99d07c621e
2 changed files with 9 additions and 8 deletions
  1. 2 1
      .travis.yml
  2. 7 7
      jdks/download-jdks.sh

+ 2 - 1
.travis.yml

@@ -2,6 +2,7 @@ language: java
 # Because loopfs isn't allowed...
 # os: osx
 sudo: required
+jdk: oraclejdk8
 env:
  - GRADLE_USER_HOME=gradle-cache
  
@@ -49,7 +50,7 @@ install:
 
 before_install:
   # - sudo apt-get update # Already done for us
-  - sudo apt-get install -qq p7zip-full hfsplus
+  - sudo apt-get install -qq p7zip-full hfsplus libxml2-dev zip
   # - brew install p7zip
   - git fetch --unshallow
   - "[ $TRAVIS_PULL_REQUEST == 'false' ] && openssl aes-256-cbc -K $encrypted_a1949b55824a_key -iv $encrypted_a1949b55824a_iv -in private/www-updater.key.enc -out private/www-updater.key -d || :"

+ 7 - 7
jdks/download-jdks.sh

@@ -9,11 +9,11 @@ platforms=( "linux-x64.tar.gz" "linux-i586.tar.gz" "windows-i586.exe" "windows-x
 
 function install_xar {
     # This is needed to open Mac OS .pkg files on Linux... NEED: apt-get install xml2-dev
-    wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/xar/xar-1.5.2.tar.gz
-    tar xvf xar-1.5.2.tar.gz
+    wget -q https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/xar/xar-1.5.2.tar.gz
+    tar xf xar-1.5.2.tar.gz
     cd xar-1.5.2
-    ./configure
-    make
+    ./configure -q
+    make -s
     cd ../
 }
 
@@ -51,7 +51,7 @@ function unpack_mac_jdk {
     cd Contents/Home
     # FROM HERE: build-osx-zip.sh by normen
     cp -r . ../jdk
-    zip -9 -r -y ../../../../jdk-macosx.zip ../jdk
+    zip -9 -r -y -q ../../../../jdk-macosx.zip ../jdk
     cd ../../../../
     rm -rf MacOS/
     cd ../../
@@ -97,7 +97,7 @@ function unpack_linux {
 
     mkdir -p $1
     cd $1
-    tar -xvf "../jdk-$1.tar.gz"
+    tar -xf "../jdk-$1.tar.gz"
     cd jdk1*
     mv * ../
     cd ../
@@ -134,7 +134,7 @@ do
         # rm -f local/$jdk_version-$jdk_build_version/jdk-$platform
         echo "< Already existing, SKIPPING."
     else
-        curl -L  -o local/$jdk_version-$jdk_build_version/jdk-$platform http://download.oracle.com/otn-pub/java/jdk/$jdk_version-$jdk_build_version/jdk-$jdk_version-$platform --cookie "gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" #--progress-bar
+        curl -L  -s -o local/$jdk_version-$jdk_build_version/jdk-$platform http://download.oracle.com/otn-pub/java/jdk/$jdk_version-$jdk_build_version/jdk-$jdk_version-$platform --cookie "gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" #--progress-bar
     fi
 done