incubator-joshua git commit: attempt to fix travis CI build

[mj...@apache.org]

Repository: incubator-joshua
Updated Branches:
  refs/heads/JOSHUA-327 [created] f58188163


attempt to fix travis CI build

download-deps.sh was recently edited to require ack. of downloading non-Apache licensed
software. this caused travis ci builds to hang indefinitely.
you can now bypass this with a very long argument to the script.


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/f5818816
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/f5818816
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/f5818816

Branch: refs/heads/JOSHUA-327
Commit: f581881631ffa8f68d9f4e864909da5002b6067f
Parents: 3ef13a0
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 13:43:20 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 13:43:20 2017 -0500

----------------------------------------------------------------------
 .travis.yml      |  2 +-
 download-deps.sh | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/f5818816/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8f78ca2..e22f732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
       - sudo apt-get -y update
       - sudo apt-get -y install build-essential libboost-all-dev zlib1g-dev libbz2-dev liblzma-dev cmake cmake-data
       - export JOSHUA=`pwd`
-      - ./download-deps.sh
+      - ./download-deps.sh yes-i-want-non-apache-licensed-software
     - os: osx
       osx_image: xcode8
       before_install:

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/f5818816/download-deps.sh
----------------------------------------------------------------------
diff --git a/download-deps.sh b/download-deps.sh
index 65d4eba..969588c 100755
--- a/download-deps.sh
+++ b/download-deps.sh
@@ -14,12 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo "Warning: this script downloads many tools used in building and running Joshua."
-echo "Not all of them are Apache Licensed. If you wish to continue, type 'y' and hit Enter".
-echo -n "Continue? (y to continue) "
-read j
-if [[ $j != 'y' ]]; then
-    echo "Quitting."
+if [[ $1 = "yes-i-want-non-apache-licensed-software" ]]; then
+  echo "Warning: this script downloads many tools used in building and running Joshua."
+  echo "Not all of them are Apache Licensed. The argument passed to this script has"
+  echo "been interpreted as preemptive acknowledgment of this fact."
+  sleep 5
+else
+  echo "Warning: this script downloads many tools used in building and running Joshua."
+  echo "Not all of them are Apache Licensed. If you wish to continue, type 'y' and hit Enter".
+  echo -n "Continue? (y to continue) "
+  read j
+  if [[ $j != 'y' ]]; then
+      echo "Quitting."
+  fi
 fi
 
 git clone https://github.com/kpu/kenlm.git ext/kenlm