*** empty log message ***

Cantera/matlab/setup_matlab.py

@@ -1,10 +1,10 @@
 
 import sys
 
-bindir = '/usr/local/bin'
-libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.0.0'
-incdir = '/Users/dgg/dv/sf/cantera/build/include'
-libs   = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx  -lg2c -lgcc'
+bindir = 'c:/cantera/bin'
+libdir = 'd:/dgg/dv/sf/cantera/build/lib/i686-pc-win32'
+incdir = 'd:/dgg/dv/sf/cantera/build/include'
+libs   = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx  '
 
 f = open('setup.m','w')
 f.write('cd cantera\nbuildux\nexit\n')

Cantera/python/Makefile.in

@@ -13,6 +13,9 @@ CANTERA_LIBDIR= @buildlib@
 LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
            $(CANTERA_LIBDIR)/liboneD.a \
            $(CANTERA_LIBDIR)/libtransport.a
+WIN_LIB_DEPS = $(CANTERA_LIBDIR)/cantera.lib $(CANTERA_LIBDIR)/zeroD.lib \
+           $(CANTERA_LIBDIR)/oneD.lib \
+           $(CANTERA_LIBDIR)/transport.lib
 SRCS = src/ctphase_methods.cpp \
       src/ctthermo_methods.cpp \
       src/ctkinetics_methods.cpp \
@@ -41,21 +44,15 @@ _build: $(SRCS) $(LIB_DEPS)
 
 _winbuild: $(SRCS)
 	touch src/pycantera.cpp 
-	cp -f winsetup.py setup.py
 	(@PYTHON_CMD@ setup.py build)
 	echo 'ok' > _winbuild
 
 install:
-ifeq ($(os_is_win),0)
 ifeq (@local_inst@,1)
 	(@PYTHON_CMD@ setup.py install --prefix=@prefix@)
 else
 	(@PYTHON_CMD@ setup.py install)
 endif
-else
-	cp -f winsetup.py setup.py
-	(@PYTHON_CMD@ setup.py install)
-endif
 
 clean:
 	@PYTHON_CMD@ setup.py clean

Cantera/python/setup.py.in

@@ -9,7 +9,9 @@ libs = []
 platform = sys.platform
 
 if platform == "win32":
