diff -rbBNu kaffepc-1.0.b3.old/Environment kaffepc-1.0.b3/Environment --- kaffepc-1.0.b3.old/Environment Thu Jan 1 09:00:00 1970 +++ kaffepc-1.0.b3/Environment Sun Nov 28 06:46:10 1999 @@ -0,0 +1,65 @@ +#djpgpp +# d:/djgpp +#KaffePC/VM binary +# d:/kaffepc +#KaffePC/VM source +# d:/kaffepc-1.0.b3 +#JDK +# d:/java/jdk1.1.7B +# +#2.1 Setting of environment variables +export JDKHOME=/usr/lib/jdk1.1 +export DJGPPHOME=/usr/local/lib/gcc-lib/i386-go32-msdos/2.7.2 +#export KAFFEHOME=/root/java/kaffepc +export JAVAC=javac +export KAFFESRCHOME=`pwd` +# -------------------------------------------------------------------------- + + +export VPATHSEP=: +export CC="dos-gcc" +export AR="dos-ar rc" +export AS="dos-as" +export RANLIB="dos-ar s" +export LIBS="-ltcp -lserio" +export STD_LIBRARIES="-ltcp -lserio" +export EXTRA_CFLAGS=-DDEBUG +export CFLAGS=-O2 + +export CLASSPATH=.:${KAFFESRCHOME}/kaffe-1.0.b3/libraries/javalib/pizza.jar + +export LANG=ja_JP.SJIS +export TZ=JST-9 + +# for wattcp +export LAB=${KAFFESRCHOME} +export WATTCPHOME=${LAB}/tcplib +export C_INCLUDE_PATH=${WATTCPHOME}/include +export C_INCLUDE_PATH=${C_INCLUDE_PATH}:${WATTCPHOME}/include/tcp + +# for bcsio20 +export BCSIO20HOME=${KAFFESRCHOME}/bcsio20 +export C_INCLUDE_PATH=${C_INCLUDE_PATH}:${BCSIO20HOME} + +# for gmp +export GMPHOME=${KAFFESRCHOME}/gmp-2.0.2 +export C_INCLUDE_PATH=${C_INCLUDE_PATH}:${GMPHOME} + +# for zlib +export ZLIBHOME=${KAFFESRCHOME}/zlib-1.12 +export C_INCLUDE_PATH=${C_INCLUDE_PATH}:${ZLIBHOME} + +export C_INCLUDE_PATH=${C_INCLUDE_PATH}:${DJGPPHOME}/include + + +# for configure script +export ac_cv_alignmentof_voidp=4 +export ac_cv_c_bigendian=no +export ac_cv_c_char_unsigned=no +export ac_cv_sizeof___int64=0 +export ac_cv_sizeof_int=4 +export ac_cv_sizeof_long=4 +export ac_cv_sizeof_long_long=8 +export ac_cv_sizeof_short=2 +export ac_cv_sizeof_voidp=4 + diff -rbBNu kaffepc-1.0.b3.old/Makefile kaffepc-1.0.b3/Makefile --- kaffepc-1.0.b3.old/Makefile Mon Apr 19 09:54:34 1999 +++ kaffepc-1.0.b3/Makefile Sun Nov 28 04:05:08 1999 @@ -1,17 +1,18 @@ KAFFEVERSION= kaffe-1.0.b3 all: - @(cd bcsio20 && make) - @(cd tcplib && make) -ifeq ($(KAFFEVERSION), kaffe-1.0.b3) - @(test -f gmp-2.0.2/Makefile || (cd gmp-2.0.2 && ./configure --host=msdos && make)) - @(test -f zlib-1.12/Makefile || (cd zlib-1.12 && ./configure && make)) -endif - @(test -f ${KAFFEVERSION}/Makefile || (cd ${KAFFEVERSION} && ./configure)) + @(test -f ${KAFFEVERSION}/Makefile || (cd ${KAFFEVERSION} && ./configure --host=i386-unknown-msdosdjgpp --build=linux --with-staticlib --without-x)) @(test -f ${KAFFEVERSION}/.depend || (cd ${KAFFEVERSION}; make depend)) @(cd ${KAFFEVERSION}; make all) @(cd kaffepc; make) +support: + @(cd bcsio20 && make && cp -f libserio.a $(DJGPPHOME)) + @(cd tcplib && make && cp -f libtcp.a $(DJGPPHOME)) +ifeq ($(KAFFEVERSION), kaffe-1.0.b3) + @(test -f gmp-2.0.2/Makefile || (cd gmp-2.0.2 && export AR=dos-ar && ./configure --host=msdos --build=i386-unknown-linux && make && cp -f libgmp.a $(DJGPPHOME))) + @(cd zlib-1.12 && make && cp -f libz.a $(DJGPPHOME)) +endif buildjar: @(cd ${KAFFEVERSION}/libraries/javalib && ./rebuildLib.KaffePC) @(cd ${KAFFEVERSION}/libraries/javalib && ./makeJar.KaffePC) @@ -33,10 +34,10 @@ mkdir ${KAFFEPC}/sample mkdir ${KAFFEPC}/docs mkdir ${KAFFEPC}/docs/images - cp ${LIBDIR}/klasses.jar ${KAFFEPC}/lib/klasses.jar + cp ${LIBDIR}/Klasses.jar ${KAFFEPC}/lib/Klasses.jar test ! -f ${LIBDIR}/kaffepc.jar || cp ${LIBDIR}/kaffepc.jar ${KAFFEPC}/lib/kaffepc.jar - cp ${BINDIR}/kaffe.exe ${KAFFEPC}/bin/kaffe.exe - strip ${KAFFEPC}/bin/kaffe.exe + cp ${BINDIR}/Kaffe.exe ${KAFFEPC}/bin/Kaffe.exe + # strip ${KAFFEPC}/bin/kaffe.exe cp ${KPDIR}/bin/cwsdpmi.exe ${KAFFEPC}/bin cp ${KPDIR}/bin/ping.bat ${KAFFEPC}/bin cp ${KPDIR}/bin/launcher.bat ${KAFFEPC}/bin @@ -45,7 +46,7 @@ cp ${KPDIR}/lib/jv-comm.pro ${KAFFEPC}/lib cp ${KPDIR}/lib/kp-net.pro ${KAFFEPC}/lib cp ${KPDIR}/lib/kp-lnchr.pro ${KAFFEPC}/lib - cp ${KPDIR}/sample/hello.jar ${KAFFEPC}/sample + cp ${KPDIR}/sample/Hello.jar ${KAFFEPC}/sample cp ./docs/*.htm ./docs/*.h ./docs/*.txt ${KAFFEPC}/docs cp ./docs/images/*.gif ${KAFFEPC}/docs/images cp license.terms ${KAFFEPC}/LICENSE.TXT @@ -55,7 +56,14 @@ @(cd bcsio20 && make clean) @(cd tcplib && make clean) @(test ! -f gmp-2.0.2/Makefile || (cd gmp-2.0.2 && make distclean)) - @(test ! -f zlib-1.12/Makefile || (cd zlib-1.12 && make distclean)) + @(test ! -f zlib-1.12/Makefile || (cd zlib-1.12 && make clean)) @(test ! -f ${KAFFEVERSION}/Makefile || (cd ${KAFFEVERSION} && make distclean)) @(cd kaffepc; make clean) @rm -rf ${KAFFEBIN} + +realclean: allclean + @rm -f ${KAFFEVERSION}/dummy.exe + @rm -f ${KAFFEVERSION}/kaffe/kaffevm/mem/gc-block.c + @rm -f ${KAFFEVERSION}/kaffe/kaffevm/mem/gc-block.h + @rm -f ${KAFFEVERSION}/libraries/clib/management/libmanagement.a + diff -rbBNu kaffepc-1.0.b3.old/bcsio20/makefile kaffepc-1.0.b3/bcsio20/makefile --- kaffepc-1.0.b3.old/bcsio20/makefile Thu Nov 19 07:56:11 1998 +++ kaffepc-1.0.b3/bcsio20/makefile Sat Nov 27 20:25:52 1999 @@ -10,8 +10,7 @@ .PHONY: all clean cleanall #all:test term all: libserio.a - ar rc libserio.a serio.o - ranlib libserio.a + dos-ar rcs libserio.a serio.o libserio.a: serio.o test: test.o serio.o term: term.o serio.o diff -rbBNu kaffepc-1.0.b3.old/gmp-2.0.2/Makefile.in kaffepc-1.0.b3/gmp-2.0.2/Makefile.in --- kaffepc-1.0.b3.old/gmp-2.0.2/Makefile.in Tue Mar 16 08:32:03 1999 +++ kaffepc-1.0.b3/gmp-2.0.2/Makefile.in Sat Nov 27 22:57:02 1999 @@ -33,7 +33,7 @@ XCFLAGS = AR = ar AR_FLAGS = rc -RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ] +RANLIB_TEST = true RANLIB = ranlib SHELL = /bin/sh INSTALL = $(srcdir)/install.sh -c diff -rbBNu kaffepc-1.0.b3.old/kaffepc/sample/Makefile kaffepc-1.0.b3/kaffepc/sample/Makefile --- kaffepc-1.0.b3.old/kaffepc/sample/Makefile Wed Mar 31 22:55:07 1999 +++ kaffepc-1.0.b3/kaffepc/sample/Makefile Sat Nov 27 20:56:07 1999 @@ -1,7 +1,9 @@ #JAVAC=kaffe pizza.compiler.Main #JAVAC=javac -JAVAC=./javac.sh -JAR=./jar.sh +#JAVAC=./javac.sh +#JAR=./jar.sh +JAVAC=javac +JAR=jar all: Hello.jar diff -rbBNu kaffepc-1.0.b3.old/tcplib/makefile kaffepc-1.0.b3/tcplib/makefile --- kaffepc-1.0.b3.old/tcplib/makefile Tue Nov 24 05:55:44 1998 +++ kaffepc-1.0.b3/tcplib/makefile Sat Nov 27 20:32:02 1999 @@ -38,7 +38,7 @@ ping.exe: ping.o $(CC) ping.o -g -L. -ltcp -o ping.out - coff2exe ping.out + # coff2exe ping.out depend:: $(CC) $(CFLAGS) -M $(SRCDIR)/tcpsrc/*.c > makefile.dep diff -rbBNu kaffepc-1.0.b3.old/tcplib/makefile.lab kaffepc-1.0.b3/tcplib/makefile.lab --- kaffepc-1.0.b3.old/tcplib/makefile.lab Tue Oct 27 18:40:02 1998 +++ kaffepc-1.0.b3/tcplib/makefile.lab Sat Nov 27 22:43:05 1999 @@ -1,7 +1,7 @@ # $Id: makefile.lab,v 1.1.1.1 1998/10/27 09:40:02 yamag Exp $ ##################################################################### # -CC = gcc +CC = dos-gcc RM = rm -vf CI = ci CO = co @@ -45,13 +45,13 @@ GCCBIN = /usr/i386-go32-msdos/bin/ endif -AS = $(GCCBIN)as +AS = dos-as ASFLAGS = -x assembler-with-cpp -AR = $(GCCBIN)ar +AR = dos-ar ARFLAGS = rv LD = $(CC) LDFLAGS = $(LIBS) -RANLIB = $(GCCBIN)ranlib +RANLIB = dos-ar s STRIP = $(GCCBIN)strip # include $(LAB)/include/make_grx.mk diff -rbBNu kaffepc-1.0.b3.old/zlib-1.12/Makefile kaffepc-1.0.b3/zlib-1.12/Makefile --- kaffepc-1.0.b3.old/zlib-1.12/Makefile Thu Jan 1 09:00:00 1970 +++ kaffepc-1.0.b3/zlib-1.12/Makefile Sat Nov 27 20:39:08 1999 @@ -0,0 +1,100 @@ +# Makefile for zlib. Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96. +# Copyright (C) 1995-1998 Jean-loup Gailly. +# For conditions of distribution and use, see copyright notice in zlib.h + +# To compile, or to compile and test, type: +# +# make -fmakefile.dj2; make test -fmakefile.dj2 +# +# To install libz.a, zconf.h and zlib.h in the djgpp directories, type: +# +# make install -fmakefile.dj2 +# +# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as +# in the sample below if the pattern of the DJGPP distribution is to +# be followed. Remember that, while 'es around <=> are ignored in +# makefiles, they are *not* in batch files or in djgpp.env. +# - - - - - +# [make] +# INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include +# LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib +# BUTT=-m486 +# - - - - - +# Alternately, these variables may be defined below, overriding the values +# in djgpp.env, as +# INCLUDE_PATH=c:\usr\include +# LIBRARY_PATH=c:\usr\lib + +CC=dos-gcc + +#CFLAGS=-MMD -O +#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +#CFLAGS=-MMD -g -DDEBUG +CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + +# If cp.exe is available, replace "copy /Y" with "cp -fp" . +CP=cp -fp +# If gnu install.exe is available, replace $(CP) with ginstall. +INSTALL=$(CP) +# The default value of RM is "rm -f." If "rm.exe" is found, comment out: +#RM=del +LDLIBS=-L. -lz +LD=$(CC) -s -o +LDSHARED=$(CC) + +INCL=zlib.h zconf.h +LIBS=libz.a + +AR=dos-ar rcs + +prefix=/usr/local +exec_prefix = $(prefix) + +OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o + +TEST_OBJS = example.o minigzip.o + +all: example.exe minigzip.exe + +test: all + ./example + echo hello world | .\minigzip | .\minigzip -d + +%.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + +libz.a: $(OBJS) + $(AR) $@ $(OBJS) + +%.exe : %.o $(LIBS) + $(LD) $@ $< $(LDLIBS) + +# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env . + +.PHONY : uninstall clean + +install: $(INCL) $(LIBS) + -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH) + -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH) + $(INSTALL) zlib.h $(INCLUDE_PATH) + $(INSTALL) zconf.h $(INCLUDE_PATH) + $(INSTALL) libz.a $(LIBRARY_PATH) + +uninstall: + $(RM) $(INCLUDE_PATH)\zlib.h + $(RM) $(INCLUDE_PATH)\zconf.h + $(RM) $(LIBRARY_PATH)\libz.a + +clean: + $(RM) *.d + $(RM) *.o + $(RM) *.exe + $(RM) libz.a + $(RM) foo.gz + +DEPS := $(wildcard *.d) +ifneq ($(DEPS),) +include $(DEPS) +endif