From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 21 Oct 2009 19:26:12 +0000 (-0400)
Subject: Changed my mind about using the SVN version of Shapely. Now using v1.0.14.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=39329a27446673a022c7b0525af916ad94fa70e6;p=dead%2Fcensus-tools.git

Changed my mind about using the SVN version of Shapely. Now using v1.0.14.
---

diff --git a/lib/README b/lib/README
index 7149482..61bb6f0 100644
--- a/lib/README
+++ b/lib/README
@@ -1,8 +1,11 @@
 Third-party libraries are stored here. Currently, Shapely is the only
 one we're using which isn't available through package managers.
 
-Shapely should be pulled from Subversion:
-
-  svn co http://svn.gispython.org/svn/gispy/Shapely/trunk Shapely
+Shapely should be downloaded and extracted:
 
+  wget http://pypi.python.org/packages/source/S/Shapely/Shapely-1.0.14.tar.gz
+  tar -xvzf Shapely-1.0.14.tar.gz
+  mv Shapely-1.0.14 Shapely
+  rm Shapely-1.0.14.tar.gz
+  
 This will probably be handled by the makefile.
diff --git a/makefile b/makefile
index 691e194..11a9c5c 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 DB_NAME=census
 DB_USER=postgres
 TIGER_SRID=4269
-SHAPELY_URL=http://svn.gispython.org/svn/gispy/Shapely/trunk
+SHAPELY_URL=http://pypi.python.org/packages/source/S/Shapely/Shapely-1.0.14.tar.gz
 
 # Root folder for the shapefiles.
 TIGER_ROOT=http://www2.census.gov/geo/tiger/TIGER2009
@@ -43,11 +43,11 @@ test:
 
 # Download or check out any third-party libraries.
 lib:
-	if [ -d lib/Shapely ]; then 		   \
-		cd lib/Shapely;     		   \
-		svn update;	    		   \
-	else			    	           \
-		svn co $(SHAPELY_URL) lib/Shapely; \
+	if [ ! -d lib/Shapely ]; then  			\
+		wget -O shapely.tar.gz $(SHAPELY_URL);  \
+		tar -xvzf shapely.tar.gz -C lib/    ;   \
+		rm shapely.tar.gz;                      \
+		mv lib/Shapely* lib/Shapely;            \
 	fi;