From 31b84f41bca0dc35efcdb18fcceeb15be02163f2 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 26 Mar 2014 13:22:37 -0700
Subject: [PATCH] refactored out dependencies

---
 .travis.yml                 | 15 +++------------
 depends/install_openjpeg.sh | 18 ++++++++++++++++++
 depends/install_webp.sh     | 18 ++++++++++++++++++
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100755 depends/install_openjpeg.sh
 create mode 100755 depends/install_webp.sh

diff --git a/.travis.yml b/.travis.yml
index 28b9cbf24..9c0d2fb28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,20 +20,11 @@ install:
   # enables pypy to compile
  # - "sudo apt-get install python-tk"
 
-  # webp  UNDONE -- refactor
-  - date
-  - "wget 'https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz' -O /tmp/libwebp-0.4.0.tar.gz"
-  - date
-  - "tar -C /tmp -xvzf /tmp/libwebp-0.4.0.tar.gz"
-  - "pushd /tmp/libwebp-0.4.0 && ./configure --prefix=/usr --enable-libwebpmux --enable-libwebpdemux && make && sudo make install && popd"
-  - date
+  # webp  
+  - pushd depends && ./install_web[.sh && popd
 
   # openjpeg
-  - "wget 'https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz' -O /tmp/openjpeg-2.0.0.tar.gz"
-  - "tar -C /tmp -xvzf /tmp/openjpeg-2.0.0.tar.gz"
-  - date
-  - "pushd /tmp/openjpeg-2.0.0 && cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install && popd"
-  - date
+  - pushd depends && ./install_openjpeg.sh && popd
 
 script:
   - python setup.py clean
diff --git a/depends/install_openjpeg.sh b/depends/install_openjpeg.sh
new file mode 100755
index 000000000..bd6b83e3b
--- /dev/null
+++ b/depends/install_openjpeg.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# install openjpeg
+
+
+if [ ! -f openjpeg-2.0.0.tar.gz ]; then
+    wget 'https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz' 
+fi
+
+rm -r openjpeg-2.0.0
+tar -xvzf openjpeg-2.0.0.tar.gz
+
+
+pushd openjpeg-2.0.0 
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install
+
+popd
+
diff --git a/depends/install_webp.sh b/depends/install_webp.sh
new file mode 100755
index 000000000..5f5963712
--- /dev/null
+++ b/depends/install_webp.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# install webp
+
+
+if [ ! -f libwebp-0.4.0.tar.gz ]; then
+    wget 'https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz'
+fi
+
+rm -r libwebp-0.4.0
+tar -xvzf libwebp-0.4.0.tar.gz
+
+
+pushd libwebp-0.4.0 
+
+./configure --prefix=/usr --enable-libwebpmux --enable-libwebpdemux && make && sudo make install
+
+popd
+