Merge remote-tracking branch 'upstream/master' into upstream

.travis.yml

@@ -1,7 +1,6 @@
 language: objective-c
 install: true
 env:
-  - BUILD_TYPE=win
   - BUILD_TYPE=mac
 before_install: bash ./scripts/install.$BUILD_TYPE.script.sh
 deploy:

scripts/install.mac.script.sh

@@ -1,24 +1,25 @@
+echo 'Updating brew'
 brew update &> /dev/null
-brew install freetype &> /dev/null
-brew install glew &> /dev/null
-brew install qt5 &> /dev/null
-brew install ant &> /dev/null
-brew install android-sdk &> /dev/null
-brew install android-ndk &> /dev/null
-
-rm -rf ~/.wine
-wine xyz 
-
+echo 'Finished updating brew'
+echo 'Installing dependencies'
+(brew install freetype &> /dev/null) &
+(brew install glew &> /dev/null) &
+(brew install qt5 &> /dev/null) &
+(brew install ant &> /dev/null) &
+(brew install android-sdk &> /dev/null
+brew install android-ndk &> /dev/null) &
+wait
+echo 'Finished installing dependencies'
 expect -c '
 set timeout -1   ;
-spawn android update sdk -u -t tools,platform-tools,build-tools-21.1.1,android-21; 
+spawn android update sdk -u -t platform-tool,tool,build-tools-21.0.2,android-21; 
 expect { 
     "Do you accept the license" { exp_send "y\r" ; exp_continue }
     eof
 }
 '
 
-export QT=/usr/local/Cellar/qt5/5.3.2
+export QT=/usr/local/Cellar/qt5/5.4.0
 export QT_WIN=~/.wine/drive_c/Qt/Qt5.3.2
 export IOS_SDK=8.1
 export ANDROID_HOME=/usr/local/opt/android-sdk
@@ -28,31 +29,33 @@ rm -rf build
 mkdir build
 
 cd scripts
-
+(
 echo 'Building iOS libraries...'
-bash cleanioslibs.sh
-bash buildioslibs.sh
-bash buildiosplugins.sh
-
+bash cleanioslibs.sh &> /dev/null
+bash buildioslibs.sh &> /dev/null
+bash buildiosplugins.sh &> /dev/null
+) &
+(
 echo 'Building Android libraries...'
 bash makejar.sh
 bash buildandroidlibs.sh
 bash buildandroidso.sh
 bash buildandroidplugins.sh
-
-
+) &
+(
 echo 'Installing QScintilla for Mac...'
-bash downloadqscintilla.sh
-bash extractqscintilla.sh
-bash installqscintilla.sh
+bash downloadqscintilla.sh &> /dev/null
+bash extractqscintilla.sh &> /dev/null
+bash installqscintilla.sh &> /dev/null
 
 echo 'Building Qt applications for Mac...'
 rm -rf ../Sdk
 bash qt5/buildqtlibs.sh
 bash qt5/buildplugins.sh
 bash qt5/cleanqt.sh
 bash qt5/buildqt.sh
-
+) &
+wait
 
 echo 'Copying Mac files...'
 bash copymac.sh
@@ -62,4 +65,3 @@ bash createmacpackage.sh
 
 
 
-

scripts/install.win.script.sh

@@ -1,11 +1,15 @@
+echo 'Updating brew'
 brew update &> /dev/null
-brew install freetype &> /dev/null
-brew install glew &> /dev/null
-brew install wine &> /dev/null
-brew install ant &> /dev/null
-brew install android-sdk &> /dev/null
-brew install android-ndk &> /dev/null
-
+echo 'Finished updating brew'
+echo 'Installing dependencies'
+(brew install freetype &> /dev/null) &
+(brew install glew &> /dev/null) &
+(brew install wine &> /dev/null) &
+(brew install ant &> /dev/null) &
+(brew install android-sdk &> /dev/null) &
+(brew install android-ndk &> /dev/null) &
+wait
+echo 'Finished installing dependencies'
 rm -rf ~/.wine
 wine xyz 
 
@@ -28,35 +32,42 @@ rm -rf build
 mkdir build
 
 cd scripts
-
+(
 echo 'Installing Qt for Windows...'
 bash installwinqt.sh
-
+) &
+(
 echo 'Installing NSIS for Windows...'
 bash installnsis.sh
-
+) &
+(
 echo 'Installing QScintilla for Windows...'
 bash downloadqscintilla.sh
 bash extractqscintilla.sh
 wine cmd /c installqscintilla.bat
-
+) &
+(
 echo 'Building Qt applications for Windows...'
 rm -rf ../Sdk
 wine cmd /c qt5\\buildqtlibs.bat
 wine cmd /c qt5\\buildplugins.bat
 wine cmd /c qt5\\cleanqt.bat
 wine cmd /c qt5\\buildqt.bat
-
+) &
+(
 echo 'Building iOS libraries...'
 bash cleanioslibs.sh
 bash buildioslibs.sh
 bash buildiosplugins.sh
-
+) &
+(
 echo 'Building Android libraries...'
 bash makejar.sh
 bash buildandroidlibs.sh
 bash buildandroidso.sh
 bash buildandroidplugins.sh
+) &
+wait
 
 echo 'Copying Windows files...'
 bash copywin.sh

