refactored out dependencies

.travis.yml

@@ -20,20 +20,11 @@ install:
   # enables pypy to compile
  # - "sudo apt-get install python-tk"
 
-  # webp  UNDONE -- refactor
+  # webp  
-  - date
+  - pushd depends && ./install_web[.sh && popd
-  - "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
 
   # openjpeg
-  - "wget 'https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz' -O /tmp/openjpeg-2.0.0.tar.gz"
+  - pushd depends && ./install_openjpeg.sh && popd
-  - "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
 
 script:
   - python setup.py clean

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
+

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
+