Changeset 3012

Timestamp:

02/10/10 15:30:22 (15 years ago)

Author:

jschierm

Message:

Combine all meshpart/metismex patch files into one.

Location:

issm/trunk/externalpackages/meshpart

Files:

• Makefile.patch (deleted)
• chaco.m.patch (deleted)
• fiedler.m.patch (deleted)
• install.sh (modified) (2 diffs)
• meshdemo.m.patch (deleted)
• meshpart.patch (added)
• metismex.c.patch (deleted)
• mlchaco.c.patch (deleted)
• proto.h.patch (deleted)

issm/trunk/externalpackages/meshpart/install.sh

@@ -1 +1 @@
 #!/bin/bash
 
-#Some cleanup
+# Some cleanup
 rm -rf meshpart
 rm -rf src 
 rm -rf install 
 
-#Create src and install directories
+# Create src and install directories
 mkdir src install 
 
-#Untar 
+# Untar 
 tar -xvzf meshpart-020208.tar.gz
 mkdir meshpart/metis
 tar -xvzf metismex-4.0.tar.gz -C meshpart/metis
+#proto.h in metis library is not patched, at least for metismex, so create a local version
+cp ../metis/install/Lib/proto.h meshpart/metis
 
-#Move meshpart to src directory
+# Move meshpart to src directory
 mv meshpart/* src
 rm -rf meshpart
 
-#Apply patches
-patch src/fiedler.m fiedler.m.patch
-patch src/chaco.m chaco.m.patch
-patch src/meshdemo.m meshdemo.m.patch
-patch src/metis/metismex.c metismex.c.patch
-patch src/chaco/mlchaco.c mlchaco.c.patch
-patch src/chaco/Makefile Makefile.patch
+# Apply patches (all at once)
+# (written by diff -rc src ~/Libs/meshpart > meshpart.patch)
+patch -p0 < meshpart.patch
 
 #Nothing to build for meshpart itself
@@ -30 +28 @@
 #Build metismex
 cd src/metis
-#proto.h in metis library is not patched, at least for metismex, so create a local version
+#proto.h in metis library is not patched, at least for metismex, so link with local version
 #mex -I../../../metis/install/Lib -L../../../metis/install -lmetis -largeArrayDims metismex.c
-cp ../../../metis/install/Lib/proto.h .
-patch proto.h ../../proto.h.patch
 mex -I. -I../../../metis/install/Lib -L../../../metis/install -lmetis -largeArrayDims metismex.c
+mv metismex.mex* ..
 cd ../..