scripts/travis.install.sh

@@ -1,16 +1,19 @@
-brew update
-brew install jpeg
-brew install libpng
-brew install freetype
-brew install glew
-brew install wget
-brew install qt5
-brew install wine
-brew install ant
-brew install android-sdk
-brew install android-ndk
-brew install ncurses
-
+echo 'Updating brew'
+brew update &> /dev/null
+echo 'Finished updating brew'
+echo 'Installing dependencies'
+(brew install jpeg &> /dev/null) &
+(brew install libpng &> /dev/null) &
+(brew install freetype &> /dev/null) &
+(brew install glew &> /dev/null) &
+(brew install wget &> /dev/null) &
+(brew install qt5 &> /dev/null) &
+(brew install wine &> /dev/null) &
+(brew install ant &> /dev/null) &
+(brew install android-sdk &> /dev/null
+brew install android-ndk &> /dev/null) &
+wait
+echo 'Finished installing dependencies'
 rm -rf ~/.wine
 wine xyz 
 
@@ -23,7 +26,7 @@ expect {
 }
 '
 
-export QT=/usr/local/Cellar/qt5/5.3.2
+export QT=/usr/local/Cellar/qt5/5.4.0
 export QT_WIN=~/.wine/drive_c/Qt/Qt5.3.2
 export IOS_SDK=8.1
 export ANDROID_HOME=/usr/local/opt/android-sdk
@@ -33,16 +36,17 @@ rm -rf build
 mkdir build
 
 cd scripts
-
-echo 'Installing Qt for Windows...'
-bash installwinqt.sh
-
+(
 echo 'Installing NSIS for Windows...'
-bash installnsis.sh
+bash installnsis.sh &> /dev/null
+) &
+(
+echo 'Installing Qt for Windows...'
+bash installwinqt.sh &> /dev/null
 
 echo 'Installing QScintilla for Windows...'
-bash downloadqscintilla.sh
-bash extractqscintilla.sh
+bash downloadqscintilla.sh &> /dev/null
+bash extractqscintilla.sh &> /dev/null
 wine cmd /c installqscintilla.bat
 
 echo 'Building Qt applications for Windows...'
@@ -51,38 +55,41 @@ wine cmd /c qt5\\buildqtlibs.bat
 wine cmd /c qt5\\buildplugins.bat
 wine cmd /c qt5\\cleanqt.bat
 wine cmd /c qt5\\buildqt.bat
-
+) &
+(
 echo 'Building iOS libraries...'
-bash cleanioslibs.sh
-bash buildioslibs.sh
-bash buildiosplugins.sh
-
+bash cleanioslibs.sh &> /dev/null
+bash buildioslibs.sh &> /dev/null
+bash buildiosplugins.sh &> /dev/null
+) &
+(
 echo 'Building Android libraries...'
-bash makejar.sh
-bash buildandroidlibs.sh
-bash buildandroidso.sh
-bash buildandroidplugins.sh
+bash makejar.sh &> /dev/null
+bash buildandroidlibs.sh &> /dev/null
+bash buildandroidso.sh &> /dev/null
+bash buildandroidplugins.sh &> /dev/null
+) &
+(
+echo 'Installing QScintilla for Mac...'
+bash downloadqscintilla.sh &> /dev/null
+bash extractqscintilla.sh &> /dev/null
+bash installqscintilla.sh &> /dev/null
+
+echo 'Building Qt applications for Mac...'
+rm -rf ../Sdk
+bash qt5/buildqtlibs.sh &> /dev/null
+bash qt5/buildplugins.sh &> /dev/null
+bash qt5/cleanqt.sh &> /dev/null
+bash qt5/buildqt.sh &> /dev/null
+) &
+wait
 
 echo 'Copying Windows files...'
 bash copywin.sh
 
 echo 'Creating Windows installation package...'
 bash createwinpackage.sh
 
-
-echo 'Installing QScintilla for Mac...'
-bash downloadqscintilla.sh
-bash extractqscintilla.sh
-bash installqscintilla.sh
-
-echo 'Building Qt applications for Mac...'
-rm -rf ../Sdk
-bash qt5/buildqtlibs.sh
-bash qt5/buildplugins.sh
-bash qt5/cleanqt.sh
-bash qt5/buildqt.sh
-
-
 echo 'Copying Mac files...'
 bash copymac.sh