-    libs = ["cantera14"]
+    libs = ["clib", "zeroD","oneD","transport",
+            "cantera","recipes","ctlapack",
+            "ctblas", "ctmath", "cvode", "tpx"]
 else:
     libs = ["clib", "zeroD","oneD","transport",
             "cantera","recipes","ctlapack",

Makefile.in

@@ -22,7 +22,7 @@ all: kernel user cxxlib hdr-collect clib python matlab utils datafiles
 
 # use this target on a Windows machine to build the Python and
 # MATLAB interfaces after building the project in Visual C++
-win: python matlab 
+win: hdr-collect python matlab 
 
 
 install: hdr-install kernel-install data-install python-install matlab-install tools-install finish-install

config.h

@@ -1,4 +1,4 @@
-/* ../config.h.  Generated by configure.  */
+/* ../config.h.  Generated automatically by configure.  */
 //
 //  Run the 'configure' script to generate 'config.h' from this input file.
 //
@@ -9,11 +9,11 @@
 //------------------------ Fortran settings -------------------//
 
 
-// define types doublereal, integer, and ftnlen to match the
+// define types doublereal, integer, and ftnlen to match the 
 // corresponding Fortran data types on your system. The defaults
 // are OK for most systems
 
-typedef  double       doublereal;       // Fortran double precision
+typedef  double       doublereal;       // Fortran double precision 
 typedef  int          integer;          // Fortran integer
 typedef  int          ftnlen;           // Fortran hidden string length type
 
@@ -22,7 +22,7 @@ typedef  int          ftnlen;           // Fortran hidden string length type
 // adding a hidden argement with the length of the string. Some
 // compilers add the hidden length argument immediately after the
 // CHARACTER variable being passed, while others put all of the hidden
-// length arguments at the end of the argument list. Define this if
+// length arguments at the end of the argument list. Define this if 
 // the lengths are at the end of the argument list. This is usually the
 // case for most unix Fortran compilers, but is (by default) false for
 // Visual Fortran under Windows.
@@ -37,7 +37,7 @@ typedef  int          ftnlen;           // Fortran hidden string length type
 //-------- LAPACK / BLAS ---------
 
 // Define if you are using LAPACK and BLAS from the Intel Math Kernel
-// Library
+// Library 
 /* #undef HAVE_INTEL_MKL */
 
 #define LAPACK_FTN_STRING_LEN_AT_END
@@ -50,7 +50,7 @@ typedef  int          ftnlen;           // Fortran hidden string length type
 // The configure script defines this if the operatiing system is Mac
 // OS X, This used to add some Mac-specific directories to the default
 // data file search path.
-#define DARWIN 1
+#define DARWIN 0
 
 
 //--------- Fonts for reaction path diagrams ----------------------
@@ -60,13 +60,13 @@ typedef  int          ftnlen;           // Fortran hidden string length type
 //--------------------- Python ------------------------------------
 
 // used to run Python to process .cti files
-#define PYTHON_EXE "/usr/bin/python"
+#define PYTHON_EXE "c:/python23/python"
 
 
-//--------------------- Cantera -----------------------------------
+//--------------------- Cantera ----------------------------------- 
 
-// used to find data files
-#define CANTERA_ROOT "/usr/local/cantera"
+// used to find data files 
+#define CANTERA_ROOT "c:/cantera/cantera"
 
 
 

config/configure.in

@@ -33,7 +33,12 @@ esac
 
 local_inst=1
 if test "x${prefix}" = "xNONE"; then
-         prefix=${ac_default_prefix}
+         if test "x${OS_IS_WIN}" = "x1"; then
+           prefix="/cygdrive/c/cantera"
+           mkdir ${prefix}
+         else
+           prefix=${ac_default_prefix}
+         fi
          local_inst=0
 	 if test ! -d ${prefix}; then
   echo 
@@ -119,6 +124,9 @@ AC_SUBST(CANTERA_DATADIR)
 ctroot=`(cd ..;pwd)`
 if test "x${OS_IS_WIN}" = "x1"; then
   ctroot=`cygpath -a -w "${ctroot}" | sed 's/\\\/\\//g'`
+  builddir="i686-pc-win32"
+else
+  builddir=$target
 fi
 
 if test -z "$username"; then username=$USER; fi
@@ -132,8 +140,11 @@ AC_CANONICAL_SYSTEM()
 buildinc=$ctroot/build/include
 AC_SUBST(buildinc)
 
-buildlib=$ctroot/build/lib/$target
+
+buildlib=$ctroot/build/lib/$builddir
 AC_SUBST(buildlib)
+buildbin=$ctroot/build/bin/$builddir
+AC_SUBST(buildbin)
 
 AC_DEFINE_UNQUOTED(DARWIN,$OS_IS_DARWIN)
 AC_DEFINE_UNQUOTED(RXNPATH_FONT,"$RPFONT")
@@ -382,12 +393,18 @@ AC_SUBST(export_name)
 
 
 dnl Checks for programs.
+AC_PROG_INSTALL
+precompile_headers=no
+if test "x$OS_IS_WIN" = "x1"; then
+CXX=cl.exe
+CC=cl.exe
+else
+
 AC_PROG_CXX()
 AC_PROG_CC()
-AC_PROG_INSTALL
 
 AC_MSG_CHECKING(for ability to precompile headers)
-precompile_headers=no
+
 if test -n "$GCC"; then
  msg=`rm -f *h.gch; $CXX testpch.h &> /dev/null`
  if test -f testpch.h.gch; then 
@@ -395,9 +412,7 @@ if test -n "$GCC"; then
  fi
 fi
 AC_MSG_RESULT(${precompile_headers})
-AC_SUBST(precompile_headers)
 
-AC_SUBST(CXX_DEPENDS)
 
 #---------------------------------
 #     Fortran
@@ -416,6 +431,15 @@ AC_F77_LIBRARY_LDFLAGS()
 case $ac_sys_system in
   Darwin*)  FLIBS='-lg2c -lgcc'; SHARED_CTLIB=0;;
 esac
+
+
+AC_OBJEXT
+AC_EXEEXT
+
+fi
+
+AC_SUBST(precompile_headers)
+AC_SUBST(CXX_DEPENDS)
 AC_SUBST(FLIBS)
 AC_SUBST(OS_IS_DARWIN)
 AC_SUBST(OS_IS_WIN)
@@ -429,9 +453,6 @@ AC_SUBST(F77_EXT)
 
 AC_LANG_CPLUSPLUS
 
-AC_OBJEXT
-AC_EXEEXT
-
 if test -z "$CXX_EXT"; then CXX_EXT=cpp; fi
 AC_SUBST(CXX_EXT)
 

configure

@@ -290,22 +290,6 @@ export SOEXT
 export MAKE
 export RPFONT
 
-#checkroot="checking whether CANTERA_ROOT is properly set..."
-#if test "$CANTERA_ROOT_INIT" = "$CANTERA_ROOT"; then 
-#    echo $checkroot' 'yes
-#else
-#    echo $checkroot' 'no
-#    echo '
-####  IMPORTANT!
-####  before using Cantera, set environment variable 
-####  CANTERA_ROOT to '$CANTERA_ROOT
-#    if test -n "$CANTERA_ROOT_INIT"; then
-#        echo '####  (CANTERA_ROOT is currently set to '$CANTERA_ROOT_INIT')
-# '
-#    fi
-#
-#fi
-
 cd config
 chmod +x ./configure 
 chmod +x ./config.guess

tools/src/Makefile.in

@@ -2,7 +2,7 @@
 
 LIBDIR = @buildlib@
 INCDIR = -I@ctroot@/Cantera/src
-BINDIR = @ctroot@/bin
+BINDIR = @buildbin@/bin
 build_ck = @BUILD_CK@
 
 LCXX_FLAGS = -L$(LIBDIR)  @CXXFLAGS@