Travis-ci build: fix osx jpeg installation failure, git ambiguous argument error...

* common.sh: fix travis-ci build bugs
install_macosx_deps: check if jpeg is installed, if not - upgrade it.
needs_compile: Check if $TRAVIS_COMMIT_RANGE is valid, if not, rewrite
the range with the correct one, and fix git ambiguous argument error.

* Changed detection method and removed commments

diff --git a/util/travis/common.sh b/util/travis/common.sh
index a5b2de7282a014982a601e63d7b358aa23fa59a1..d040f639f2a67cbec24e6ffe4a61cf379b2fd959 100644 (file)
--- a/util/travis/common.sh
+++ b/util/travis/common.sh
@@ -31,7 +31,12 @@ install_linux_deps() {
 # Mac OSX build only
 install_macosx_deps() {
        brew update
-       brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
+       brew install freetype gettext hiredis irrlicht leveldb libogg libvorbis luajit
+       if brew ls | grep -q jpeg; then
+               brew upgrade jpeg
+       else
+               brew install jpeg
+       fi
        #brew upgrade postgresql
 }
 
@@ -39,6 +44,11 @@ install_macosx_deps() {
 TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/"
 
 needs_compile() {
-       git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)"
+       RANGE="$TRAVIS_COMMIT_RANGE"
+       if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then 
+               RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT"
+               echo "Fixed range: $RANGE"
+       fi
+       git diff --name-only $RANGE -- | egrep -q "^($TRIGGER_COMPILE_PATHS)"
 }