diff --git a/build.bat b/build.bat index 75a0e22..e18eb19 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,5 @@ @echo off +rem IF NOTHING COMPILES, CHECK IF YOUR CVS CHECKOUT USES CORRECT DOS LINEBREAKS :- batch file to build everything :- $Id$ @@ -15,6 +16,7 @@ if not exist config.bat echo You must copy CONFIG.B to CONFIG.BAT and edit it to if not exist config.bat goto abort call config.bat +set dos4g=quiet :----------------------------------------------------------------------- :- following is command line handling diff --git a/buildall.bat b/buildall.bat index e347a2b..c5c0d36 100644 --- a/buildall.bat +++ b/buildall.bat @@ -1,4 +1,5 @@ @echo off +rem IF NOTHING COMPILES, CHECK IF YOUR CVS CHECKOUT USES CORRECT DOS LINEBREAKS :- $Id$ @@ -14,6 +15,7 @@ set onerror=if not "%XERROR%" == "" goto daswarwohlnix :***** MSCL kernels call config.bat +set dos4g=quiet if "%MS_BASE%" == "" goto no_ms call build -r msc 386 fat16 diff --git a/default.bat b/default.bat index d3c73ce..294d058 100644 --- a/default.bat +++ b/default.bat @@ -1,7 +1,9 @@ @echo off - :- $Id$ +:- with option clearset, clears all config.bat-made environment variables +:- without options, MAKE / LINK / ... are set to defaults based on COMPILER ... + if "%1" == "clearset" goto clearset :----------------------------------------------------------------------- diff --git a/filelist b/filelist index e86d481..0d4bd1d 100644 --- a/filelist +++ b/filelist @@ -6,9 +6,6 @@ */*/filelist */*/default.bat */*/makefile -*/*/bin/autoexec.bat -*/*/bin/config.sys -*/*/bin/install.bat */*/boot/boot.asm */*/boot/boot32.asm */*/boot/boot32lb.asm diff --git a/hdr/version.h b/hdr/version.h index 76e62d0..e129ce4 100644 --- a/hdr/version.h +++ b/hdr/version.h @@ -45,7 +45,7 @@ static BYTE *date_hRcsId = #define REVISION_SEQ 36 /* returned in BL by int 21 function 30 */ #define OEM_ID 0xfd /* FreeDOS, returned in BH by int 21 30 */ -#define SOURCE_DATE_STRING "Sep 09 2005" /* DATE OF THE NEWEST SOURCE FILE */ +#define SOURCE_DATE_STRING "Aug 18 2006" /* DATE OF THE NEWEST SOURCE FILE */ /* #define KERNEL_VERSION_STRING "1.1.35" formerly used in os_release text */ #define KERNEL_BUILD_STRING "2036 cvs" /* used in os_release string */ diff --git a/makefile b/makefile index 2cc1e69..087b4b6 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,8 @@ -#just in case somebody likes make better than build... +# IF NOTHING COMPILES, CHECK IF YOUR CVS CHECKOUT USES CORRECT DOS LINEBREAKS + +# What you WANT is: EDIT CONFIG.B, COPY CONFIG.B to CONFIG.BAT, RUN BUILD.BAT +# THIS file is provided only for people who have a habit of typing MAKE ALL... + all: build @@ -8,41 +12,44 @@ bin\kwc8616.sys: bin\kwc8632.sys: build -r wc 86 fat32 -#use as follows: wmake -ms zip VERSION=2029 +# use as follows: wmake -ms zip VERSION=2029 zip_src: cd ..\.. - zip -9 -r -k source/ke$(VERSION)src.zip source/ke$(VERSION) -i@source/ke$(VERSION)/filelist + zip -9 -r -k source/ke$(VERSION)s.zip source/ke$(VERSION) -i@source/ke$(VERSION)/filelist cd source\ke$(VERSION) -BINLIST1 = doc bin/kernel.sys bin/sys.com bin/command.com bin/config.sys -BINLIST2 = bin/autoexec.bat bin/command.com bin/install.bat +BINLIST1 = doc bin/kernel.sys bin/sys.com +# removed - as the 2nd zip -r line to add those to the zip: +# BINLIST2 = bin/config.sys bin/autoexec.bat bin/command.com bin/install.bat zipfat16: bin\kwc8616.sys mkdir doc - copy docs\*.txt doc - copy docs\*.cvs doc - copy docs\copying doc - copy docs\*.lsm doc - del doc\build.txt - del doc\lfnapi.txt + mkdir doc\kernel + copy docs\*.txt doc\kernel + copy docs\*.cvs doc\kernel + copy docs\copying doc\kernel + copy docs\*.lsm doc\kernel + del doc\kernel\build.txt + del doc\kernel\lfnapi.txt copy bin\kwc8616.sys bin\kernel.sys - zip -9 -r -k ../ke$(VERSION)_16.zip $(BINLIST1) - zip -9 -r -k ../ke$(VERSION)_16.zip $(BINLIST2) - utils\rmfiles doc\*.txt doc\*.cvs doc\*.lsm doc\copying + zip -r -k ../ke$(VERSION)16.zip $(BINLIST) + utils\rmfiles doc\kernel\*.txt doc\kernel\*.cvs doc\kernel\*.lsm doc\kernel\copying + rmdir doc\kernel rmdir doc zipfat32: bin\kwc8632.sys mkdir doc - copy docs\*.txt doc - copy docs\*.cvs doc - copy docs\copying doc - copy docs\*.lsm doc - del doc\build.txt - del doc\lfnapi.txt + mkdir doc\kernel + copy docs\*.txt doc\kernel + copy docs\*.cvs doc\kernel + copy docs\copying doc\kernel + copy docs\*.lsm doc\kernel + del doc\kernel\build.txt + del doc\kernel\lfnapi.txt copy bin\kwc8632.sys bin\kernel.sys - zip -9 -r -k ../ke$(VERSION)_32.zip $(BINLIST1) - zip -9 -r -k ../ke$(VERSION)_32.zip $(BINLIST2) - utils\rmfiles doc\*.txt doc\*.cvs doc\*.lsm doc\copying + zip -r -k ../ke$(VERSION)32.zip $(BINLIST) + utils\rmfiles doc\kernel\*.txt doc\kernel\*.cvs doc\kernel\*.lsm doc\kernel\copying + rmdir doc\kernel rmdir doc zip: zip_src zipfat16 zipfat32