Changeset 10238

Timestamp:

10/19/11 12:01:03 (13 years ago)

Author:

jschierm

Message:

shapelib: Adding extraction of sample files so that first test could be run.

Location:

issm/trunk/externalpackages/shapelib

Files:

• install.sh (modified) (1 diff)
• shapelib.patch (modified) (5 diffs)

issm/trunk/externalpackages/shapelib/install.sh

@@ -14 +14 @@
 # Untar 
 tar -xvzf shapelib-1.2.10.tar.gz
+unzip shape_eg_data.zip -d shapelib-1.2.10/eg_data
 
 # Move shapelib to src directory

issm/trunk/externalpackages/shapelib/shapelib.patch

@@ -1 @@
-Only in src: .cvsignore
 diff -rc src/Makefile src_new/Makefile
 *** src/Makefile        2003-04-07 06:03:22.000000000 -0700
---- src_new/Makefile    2011-10-14 15:16:16.185467035 -0700
+--- src_new/Makefile    2011-10-19 11:58:13.993411828 -0700
 ***************
 *** 1,20 ****
@@ -51 +50 @@
   
 ***************
-*** 36,56 ****
+*** 36,58 ****
   dbfdump:      dbfdump.c dbfopen.o
         $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump
@@ -71 +70 @@
 -       rm -f shptest
   
-  test: test2 test3
+! test: test2 test3
   
---- 40,62 ----
+  #
+  #     Note this stream only works if example data is accessable.
+--- 40,64 ----
   dbfdump:      dbfdump.c dbfopen.o
         $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump
@@ -95 +96 @@
         rm -rf *.lo *.la .libs
   
-  test: test2 test3
+! test: test1 test2 test3
   
-Only in src: shprewind
+  #
+  #     Note this stream only works if example data is accessable.
 diff -rc src/shputils.c src_new/shputils.c
 *** src/shputils.c      2003-04-07 06:03:22.000000000 -0700
@@ -118 +120 @@
                   }
                   printf("Output file coordinate values will be factored by %lg\n",factor);
+diff -rc src/stream1.sh src_new/stream1.sh
+*** src/stream1.sh      2003-04-07 06:03:22.000000000 -0700
+--- src_new/stream1.sh  2011-10-19 11:45:08.192964291 -0700
+***************
+*** 1,6 ****
+  #!/bin/sh
+        
+! EG_DATA=/u/www/projects/shapelib/eg_data
+  
+  echo -------------------------------------------------------------------------
+  echo Test 1: dump anno.shp
+--- 1,6 ----
+  #!/bin/sh
+        
+! EG_DATA=./eg_data
+  
+  echo -------------------------------------------------------------------------
+  echo Test 1: dump anno.shp