Changeset 3011

Timestamp:

02/10/10 14:13:56 (15 years ago)

Author:

jschierm

Message:

Combine all chaco patch files into one.

Location:

issm/trunk/externalpackages/chaco

Files:

• Makefile.patch (deleted)
• assign_out.c.patch (deleted)
• bail.c.patch (deleted)
• chaco.patch (added)
• checkpnt.c.patch (deleted)
• defs.h.patch (deleted)
• doubleout.c.patch (deleted)
• get_extval.c.patch (deleted)
• install.sh (modified) (1 diff)
• matching.c.patch (deleted)
• smalloc.c.patch (deleted)
• strout.c.patch (deleted)
• timing.c.patch (deleted)

issm/trunk/externalpackages/chaco/install.sh

@@ -1 +1 @@
 #!/bin/bash
 
-#Some cleanup
+# Some cleanup
 rm -rf Chaco-2.2
 rm -rf src 
 rm -rf install 
 
-#Create src and install directories
+# Create src and install directories
 mkdir src install 
 
-#Untar 
+# Untar 
 tar -xvzf Chaco-2.2.tar.gz
 
-#Move chaco to src directory
+# Move chaco to src directory
 mv Chaco-2.2/* src
 rm -rf Chaco-2.2
 
-#Apply patches
-patch src/code/main/defs.h defs.h.patch
-patch src/code/assign/assign_out.c assign_out.c.patch
-patch src/code/eigen/get_extval.c get_extval.c.patch
-patch src/code/klvspiff/matching.c matching.c.patch
-patch src/code/misc/timing.c timing.c.patch
-patch src/code/util/bail.c bail.c.patch
-patch src/code/util/checkpnt.c checkpnt.c.patch
-patch src/code/util/doubleout.c doubleout.c.patch
-patch src/code/util/smalloc.c smalloc.c.patch
-patch src/code/util/strout.c strout.c.patch
-patch src/code/Makefile Makefile.patch
+# Apply patches (all at once)
+# (written by diff -rc src ~/Libs/Chaco-2.2 > chaco.patch)
+patch -p0 < chaco.patch
 
-#Build chaco
+# Build chaco
 cd src/code
 make
-#Clean up, so that meshpart creates its own objects for mlchaco
+# Clean up, so that meshpart creates its own objects for mlchaco
 make clean
 cd ../..