--- Begin Message ---diff -ruNp 0old/build.bat 0new/build.bat --- 0old/build.bat 2004-03-27 01:42:32.000000000 +0000 +++ 0new/build.bat 2004-04-03 10:16:14.000000000 +0000 @@ -3,18 +3,22 @@ :- batch file to build everything :- $Id$ +:----------------------------------------------------------------------- :- Syntax: BUILD [-r] [fat32|fat16] [msc|wc|tc|tcpp] [86|186|386] :- option case is significant !! +:----------------------------------------------------------------------- -if "%1" == "-r" call clobber -if "%1" == "-r" shift +set XERROR=1 +if "%XERROR%" == "" goto noenv -set XERROR= +if "%1" == "-r" call clobber.bat +if "%1" == "-r" shift if not exist config.bat echo You must copy CONFIG.B to CONFIG.BAT and edit it to reflect your setup! if not exist config.bat goto abort -call config +call config.bat +if "%LAST%" == "" goto noenv :----------------------------------------------------------------------- :- following is command line handling @@ -41,7 +45,8 @@ if not "%1" == "" goto loop_commandline if "%COMPILER%" == "" echo you MUST define a COMPILER variable in CONFIG.BAT if "%COMPILER%" == "" goto abort -call default +call defaults.bat +if "%LAST%" == "" goto noenv :----------------------------------------------------------------------- :- finally - we are going to compile @@ -51,50 +56,51 @@ echo. echo Process UTILS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd utils -%MAKE% production +call %MAKE% production if errorlevel 1 goto abort-cd echo. echo Process LIB ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd ..\lib -%MAKE% +call %MAKE% if errorlevel 1 goto abort-cd echo. echo Process DRIVERS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd ..\drivers -%MAKE% production +call %MAKE% production if errorlevel 1 goto abort-cd echo. echo Process BOOT +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd ..\boot -%MAKE% production +call %MAKE% production if errorlevel 1 goto abort-cd echo. echo Process SYS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd ..\sys -%MAKE% production +call %MAKE% production if errorlevel 1 goto abort-cd echo. echo Process KERNEL +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. cd ..\kernel -%MAKE% production +call %MAKE% production if errorlevel 1 goto abort-cd cd .. -:- if you like, put some finalizing commands (like copy to floppy) -:- into build2.bat +:- if you like, put finalizing commands (like copy to floppy) into build2.bat + +set XERROR= -if exist build2.bat call build2 +if exist build2.bat call build2.bat echo. echo Processing is done. @@ -104,9 +110,9 @@ goto end :abort-cd cd .. +:noenv :abort echo Compilation was aborted! -set XERROR=1 :end -default clearset +defaults.bat clearset diff -ruNp 0old/buildall.bat 0new/buildall.bat --- 0old/buildall.bat 2004-03-27 01:42:32.000000000 +0000 +++ 0new/buildall.bat 2004-03-31 13:25:20.000000000 +0000 @@ -3,62 +3,54 @@ :- $Id$ :---------------------------------------------------------- -:- batch file to build _many_ KERNELS, hope build works +:- batch file to build _many_ KERNELS, hope build works. :- takes 3 minutes on my(TE) Win2K/P700. your milage may vary :-) :---------------------------------------------------------- if "%1" == "$SUMMARY" goto summary -set onerror=if not "%%XERROR%%" == "" goto daswarwohlnix +call config.bat +if "%LAST%" == "" goto end :***** MSCL kernels -call config.bat +if "%MSCL8_BASE%" == "" goto no_ms + call build.bat -r msc 386 fat16 +if "%XERROR%" == "" call build.bat -r msc 186 fat16 +if "%XERROR%" == "" call build.bat -r msc 86 fat16 +if "%XERROR%" == "" call build.bat -r msc 386 fat32 +if "%XERROR%" == "" call build.bat -r msc 186 fat32 +if "%XERROR%" == "" call build.bat -r msc 86 fat32 -if "%MS_BASE%" == "" goto no_ms -call build -r msc 386 fat16 -%ONERROR% -call build -r msc 186 fat16 -%ONERROR% -call build -r msc 86 fat16 -%ONERROR% -call build -r msc 386 fat32 -%ONERROR% -call build -r msc 186 fat32 -%ONERROR% -call build -r msc 86 fat32 -%ONERROR% +if not "%XERROR%" == "" goto daswarwohlnix :no_ms :***** TC 2.01 kernels if "%TC2_BASE%" == "" goto no_tc -call build -r tc 186 fat16 -%ONERROR% -call build -r tc 86 fat16 -%ONERROR% -call build -r tc 186 fat32 -%ONERROR% -call build -r tc 86 fat32 -%ONERROR% + call build.bat -r tc 186 fat16 +if "%XERROR%" == "" call build.bat -r tc 86 fat16 +if "%XERROR%" == "" call build.bat -r tc 186 fat32 +if "%XERROR%" == "" call build.bat -r tc 86 fat32 + +if not "%XERROR%" == "" goto daswarwohlnix :no_tc :***** (Open) Watcom kernels if "%WATCOM%" == "" goto no_wc -call build -r wc 386 fat32 -%ONERROR% -call build -r wc 386 fat16 -%ONERROR% -call build -r wc 86 fat32 -%ONERROR% -call build -r wc 86 fat16 -%ONERROR% + call build.bat -r wc 386 fat32 +if "%XERROR%" == "" call build.bat -r wc 386 fat16 +if "%XERROR%" == "" call build.bat -r wc 86 fat32 +if "%XERROR%" == "" call build.bat -r wc 86 fat16 + +if not "%XERROR%" == "" goto daswarwohlnix :no_wc :***** now rebuild the default kernel -call build -r +call build.bat -r +if not "%XERROR%" == "" goto daswarwohlnix :************************************************************** :* now we build a summary of all kernels HMA size + total size @@ -79,9 +71,9 @@ if exist %TempSumfile% del %TempSumfile% >ktemp.bat for %%i in (bin\k*.map) do echo call %0 $SUMMARY %%i >>ktemp.bat sort <ktemp.bat >ktemps.bat -call ktemps -del ktemp.bat -del ktemps.bat +call ktemps.bat +del ktemp.bat>nul +del ktemps.bat>nul echo >>%Sumfile% Summary of all kernels build echo.|date >>%Sumfile% @@ -103,6 +95,5 @@ goto end :daswarwohlnix echo Sorry, something didn't work as expected :-( -set ONERROR= :end diff -ruNp 0old/clean.bat 0new/clean.bat --- 0old/clean.bat 2004-03-27 01:42:32.000000000 +0000 +++ 0new/clean.bat 2004-04-03 10:15:56.000000000 +0000 @@ -1,37 +1,45 @@ @echo off -:- batch file to clean everything +:- batch file to clean and clobber everything :- $Id$ +if "%1" == "" %0 clean +goto %1 +goto end + +:clean +:clobber if not exist config.bat echo You must copy CONFIG.B to CONFIG.BAT and edit it to reflect your setup! if not exist config.bat goto end -call config -call default +call config.bat +if not "%LAST%" == "" call defaults.bat +if "%LAST%" == "" goto end cd utils -%MAKE% clean +call %MAKE% %1 cd ..\lib -%MAKE% clean +call %MAKE% %1 cd ..\drivers -%MAKE% clean +call %MAKE% %1 cd ..\boot -%MAKE% clean +call %MAKE% %1 cd ..\sys -%MAKE% clean +call %MAKE% %1 cd ..\kernel -%MAKE% clean +call %MAKE% %1 cd ..\hdr if exist *.bak del *.bak cd .. if exist *.bak del *.bak +if "%1"=="clobber" if exist status.me del status.me :end -default clearset +defaults.bat clearset diff -ruNp 0old/clobber.bat 0new/clobber.bat --- 0old/clobber.bat 2004-03-27 01:42:32.000000000 +0000 +++ 0new/clobber.bat 2004-03-27 05:43:02.000000000 +0000 @@ -1,38 +1 @@ [EMAIL PROTECTED] off - -:- batch file to clobber everything -:- $Id$ - -if not exist config.bat echo You must copy CONFIG.B to CONFIG.BAT and edit it to reflect your setup! -if not exist config.bat goto end - -call config -call default - -cd utils -%MAKE% clobber - -cd ..\lib -%MAKE% clobber - -cd ..\drivers -%MAKE% clobber - -cd ..\boot -%MAKE% clobber - -cd ..\sys -%MAKE% clobber - -cd ..\kernel -%MAKE% clobber - -cd ..\hdr -if exist *.bak del *.bak - -cd .. -if exist *.bak del *.bak -if exist status.me del status.me - -:end -default clearset [EMAIL PROTECTED] clobber \ No newline at end of file diff -ruNp 0old/config.b 0new/config.b --- 0old/config.b 2003-09-15 11:50:58.000000000 +0000 +++ 0new/config.b 2004-04-03 09:58:44.000000000 +0000 @@ -1,119 +1,127 @@ -:- [EMAIL PROTECTED] off + :- batch file that is included in all other batch files for configuration -:- +:- $Id: config.b,v 1.11 2003/07/19 18:12:26 bartoldeman Exp $ -:-**************************************************************** -:- NOTICE! You must edit and rename this file to CONFIG.BAT! * -:-**************************************************************** +:----------------------------------------------------------------------- +:- NOTICE! You must edit and rename this file to CONFIG.BAT! +:----------------------------------------------------------------------- -:-********************************************************************* -:- determine your compiler settings -:- -:- you have to -:- search for XNASM - and set the path for NASM -:- search for COMPILER - and set your compiler -:- search for ??_BASE - and set the path to your compiler +:- determine compiler(s) settings :- -:-********************************************************************* +:- you REQUIRED to +:- search for NASM - and set the path to NASM +:- search for COMPILER - and set the default compiler type +:- search for ??_BASE - and set the path to compiler(s) + +set LAST= + +:----------------------------------------------------------------------- +:- define where to find NASM - remember - it should not be protected +:- mode DJGPP version if you're using Windows NT/2k/XP to compile. +:- also: DJGPP-nasm crashes when using protected mode Borland's make -:-********************************************************************** -:-- define where to find NASM - remember - it should not be protected -:- mode DJGPP version if you're using Windows NT/2k/XP to compile -:- also: DJGPP-nasm crashes when using protected mode Borland's make -:-********************************************************************** - -set XNASM=c:\bin\nasm16 - -:********************************************************************** -:- define your COMPILER type here, pick one of them -:********************************************************************** +set NASM=c:\bin\nasm16 + +:----------------------------------------------------------------------- +:- define COMPILER type here, pick one of them :- Turbo C 2.01 set COMPILER=TC2 :- Turbo C++ 1.01 -:- set COMPILER=TURBOCPP +::set COMPILER=TURBOCPP :- Turbo C 3.0 -:- set COMPILER=TC3 +::set COMPILER=TC3 :- Borland C -:- set COMPILER=BC5 +::set COMPILER=BC5 :- Microsoft C -:- set COMPILER=MSCL8 +::set COMPILER=MSCL8 :- Watcom C -:- set COMPILER=WATCOM +::set COMPILER=WATCOM + +:----------------------------------------------------------------------- +:- where is the BASE dir of compiler(s). +:- should be defined for each installed and used compiler. -:-********************************************************************** -:-- where is the BASE dir of your compiler(s) ?? -:-********************************************************************** - set TC2_BASE=c:\tc201 -:- set TP1_BASE=c:\tcpp -:- set TC3_BASE=c:\tc3 -:- set BC5_BASE=c:\bc5 -:- set MS_BASE=c:\msvc - -:- if WATCOM maybe you need to set your WATCOM environment variables -:- and path -:- if not \%WATCOM% == \ goto watcom_defined -:- set WATCOM=c:\watcom -:- set PATH=%PATH%;%WATCOM%\binw +::set TP1_BASE=c:\tcpp +::set TC3_BASE=c:\tc3 +::set BC5_BASE=c:\bc5 +::set MSCL8_BASE=c:\msvc + +:- For Watcom you may need to set WATCOM environment variable and PATH +::if not "%WATCOM%" == "" goto watcom_defined +::set WATCOM=c:\watcom +::set OLDPATH=%PATH% +::set PATH=%PATH%;%WATCOM%\binw :watcom_defined -:-********************************************************************** -:- where is UPX and which options to use? -:-********************************************************************** +:----------------------------------------------------------------------- +:- where is UPX and which options to use +:- (comment this out if you don't want to use it) + set XUPX=upx --8086 --best -:- or use set XUPX= -:- if you don't want to use it -:-********************************************************************** -:- (optionally) which linker to use: -:- (otherwise will be determined automatically) -:- -:- WARNING TLINK needs to be in your PATH! -:-********************************************************************** +:----------------------------------------------------------------------- +:- define which linker to use OR it will be determined AUTOMATICALLY. +:- WARNING TLINK needs to be in PATH! :- Turbo Link -:- set XLINK=tlink /m/c/s/l +::set LINK=tlink/m/c/s/l :- Microsoft Link -:- set XLINK=d:\qb\link /ma -:- set XLINK=%MS_BASE%\bin\link /ONERROR:NOEXE /ma /nologo +::set LINK=d:\qb\link/ma +::set LINK=link/ONERROR:NOEXE /ma /nologo :- WATCOM Link (wlinker is a batch file calling ms2wlink and wlink) -:- set XLINK=..\utils\wlinker /ma /nologo +::set LINK=..\utils\wlinker/ma/nologo :- set path for Turbo Link - use OLDPATH to restore normal path -:- set OLDPATH=%PATH% -:- set PATH=%PATH%;%TC2_BASE% +::set OLDPATH=%PATH% +::set PATH=%PATH%;%TC2_BASE% + +:----------------------------------------------------------------------- +:- define which librarian to use OR it will be determined AUTOMATICALLY. -:********************************************************************** -:* optionally define your MAKE type here, if not then -:* it will be automatically determined, pick one of them -:* use MS nmake if you want to compile with MSCL -:********************************************************************** +:- Turbo Lib +::set LIBPLUS=+ +::set LIBTERM= +::set LIBUTIL=tlib +:- Microsoft Lib +::set LIBPLUS=+ +::set LIBTERM=; +::set LIBUTIL=lib/nologo +:- WATCOM Lib +::set LIBPLUS= +::set LIBTERM= +::set LIBUTIL=wlib -q + +:----------------------------------------------------------------------- +:- define which MAKE to use OR it will be determined AUTOMATICALLY. :- Borland MAKE -:- set MAKE=%TC2_BASE%\make +::set MAKE=make +::set MAKE=maker -S :- Watcom MAKE in MS mode -:- set MAKE=%WATCOM%\binw\wmake /ms +::set MAKE=wmake/ms :- Microsoft MAKE -:- set MAKE=%MS_BASE%\bin\nmake /nologo +::set MAKE=nmake/nologo -:********************************************************************** -:* select your default target: required CPU and what FAT system to support -:********************************************************************** - -set XCPU=86 -:- set XCPU=186 -:- set XCPU=386 +:----------------------------------------------------------------------- +:- select default target: CPU type (default is 86) and +:- what FAT system (default is 32) to support + +::set XCPU=86 +::set XCPU=186 +::set XCPU=386 -set XFAT=16 -:- set XFAT=32 +::set XFAT=16 +::set XFAT=32 :- Give extra compiler DEFINE flags here :- such as -DDEBUG : extra DEBUG output :- -DDOSEMU : printf output goes to dosemu log -:- set ALLCFLAGS=-DDEBUG +::set ALLCFLAGS=-DDEBUG +:----------------------------------------------------------------------- -:- -:- $Id: config.b,v 1.11 2003/07/19 18:12:26 bartoldeman Exp $ -:- +set LAST=1 +if not "%LAST%" == "1" defaults.bat clearset diff -ruNp 0old/default.bat 0new/default.bat --- 0old/default.bat 2004-03-27 05:20:12.000000000 +0000 +++ 0new/default.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ [EMAIL PROTECTED] off - -:- $Id: default.bat,v 1.1 2004/03/27 01:42:33 bartoldeman Exp $ - -if "%1" == "clearset" goto clearset - -:----------------------------------------------------------------------- - -if not "%MAKE%" == "" goto skip_make - -if "%COMPILER%" == "TC2" set MAKE=%TC2_BASE%\make -if "%COMPILER%" == "TURBOCPP" set MAKE=%TP1_BASE%\bin\make -if "%COMPILER%" == "TC3" set MAKE=%TC3_BASE%\bin\make -if "%COMPILER%" == "BC5" set MAKE=%BC5_BASE%\bin\make -if "%COMPILER%" == "WATCOM" set MAKE=wmake/ms /h -if "%COMPILER%" == "MSCL8" set MAKE=%MS_BASE%\bin\nmake/nologo - -echo Make is %MAKE%. - -:skip_make - -:----------------------------------------------------------------------- - -if not "%XLINK%" == "" goto skip_xlink - -if "%COMPILER%" == "TC2" set XLINK=%TC2_BASE%\tlink/m/c -if "%COMPILER%" == "TURBOCPP" set XLINK=%TP1_BASE%\bin\tlink/m/c -if "%COMPILER%" == "TC3" set XLINK=%TC3_BASE%\bin\tlink/m/c -if "%COMPILER%" == "BC5" set XLINK=%BC5_BASE%\bin\tlink/m/c -if "%COMPILER%" == "WATCOM" set XLINK=..\utils\wlinker/ma/nologo -if "%COMPILER%" == "MSCL8" set XLINK=%MS_BASE%\bin\link/ONERROR:NOEXE /ma /nologo - -echo Linker is %XLINK%. - -:skip_xlink - -:----------------------------------------------------------------------- - -if not "%XUPX%" == "" set UPXOPT=-U -if "%XUPX%" == "" set UPXOPT= -if "%XUPX%" == "" set [EMAIL PROTECTED] - -goto end - -:----------------------------------------------------------------------- - -:clearset - -if not "%OLDPATH%" == "" set PATH=%OLDPATH% -if not "%OLDPATH%" == "" set OLDPATH= - -set MAKE= -set COMPILER= -set XCPU= -set XFAT= -set XLINK= -set TC2_BASE= -set TP1_BASE= -set TC3_BASE= -set BC5_BASE= -set MS_BASE= -set XNASM= -set XUPX= -set UPXOPT= - -:end diff -ruNp 0old/defaults.bat 0new/defaults.bat --- 0old/defaults.bat 1970-01-01 00:00:00.000000000 +0000 +++ 0new/defaults.bat 2004-04-03 09:58:14.000000000 +0000 @@ -0,0 +1,90 @@ [EMAIL PROTECTED] off + +:- $Id: defaults.bat,v 1.1 2004/03/27 01:42:33 bartoldeman Exp $ + +set LAST= +if "%1" == "clearset" goto clearset + +:----------------------------------------------------------------------- + +if "%COMPILER%" == "TC2" set BASE=%TC2_BASE% +if "%COMPILER%" == "TURBOCPP" set BASE=%TP1_BASE% +if "%COMPILER%" == "TC3" set BASE=%TC3_BASE% +if "%COMPILER%" == "BC5" set BASE=%BC5_BASE% +if "%COMPILER%" == "WATCOM" set BASE=%WATCOM% +if "%COMPILER%" == "MSCL8" set BASE=%MSCL8_BASE% +if "%BASE%" == "" goto clearset + +:----------------------------------------------------------------------- + +if not "%LINK%" == "" goto skip_link + +set LINK=%BASE%\bin\tlink/m/c +if "%COMPILER%" == "TC2" set LINK=%BASE%\tlink/m/c +if "%COMPILER%" == "WATCOM" set LINK=..\utils\wlinker/ma/nologo +if "%COMPILER%" == "MSCL8" set LINK=%BASE%\bin\link/ONERROR:NOEXE /ma /nologo + +echo Linker is %LINK% + +:skip_link + +:----------------------------------------------------------------------- + +if not "%LIBUTIL%" == "" goto skip_lib + +set LIBPLUS=+ +set LIBTERM= +set LIBUTIL=%BASE%\bin\tlib +if "%COMPILER%" == "TC2" set LIBUTIL=%BASE%\tlib +if "%COMPILER%" == "WATCOM" set LIBPLUS= +if "%COMPILER%" == "WATCOM" set LIBUTIL=wlib -q +if "%COMPILER%" == "MSCL8" set LIBTERM=; +if "%COMPILER%" == "MSCL8" set LIBUTIL=%BASE%\bin\lib/nologo + +echo Librarian is %LIBUTIL% + +:skip_lib + +:----------------------------------------------------------------------- + +if not "%MAKE%" == "" goto skip_make + +set MAKE=%BASE%\bin\make +if "%COMPILER%" == "TC2" set MAKE=%BASE%\make +if "%COMPILER%" == "WATCOM" set MAKE=wmake/ms /h +if "%COMPILER%" == "MSCL8" set MAKE=%BASE%\bin\nmake/nologo + +echo Make is %MAKE% + +:skip_make + +:----------------------------------------------------------------------- + +set LAST=1 +if "%LAST%" == "1" goto end + +:----------------------------------------------------------------------- + +:clearset + +set XCPU= +set XFAT= +set COMPILER= +set TC2_BASE= +set TP1_BASE= +set TC3_BASE= +set BC5_BASE= +set MSCL8_BASE= +set BASE= +set LINK= +set LIBUTIL= +set LIBPLUS= +set LIBTERM= +set MAKE= +set NASM= +set XUPX= + +if not "%OLDPATH%" == "" set PATH=%OLDPATH% +set OLDPATH= + +:end------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Freedos-kernel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freedos-kernel
--- End Message ---
