Changeset 3083

Timestamp:

02/23/10 09:48:11 (15 years ago)

Author:

jschierm

Message:

MeshPart: use Chaco environment variable for mlchaco build.

File:

• issm/trunk/externalpackages/meshpart/meshpart.patch (modified) (15 diffs)

issm/trunk/externalpackages/meshpart/meshpart.patch

@@ -1 +1 @@
 diff -rc src/chaco/Makefile new/chaco/Makefile
 *** src/chaco/Makefile  1998-07-06 13:08:26.000000000 -0700
---- new/chaco/Makefile  2010-02-19 15:09:04.165652259 -0800
+--- new/chaco/Makefile  2010-02-23 09:35:05.758059211 -0800
 ***************
 *** 24,51 ****
@@ -32 +32 @@
   CHFILES.c=    ${CHACO}/main/interface.c \
                 ${CHACO}/main/main.c \
---- 24,59 ----
+--- 24,60 ----
   # See file ../copyright.m for complete copyright and licensing notice.
   
@@ -43 +43 @@
 ! #CHACO =         ../../Chaco-2.0/code
 ! #CHACO =         ../../Chaco-2.2/code
-! CHACO =         ../../../chaco/src/code
+! #CHACO =         ../../../chaco/src/code
+! CHACO =         ${CHACO_DIR}/../src/code
   
   MLCHACO =       .
@@ -71 +72 @@
 ***************
 *** 53,64 ****
---- 61,74 ----
+--- 62,75 ----
                 ${CHACO}/submain/divide.c \
                 ${CHACO}/submain/submain.c \
@@ -111 +112 @@
                 ${CHACO}/connect/connected.c \
                 ${CHACO}/connect/find_edges.c \
---- 99,124 ----
+--- 100,125 ----
                 ${CHACO}/klvspiff/coarsen_klv.c \
                 ${CHACO}/klvspiff/countup_vtx_sep.c \
@@ -140 +141 @@
 ***************
 *** 232,237 ****
---- 245,251 ----
+--- 246,252 ----
                 ${CHACO}/util/normalize.c \
                 ${CHACO}/util/mergesort.c \
@@ -150 +151 @@
 ***************
 *** 243,248 ****
---- 257,264 ----
+--- 258,265 ----
                 ${CHACO}/util/vecout.c \
                 ${CHACO}/util/vecran.c \
@@ -169 +170 @@
   
   chaco.a:        ${CHFILES.o}
---- 268,279 ----
+--- 269,280 ----
   #             ${MATLAB}/bin/cmex CC='gcc -G' -lm ${OFLAGS} ${MLFILES.o} chaco.a; \
   #                 mv mlchaco.mex* ${DEST_DIR}
@@ -184 +185 @@
 diff -rc src/chaco/mlchaco.c new/chaco/mlchaco.c
 *** src/chaco/mlchaco.c 1999-07-23 12:19:09.000000000 -0700
---- new/chaco/mlchaco.c 2010-02-10 15:31:43.903181816 -0800
+--- new/chaco/mlchaco.c 2010-02-22 15:23:01.839849734 -0800
 ***************
 *** 32,37 ****
@@ -335 +336 @@
 diff -rc src/chaco.m new/chaco.m
 *** src/chaco.m 1999-07-23 12:13:26.000000000 -0700
---- new/chaco.m 2010-02-10 15:31:43.909181823 -0800
+--- new/chaco.m 2010-02-22 15:23:01.846849738 -0800
 ***************
 *** 142,148 ****
@@ -356 +357 @@
 diff -rc src/fiedler.m new/fiedler.m
 *** src/fiedler.m       1996-02-23 10:03:20.000000000 -0800
---- new/fiedler.m       2010-02-10 15:31:43.914181829 -0800
+--- new/fiedler.m       2010-02-22 15:23:01.852849742 -0800
 ***************
 *** 58,64 ****
@@ -380 +381 @@
 diff -rc src/meshdemo.m new/meshdemo.m
 *** src/meshdemo.m      2002-02-08 07:38:21.000000000 -0800
---- new/meshdemo.m      2010-02-10 15:31:43.920181835 -0800
+--- new/meshdemo.m      2010-02-22 15:23:01.859849746 -0800
 ***************
 *** 97,103 ****
@@ -400 +401 @@
 diff -rc src/metis/metismex.c new/metis/metismex.c
 *** src/metis/metismex.c        2009-07-13 14:37:08.000000000 -0700
---- new/metis/metismex.c        2010-02-10 15:31:43.926181842 -0800
+--- new/metis/metismex.c        2010-02-22 15:23:01.866849750 -0800
 ***************
 *** 92,98 ****
@@ -420 +421 @@
   
       /* Find MATLAB's matrix structure */
-Only in new/metis: metismex.mexa64
 diff -rc src/metis/proto.h new/metis/proto.h
 *** src/metis/proto.h   2009-09-22 17:24:29.402085000 -0700
---- new/metis/proto.h   2010-02-10 15:31:43.932181849 -0800
+--- new/metis/proto.h   2010-02-22 15:23:01.874849755 -0800
 ***************
 *** 230,237 ****
@@ -463 +463 @@
   
   
-Only in new: metismex.mexa64
-Only in new: mlchaco.mexa64
+Only in src: metismex.mexsol