install pdf2htmlEX on deployment

diff --git a/README.md b/README.md
index 9bde96329691412f67b65d1c268dbc76a7f2bc36..fa859a9dd8d4b761f030c64d4522a8f2a20a55eb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -181,13 +181,17 @@ not generally be needed.
    * `PIP`
    * `virtualenv`
    * `virtualenvwrapper` (might not be needed anymore)
+   * `pdf2htmlEX`
 
    On a Debian system supporting Apt, this can be done with:
 
-       sudo apt-get install python-pip postgresql python-virtualenv \
-                            virtualenvwrapper git nginx p7zip-full \
-                            postgresql-server-dev-9.1 libxslt1-dev libxml2-dev \
-                            libmemcached-dev python-dev rabbitmq-server
+        sudo apt-get install python-pip postgresql python-virtualenv nginx \
+                             virtualenvwrapper git libxml2-dev p7zip-full \
+                             postgresql-server-dev-9.1 libxslt1-dev \
+                             libmemcached-dev python-dev rabbitmq-server
+
+        sudo add-apt-repository ppa:coolwanglu/pdf2htmlex
+        sudo apt-get install fontforge poppler pdf2htmlex
 
 1. Generate a PostgreSQL database and a role with read/write permissions.
    * For Debian, these instructions are helpful: https://wiki.debian.org/PostgreSql

diff --git a/Vagrantfile b/Vagrantfile
index 6fd8178ebb0b7f62915798009068b43d2423f3c1..c77b866882b7282e516e702b2df7cc62c104909c 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,12 +38,14 @@ Host 127.0.0.1
 EOF
 chmod 644 /home/vagrant/.ssh/config
 
+add-apt-repository ppa:coolwanglu/pdf2htmlex # fontforge poppler pdf2htmlex
+
 apt-get update
 apt-get upgrade -y
 apt-get install -y python-pip postgresql python-virtualenv virtualenvwrapper \
                    git nginx postgresql-server-dev-9.1 libxslt1-dev \
                    libxml2-dev libmemcached-dev python-dev rabbitmq-server \
-                   p7zip-full
+                   p7zip-full fontforge poppler pdf2htmlex
 
 echo "CREATE USER vagrant WITH CREATEROLE LOGIN; CREATE DATABASE karmaworld OWNER vagrant;" | su postgres -c "psql"
 

diff --git a/fabfile.py b/fabfile.py
index ef39c4ae159ee516793ca83a523ec6159741419a..e4f5097a8d4af6743b445d442b24b236c23e922e 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -249,38 +249,6 @@ def import_usde():
     virtenv_exec('{0}/manage.py import_usde_csv {1}'.format(env.code_root, env.usde_csv))
     virtenv_exec('{0}/manage.py sanitize_usde_schools'.format(env.code_root))
 
-@task
-def install_pdf2htmlEX():
-    """
-    # Some things we need:
-    sudo apt-get install cmake libpng-dev libjpeg-dev libgtk2.0-dev pkg-config libfontconfig1-dev autoconf libtool
-
-    # Ubuntu 12.04 comes with a version of poppler that is too
-    # old, so compile our own
-    wget http://poppler.freedesktop.org/poppler-0.24.4.tar.xz
-    tar xf poppler-0.24.4.tar.gz
-    ./configure --prefix=/usr --enable-xpdf-headers
-    make
-    sudo make install
-
-    # Ubuntu 12.04 comes with a version of fontforge that is too
-    # old, so compile our own
-    git clone https://github.com/fontforge/fontforge.git
-    ./autogen.sh
-    ./configure --prefix=/usr
-    make
-    sudo make install
-
-    # Compile pdf2htmlEX
-    wget https://github.com/coolwanglu/pdf2htmlEX/archive/v0.10.tar.gz
-    tar xf x0.10.tar.gz
-    cd pdf2htmlEX
-    cmake .
-    make
-    sudo make install
-    """
-    print "not implemented yet!"
-
 @task
 def first_deploy():
     """