Check package dependencies to decide if it should be tested by travis or not.

.travis.yml

@@ -113,9 +113,8 @@ before_script:
 - sudo make install &>/dev/null
 - cd ..
 - sudo bash ./.travis/install_openmesh.sh
-script:
+script: 
 - cd ./.travis
-- doxygen --version
 - bash -x -e ./build_package.sh $PACKAGE
 addons: 
   apt:
@@ -144,8 +143,13 @@ addons:
       - qt55svg
       - qt55tools
       - qt55graphicaleffects
+<<<<<<< HEAD
+      - libopencv-dev       
+=======
       - libopencv-dev
+      - bibtex2html
        
+>>>>>>> ac52f483a8... finishing integration of dependencies check
       - mesa-common-dev
       - libglu1-mesa-dev
       # Not allowed (yet) 

.travis/build_package.sh

@@ -55,11 +55,11 @@ for ARG in $(echo "$@")
 do
   if [ "$ARG" = "CHECK" ]
 	then
+    zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
     #test dependencies 
     cd $ROOT
     bash Scripts/developer_scripts/cgal_check_dependencies.sh /usr/bin/doxygen
     cd .travis
-    zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
   	#parse current matrix and check that no package has been forgotten
 	  old_IFS=$IFS
 	  IFS=$'\n'
@@ -115,10 +115,19 @@ do
     cd ..
     exit 0
   fi
-    
+   
-	EXAMPLES="$ARG/examples/$ARG"
+  if [ -n "$TRAVIS_PULL_REQUEST" ]; then
-	TEST="$ARG/test/$ARG" 
+    DO_IGNORE=FALSE
-	DEMOS=$ROOT/$ARG/demo/*
+    . test_package.sh "$ROOT" "$ARG"
+    echo "DO_IGNORE is $DO_IGNORE"
+    if [ "$DO_IGNOE" = "TRUE" ]; then
+      exit 0
+    fi
+  fi
+  
+  EXAMPLES="$ARG/examples/$ARG"
+  TEST="$ARG/test/$ARG" 
+  DEMOS=$ROOT/$ARG/demo/*
   if [ "$ARG" = AABB_tree ] || [ "$ARG" = Alpha_shapes_3 ] ||\
      [ "$ARG" = Circular_kernel_3 ] || [ "$ARG" = Linear_cell_complex ] ||\
      [ "$ARG" = Periodic_3_triangulation_3 ] || [ "$ARG" = Principal_component_analysis ] ||\

.travis/template.txt

@@ -20,7 +20,6 @@ before_script:
 - sudo bash ./.travis/install_openmesh.sh
 script:
 - cd ./.travis
-- doxygen --version
 - bash -x -e ./build_package.sh $PACKAGE
 addons: 
   apt:

.travis/test_package.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+#Will cd $1 and test packge named $2
+#to find out if it or one of its dependencies has changed in the current branch
+
+DO_IGNORE=FALSE
+cd $1
+old_IFS=$IFS
+IFS=$'\n'
+
+LIST_OF_FILES=$(git diff --name-only origin/master |cut -d/ -f1 |uniq |sort)
+LIST_OF_DEPS=$(cat "$2/dependencies")
+echo "$LIST_OF_DEPS"
+for flie in $LIST_OF_DEPS
+do
+  [[ $LIST_OF_FILES =~ (^|[[:space:]])$flie($|[[:space:]]) ]] && return
+done
+echo "Package ignored because none of its dependencies has been modified."
+DO_IGNORE=TRUE
+IFS=$old_IFS
+

Scripts/developer_scripts/cgal_check_dependencies.sh

@@ -1,5 +1,6 @@
 #This script must be called from the CGAL root.
 set -e
+set -x
 while test $# -gt 0
 do
     case "$1" in