diff -Naur fixcase/genesis/src/Makefile.Cygwin cygwin/genesis/src/Makefile.Cygwin --- fixcase/genesis/src/Makefile.Cygwin 1969-12-31 21:00:00.000000000 -0300 +++ cygwin/genesis/src/Makefile.Cygwin 2004-09-20 13:29:28.000000000 -0300 @@ -0,0 +1,148 @@ +# $Id$ +# +# GENESIS/XODUS : network simulator +# +# YOU MUST NOT EDIT THIS MAKEFILE TO CONFIGURE GENESIS! +# All configuration is in the file Makefile. +# +# $Log$ +# +# + +# Adapted from Makefile.other rev 1.20 + +MACHINE = Cygwin +OS = $(OS_IN) +CC = $(CC_IN) +CPP = $(CPP_IN) +LD = $(LD_IN) +LDFLAGS = $(LDFLAGS_IN) +AR = $(AR_IN) +RANLIB = $(RANLIB_IN) +CFLAGS = $(COPT) +LLIBS = $(LIBS) $(EXTRALIBS) + +YACC = $(YACC_IN) +LEX = $(LEX_IN) +LEXLIB = $(LEXLIB_IN) + +SIMLIB = ../lib +XODUSLIB = xodus + +GENESIS = $(BASECODE) \ + $(OBJLIBS) \ + loadlib.o + +NXGENESIS = $(BASECODE) \ + $(OBJLIBS) \ + nxloadlib.o + +MINGENESIS = $(BASECODE) \ + minloadlib.o + +FULLDIR = startup $(SUBDIR) +NXDIR = startup $(NXSUBDIR) +MINDIR = startup $(MINSUBDIR) + +# ========================================================================= + +default: + @echo "This is not the top level makefile" + +nxdefault: + @echo "This is not the top level makefile" + +mindefault: + @echo "This is not the top level makefile" + +genesis: libs $(GENESIS) $(XODUS) + $(CC) $(CFLAGS) $(LDFLAGS) $(GENESIS) $(XODUS) $(XLIBS) $(LLIBS) -o genesis + @echo "Full GENESIS Compiled -- All Done" + +nxgenesis: nxlibs $(NXGENESIS) + $(CC) $(CFLAGS) $(LDFLAGS) $(NXGENESIS) $(LLIBS) -o nxgenesis + @echo "Non-X GENESIS Compiled -- All Done" + +mingenesis: minlibs $(MINGENESIS) + $(CC) $(CFLAGS) $(LDFLAGS) $(MINGENESIS) $(LLIBS) -o mingenesis + @echo "Minimal GENESIS Compiled -- All Done" + +code_g: + @(echo cd sys; cd sys; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)" RCSRELEASE="$(RCSRELEASE)"; cd ..) + @(echo cd ss; cd ss; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" YACC="$(YACC)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)" RCSRELEASE="$(RCSRELEASE)"; cd ..) + @(echo cd shell; cd shell; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)" RCSRELEASE="$(RCSRELEASE)" code_g; cd ..) + @(echo cd sys; cd sys; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LEXLIB="$(LEXLIB)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)" RCSRELEASE="$(RCSRELEASE)" code_g; cd ..) + @echo "code_g Compiled" + +libs: + @(echo cd sys; cd sys; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" code_sym code_lib code_func) + @(echo cd shell; cd shell; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)") + @(for i in $(SUBDIR); do echo cd $$i; cd $$i; make CC="$(CC)" TMPDIR="$(TMPDIR)" DISKIOSUBDIR="$(DISKIOSUBDIR)" LD="$(LD)" AR="$(AR)" RANLIB="$(RANLIB)" CPP="$(CPP)" YACC="$(YACC)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" XINCLUDE="$(XINCLUDE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)"; cd ..;done) + @echo "All Libs Compiled" + +nxlibs: + @(echo cd sys; cd sys; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" code_sym code_lib code_func) + @(echo cd shell; cd shell; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)") + @(for i in $(NXSUBDIR); do echo cd $$i; cd $$i; make CC="$(CC)" TMPDIR="$(TMPDIR)" DISKIOSUBDIR="$(DISKIOSUBDIR)" LD="$(LD)" AR="$(AR)" RANLIB="$(RANLIB)" CPP="$(CPP)" YACC="$(YACC)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)"; cd ..;done) + @echo "Non-X Libs Compiled" + +minlibs: + @(echo cd sys; cd sys; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" code_sym code_lib code_func) + @(echo cd shell; cd shell; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)" TERMCAP="$(TERMCAP)" TERMOPT="$(TERMOPT)") + @(for i in $(MINSUBDIR); do echo cd $$i; cd $$i; make CC="$(CC)" TMPDIR="$(TMPDIR)" LD="$(LD)" AR="$(AR)" RANLIB="$(RANLIB)" CPP="$(CPP)" YACC="$(YACC)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" LDFLAGS="$(LDFLAGS)" OS="$(OS)" MACHINE="$(MACHINE)" INSTALL="$(INSTALL)" COPT="$(CFLAGS)"; cd ..;done) + @echo "Minimal Libs Compiled" + +.c.o: + $(CC) $(CFLAGS) -D$(MACHINE) -c $(SIMINCLUDE) $< + +loadlib.c: liblist + ./libsh < liblist > loadlib.c + +nxloadlib.c: nxliblist + ./libsh < nxliblist > nxloadlib.c + +minloadlib.c: minliblist + ./libsh < minliblist > minloadlib.c + +cleandist: + @echo "You must run cleandist from the toplevel makefile" + +clean: + @(for i in $(SUBDIR); do echo cd $$i; cd $$i; make DISKIOSUBDIR="$(DISKIOSUBDIR)" MACHINE="$(MACHINE)" clean; cd ..;done) + -(rm -rf genesis.exe loadlib.o loadlib.c) + -(rm -rf nxgenesis.exe nxloadlib.o nxloadlib.c) + -(rm -rf mingenesis.exe minloadlib.o minloadlib.c) + @echo "Done with Cleaning" + +copydirs: + @(if /usr/bin/test ! ../Scripts -ef $(INSTALL)/Scripts ; then \ + echo "Copying Scripts directory to $(INSTALL) ..."; \ + cp -rp ../Scripts $(INSTALL); \ + fi) + @(if /usr/bin/test ! ../Doc -ef $(INSTALL)/Doc ; then \ + echo "Copying Doc directory to $(INSTALL) ..."; \ + cp -rp ../Doc $(INSTALL); \ + fi) + @(if /usr/bin/test ! ../Hyperdoc -ef $(INSTALL)/Hyperdoc ; then \ + echo "Copying Hyperdoc directory to $(INSTALL) ..."; \ + cp -rp ../Hyperdoc $(INSTALL); \ + fi) + @(if /usr/bin/test ! ../src -ef $(INSTALL)/src ; then \ + echo "Copying src directory to $(INSTALL) ..."; \ + cp -rp ../src $(INSTALL); \ + fi) + +install: copydirs + @(for i in $(FULLDIR); do echo cd $$i; cd $$i; make MACHINE=$(MACHINE) XINCLUDE="$(XINCLUDE)" DISKIOSUBDIR="$(DISKIOSUBDIR)" INSTALL=$(INSTALL) INSTALLBIN=$(INSTALLBIN) RANLIB="$(RANLIB)" install; cd ..;done) + @cp genesis.exe $(INSTALL) + @echo "Done with full install" + +nxinstall: copydirs + @(for i in $(NXDIR); do echo cd $$i; cd $$i; make MACHINE=$(MACHINE) DISKIOSUBDIR="$(DISKIOSUBDIR)" INSTALL=$(INSTALL) INSTALLBIN=$(INSTALLBIN) RANLIB="$(RANLIB)" install; cd ..;done) + @cp nxgenesis.exe $(INSTALL) + @echo "Done with non-X install" + +mininstall: copydirs + @(for i in $(MINDIR); do echo cd $$i; cd $$i; make MACHINE=$(MACHINE) INSTALL=$(INSTALL) INSTALLBIN=$(INSTALLBIN) RANLIB="$(RANLIB)" install; cd ..;done) + @cp mingenesis.exe $(INSTALL) + @echo "Done with minimal install" diff -Naur fixcase/genesis/src/Makefile.dist cygwin/genesis/src/Makefile.dist --- fixcase/genesis/src/Makefile.dist 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/Makefile.dist 2004-09-23 13:27:28.000000000 -0300 @@ -1080,6 +1080,42 @@ # end IBM RS6000 running AIX +# ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +# System: Cygwin +# Compiler: gcc +# ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ + +#MACHINE=Cygwin + +#OS=SYSV + +#XINCLUDE=/usr/include +#XLIB=/usr/X11R6/lib + +#CC=gcc +#CPP=/bin/cpp -P +#CFLAGS=-O2 +#LD=ld +#LDFLAGS= + +#RANLIB=ranlib +#AR=ar + +#YACC=bison -y +#PARSER=bison +#LEX=flex -l +#LEXLIB=-lfl +#LIBS= $(LEXLIB) -lm + +#TERMCAP=-lncurses +#TERMOPT=-DTERMIO -DDONT_USE_SIGIO + +#export CODE_G_LFLAGS=-Wl,--stack,0x400000 +#export EXE_EXT=.exe + +#TMPDIR = /tmp + +# end CygWin # ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ # System: Other UNIX system diff -Naur fixcase/genesis/src/convert/Makefile cygwin/genesis/src/convert/Makefile --- fixcase/genesis/src/convert/Makefile 2004-09-20 13:29:24.000000000 -0300 +++ cygwin/genesis/src/convert/Makefile 2004-09-23 15:26:48.000000000 -0300 @@ -100,7 +100,7 @@ -rm -f *.o y.tab.h y.tab.c lex.yy.c convert install: - -cp convert $(INSTALLBIN) + -cp convert$(EXE_EXT) $(INSTALLBIN) -if test ! -d $(X1COMPAT_DIR); then mkdir $(X1COMPAT_DIR); fi -cp X1compat/*.g $(X1COMPAT_DIR) -chmod +w $(X1COMPAT_DIR)/*.g diff -Naur fixcase/genesis/src/device/timetable.c cygwin/genesis/src/device/timetable.c --- fixcase/genesis/src/device/timetable.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/device/timetable.c 2004-09-20 14:20:52.000000000 -0300 @@ -34,7 +34,7 @@ Action *action; { float currti, currval,intvl; - float *tempti; + float *tempti = NULL; float aisi, period, propp, isirange; int usermode; float userval1, userval2, userval3, userval4; diff -Naur fixcase/genesis/src/diskio/interface/netcdf/Makefile cygwin/genesis/src/diskio/interface/netcdf/Makefile --- fixcase/genesis/src/diskio/interface/netcdf/Makefile 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/diskio/interface/netcdf/Makefile 2004-10-16 18:25:16.000000000 -0300 @@ -77,7 +77,7 @@ $(LD) $(LDFLAGS) -r -o $@ $(OBJECTS) netcdflib: - @(for subdir in $(NCDFSRCDIR); do echo cd $$subdir; cd $$subdir; env - PATH=$$PATH CPICOPT="" CXX="" FC="" CC="$(CC)" CFLAGS="$(CFLAGS)" AR=ar YACC="$(YACC_IN)" ./configure; env - PATH=$$PATH make all; done) + @(for subdir in $(NCDFSRCDIR); do echo cd $$subdir; cd $$subdir; env - PATH="$$PATH" CPICOPT="" CXX="" FC="" CC="$(CC)" CFLAGS="$(CFLAGS)" AR=ar YACC="$(YACC_IN)" ./configure; env - PATH="$$PATH" make all; done) -touch netcdflib clean: diff -Naur fixcase/genesis/src/diskio/interface/netcdf/netcdf-3.4/src/ncgen/ncgentab.c cygwin/genesis/src/diskio/interface/netcdf/netcdf-3.4/src/ncgen/ncgentab.c --- fixcase/genesis/src/diskio/interface/netcdf/netcdf-3.4/src/ncgen/ncgentab.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/diskio/interface/netcdf/netcdf-3.4/src/ncgen/ncgentab.c 2004-09-20 13:29:28.000000000 -0300 @@ -82,7 +82,7 @@ #include #endif -#include +//#include #ifdef __cplusplus diff -Naur fixcase/genesis/src/kinetics/text.c cygwin/genesis/src/kinetics/text.c --- fixcase/genesis/src/kinetics/text.c 2004-10-15 13:53:42.000000000 -0300 +++ cygwin/genesis/src/kinetics/text.c 2004-10-15 13:54:38.000000000 -0300 @@ -20,7 +20,13 @@ */ #ifndef NO_X +#ifdef Cygwin +#undef SYSV +#endif #include +#ifdef Cygwin +#define SYSV +#endif #endif #include "kin_ext.h" #ifdef ADDMSGIN diff -Naur fixcase/genesis/src/shell/shell_hash.c cygwin/genesis/src/shell/shell_hash.c --- fixcase/genesis/src/shell/shell_hash.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/shell/shell_hash.c 2004-09-23 20:24:50.000000000 -0300 @@ -70,7 +70,11 @@ static HASH *func_adr_hash_table; static HASH *field_hash_table; +#ifdef Cygwin +#define HASH_SIZE 10001 +#else #define HASH_SIZE 10000 +#endif /* ** hash table allocation routines diff -Naur fixcase/genesis/src/shell/shell_io.c cygwin/genesis/src/shell/shell_io.c --- fixcase/genesis/src/shell/shell_io.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/shell/shell_io.c 2004-09-20 13:29:28.000000000 -0300 @@ -120,6 +120,10 @@ #endif +#ifdef Cygwin +#include +#endif + #include #include #include "shell_ext.h" @@ -187,11 +191,16 @@ #if defined(i860) && !defined(paragon) nc = ioctl(fileno(stdin),FIORDCHK,0); /* printf("nc=%d\n",nc); */ -#elif defined(T3E) +#elif defined(T3E) || defined(Cygwin) +#ifdef T3E +#define AVAILABLECHARSFIELD _cnt +#else +#define AVAILABLECHARSFIELD _r +#endif fd_set readfds; struct timeval timeout; - if (stdin->_cnt == 0) + if (stdin->AVAILABLECHARSFIELD == 0) { FD_ZERO(&readfds); FD_SET(0, &readfds); @@ -200,7 +209,7 @@ if (select(1, &readfds, NULL, NULL, &timeout) > 0) ungetc(getc(stdin), stdin); } - nc = stdin->_cnt; + nc = stdin->AVAILABLECHARSFIELD; #else ioctl(fileno(stdin),FIONREAD,&nc); #endif diff -Naur fixcase/genesis/src/shell/shell_setup.c cygwin/genesis/src/shell/shell_setup.c --- fixcase/genesis/src/shell/shell_setup.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/shell/shell_setup.c 2004-09-20 13:29:28.000000000 -0300 @@ -101,7 +101,11 @@ ** Note: SearchForExecutable mallocs the string returned in &progname. */ if ((fp = SearchForExecutable(file, "r", &progname)) == NULL) { - return(0); +#ifdef Cygwin + sprintf(tmp, "%s.exe", file); + if ((fp = SearchForExecutable(tmp, "r", &progname)) == NULL) +#endif + return(0); } fclose(fp); diff -Naur fixcase/genesis/src/shell/shell_tty.c cygwin/genesis/src/shell/shell_tty.c --- fixcase/genesis/src/shell/shell_tty.c 2004-09-20 13:29:26.000000000 -0300 +++ cygwin/genesis/src/shell/shell_tty.c 2004-09-20 13:29:28.000000000 -0300 @@ -597,7 +597,7 @@ * get any leftover characters from the previous terminal io * state */ - ioctl(fileno(stdin), FIONREAD, &nc); + nc = AvailableCharacters(); if (nc) { for (i = 0; i < nc; i++) { buffer[i] = getc(stdin); diff -Naur fixcase/genesis/src/sprng/SRC/make.Cygwin cygwin/genesis/src/sprng/SRC/make.Cygwin --- fixcase/genesis/src/sprng/SRC/make.Cygwin 1969-12-31 21:00:00.000000000 -0300 +++ cygwin/genesis/src/sprng/SRC/make.Cygwin 2004-09-20 13:29:28.000000000 -0300 @@ -0,0 +1,34 @@ +AR = ar +ARFLAGS = cr +#If your system does not have ranlib, then replace next statement with +#RANLIB = echo +RANLIB = ranlib +CC = gcc +CLD = $(CC) +# Set f77 to echo if you do not have a FORTRAN compiler +F77 = g77 +#F77 = echo +F77LD = $(F77) +FFXN = -DAdd__ +FSUFFIX = F + +MPIF77 = $(F77) +MPICC = $(CC) + +# To use MPI, set the MPIDIR to location of mpi library, and MPILIB +# to name of mpi library. Remove # signs from beginning of next 3 lines. +# Also, if the previous compilation was without MPI, type: make realclean +# before compiling for mpi. +# +#MPIDEF = -DSPRNG_MPI #Only if you plan to use MPI +#MPIDIR = -L/usr/local/mpi/lib/LINUX/ch_p4 +#MPILIB = -lmpi + +# Please include mpi header file path, if needed + +CFLAGS = -O3 -DLittleEndian $(MPIDEF) -D$(PLAT) # -I/usr/local/mpi/include +CLDFLAGS = -O3 +FFLAGS = -O3 $(MPIDEF) -D$(PLAT) # -I/usr/local/mpi/include +F77LDFLAGS = -O3 + +CPP = cpp -P \ No newline at end of file diff -Naur fixcase/genesis/src/sys/Makefile cygwin/genesis/src/sys/Makefile --- fixcase/genesis/src/sys/Makefile 2004-09-20 13:29:28.000000000 -0300 +++ cygwin/genesis/src/sys/Makefile 2004-09-20 13:50:28.000000000 -0300 @@ -116,7 +116,7 @@ utillib.$(LIBEXT) code_g: $(CODE_G_OBJ) - $(CC) $(CFLAGS) $(CODE_G_OBJ) $(LEXLIB) $(TERMCAP) -lm -o code_g + $(CC) $(CFLAGS) $(CODE_G_LFLAGS) $(CODE_G_OBJ) $(LEXLIB) $(TERMCAP) -lm -o code_g .SUFFIXES: .c,v .c .h,v .h @@ -137,7 +137,7 @@ $(CC) $(CFLAGS) -D$(OS) -o code_sym code_sym.c install: - -cp $(TARGET_OBJ) code_lib code_func code_sym code_g $(INSTALL_LIB) + -cp $(TARGET_OBJ) code_lib$(EXE_EXT) code_func$(EXE_EXT) code_sym$(EXE_EXT) code_g$(EXE_EXT) $(INSTALL_LIB) -$(LIBORDER) $(INSTALL_LIB)/$(TARGET_OBJ) -cp *.h $(INSTALL_INCLUDE) diff -Naur fixcase/genesis/src/sys/jump.c cygwin/genesis/src/sys/jump.c --- fixcase/genesis/src/sys/jump.c 2004-09-20 13:29:28.000000000 -0300 +++ cygwin/genesis/src/sys/jump.c 2004-09-20 13:29:28.000000000 -0300 @@ -53,7 +53,7 @@ #include "system_deps.h" -#if (defined(i860) && !defined(paragon)) || (defined(Linux) && !defined(__GLIBC__)) || defined(CRAY) +#if (defined(i860) && !defined(paragon)) || (defined(Linux) && !defined(__GLIBC__)) || defined(CRAY) || defined(Cygwin) struct sigcontext { int xyzzy;