[Freedos-kernel] patch: batch and make files (2/2)

2004-04-23 Thread Arkady V.Belousov
---BeginMessage---
diff -ruNp old/kernel/kernel.cfg new/kernel/kernel.cfg
--- old/kernel/kernel.cfg   2001-07-10 00:19:32.0 +
+++ new/kernel/kernel.cfg   1970-01-01 00:00:00.0 +
@@ -1,14 +0,0 @@
--1-
--f-
--ff-
--O
--Z
--d
--k-
--vi-
--w
--wpro
--weas
--wpre
--I..\hdr
--v -X- -I. -D__STDC__=0 -DTSC -DDEBUG -DKERNEL -DI86 -DPROTO -DSHWR -DASMSUPT
diff -ruNp old/kernel/makefile new/kernel/makefile
--- old/kernel/makefile 2004-04-12 11:36:06.0 +
+++ new/kernel/makefile 2004-04-22 11:30:48.0 +
@@ -29,7 +29,7 @@ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
 
 #   *Explicit Rules*
 
-production: ..\bin\$(TARGET).sys
+production:..\bin\$(TARGET).sys
 
 ..\bin\$(TARGET).sys: kernel.sys
copy kernel.sys ..\bin
@@ -43,7 +43,7 @@ kernel.sys:   kernel.exe ..\utils\exeflat.
 kernel.exe:$(TARGET).lnk $(OBJS) $(LIBS)
$(LINK) @$(TARGET).lnk;
 
-clobber:clean
+clobber:   clean
-$(RM) kernel.exe kernel.sys status.me
 
 clean:
@@ -54,8 +54,8 @@ clean:
 
 ECHOTO=..\utils\echoto
 
-$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak
-   -$(RM) *.lnk
+$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak
+   -$(RM) *.lnk *.obj
$(ECHOTO) $(TARGET).lnk $(OBJS1)+
$(ECHOTO) $(TARGET).lnk $(OBJS2)+
$(ECHOTO) $(TARGET).lnk $(OBJS3)+
@@ -68,57 +68,52 @@ $(TARGET).lnk: turboc.cfg makefile ..\mk
$(ECHOTO) $(TARGET).lnk $(LIBS)
 
 #   *Individual File Dependencies*
-apisupt.obj:   apisupt.asm segs.inc$(TARGET).lnk
-asmsupt.obj:   asmsupt.asm segs.inc$(TARGET).lnk
-console.obj:   console.asm io.inc  $(TARGET).lnk
-dosidle.obj:   dosidle.asm segs.inc$(TARGET).lnk
-entry.obj: entry.asm   segs.inc $(HDR)stacks.inc   $(TARGET).lnk
-execrh.obj:execrh.asm  segs.inc$(TARGET).lnk
-int2f.obj: int2f.asm   segs.inc $(HDR)stacks.inc   $(TARGET).lnk
-intr.obj:  intr.asmsegs.inc$(TARGET).lnk
-io.obj:io.asm  segs.inc$(TARGET).lnk
-irqstack.obj:   irqstack.asm segs.inc  $(TARGET).lnk
-kernel.obj:kernel.asm  segs.inc ludivmul.inc   $(TARGET).lnk
-nls_hc.obj:nls_hc.asm  segs.inc$(TARGET).lnk
-nlssupt.obj:   nlssupt.asm segs.inc$(TARGET).lnk
-printer.obj:   printer.asm io.inc  $(TARGET).lnk
-procsupt.obj:  procsupt.asm segs.inc $(HDR)stacks.inc  $(TARGET).lnk
-serial.obj:serial.asm  io.inc  $(TARGET).lnk
-
-HDRS=\
-$(HDR)portab.h $(HDR)device.h $(HDR)mcb.h $(HDR)pcb.h \
-$(HDR)fat.h $(HDR)fcb.h $(HDR)tail.h $(HDR)time.h $(HDR)process.h \
-$(HDR)dcb.h $(HDR)sft.h $(HDR)cds.h $(HDR)exe.h $(HDR)fnode.h \
-$(HDR)dirmatch.h $(HDR)file.h $(HDR)clock.h $(HDR)kbd.h $(HDR)error.h  \
-$(HDR)version.h dyndata.h
-HEADERS=$(HDRS) globals.h proto.h
-INITHEADERS=$(HDRS) init-mod.h init-dat.h
-
-blockio.obj: blockio.c$(HEADERS) $(TARGET).lnk  
-break.obj: break.c$(HEADERS) $(TARGET).lnk  
-chario.obj: chario.c  $(HEADERS) $(TARGET).lnk  
-dosfns.obj: dosfns.c  $(HEADERS) $(TARGET).lnk  
-dosnames.obj: dosnames.c  $(HEADERS) $(TARGET).lnk  
-dsk.obj: dsk.c$(HEADERS) $(TARGET).lnk  
-error.obj: error.c$(HEADERS) $(TARGET).lnk  
-fatdir.obj: fatdir.c  $(HEADERS) $(TARGET).lnk  
-fatfs.obj: fatfs.c$(HEADERS) $(TARGET).lnk  
-fattab.obj: fattab.c  $(HEADERS) $(TARGET).lnk  
-fcbfns.obj: fcbfns.c  $(HEADERS) $(TARGET).lnk  
-inthndlr.obj: inthndlr.c  $(HEADERS) $(TARGET).lnk  
-ioctl.obj: ioctl.c$(HEADERS) $(TARGET).lnk  
-memmgr.obj: memmgr.c  $(HEADERS) $(TARGET).lnk  
-misc.obj: misc.c  $(HEADERS) $(TARGET).lnk  
-lfnapi.obj: lfnapi.c  $(HEADERS) $(TARGET).lnk
-newstuff.obj: newstuff.c  $(HEADERS) $(TARGET).lnk  
-network.obj: network.c$(HEADERS) $(TARGET).lnk  
-nls.obj: nls.c$(HEADERS) $(TARGET).lnk  
-prf.obj: prf.c  $(HDR)portab.h $(TARGET).lnk
-strings.obj: strings.c  $(TARGET).lnk
-sysclk.obj: sysclk.c$(HEADERS) $(TARGET).lnk
-syspack.obj: syspack.c  $(HEADERS) $(TARGET).lnk
-systime.obj: systime.c  $(HEADERS) $(TARGET).lnk
-task.obj: task.c$(HEADERS) $(TARGET).lnk
+
+apisupt.obj:   apisupt.asm  segs.inc
+asmsupt.obj:   asmsupt.asm  segs.inc
+console.obj:   console.asm  io.inc
+dosidle.obj:   dosidle.asm  segs.inc
+entry.obj: entry.asmsegs.inc $(HDR)stacks.inc
+execrh.obj:execrh.asm   segs.inc
+int2f.obj: int2f.asmsegs.inc $(HDR)stacks.inc
+intr.obj:  intr.asm segs.inc
+io.obj:io.asm   segs.inc
+irqstack.obj:  irqstack.asm segs.inc
+kernel.obj:kernel.asm   segs.inc ludivmul.inc
+nls_hc.obj:nls_hc.asm  

Re: [Freedos-kernel] patch: batch and make files (description)

2004-04-08 Thread tom ehlert
Hello Arkady,

AVB PS4: repeat for my previous question: why to duplicate clean and
AVB clobber? Another one: who make files status.me, *.cod, *.las?

*.cod are generated by MSC, if compiled with 'generate assembly
listing with source' (very handy when debugging)

tom




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


Re: [Freedos-kernel] patch: batch and make files (description)

2004-04-08 Thread Arkady V.Belousov
Hi!

8--2004 09:11 [EMAIL PROTECTED] (tom ehlert) wrote to Arkady V.Belousov
[EMAIL PROTECTED]:

AVB PS4: repeat for my previous question: why to duplicate clean and
AVB clobber? Another one: who make files status.me, *.cod, *.las?
te *.cod are generated by MSC, if compiled with 'generate assembly
te listing with source' (very handy when debugging)

 What about other files? I know that name status.me was used by (old
version ? of) MultiEdit, about .las I can't suggest anything.

PS: Currently I think how to optimize compilation process through making
list of source files, which should be recompiled (and passing this list to
compiler). Without this, (re)compilation by OW uses more than half of hour -
starting of compiler is longer, than compilation itself.




---
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_id70alloc_id638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files (description)

2004-04-07 Thread Arkady V.Belousov
Hi!

 [Don't know what happen, but SF silently ignores/losts my letters. B-E
Second day: one was saturday, second was today. Not funny. Below _repost_ of
my letter with new patch from today, monday.]

 New updates for my patches. Because I already remove intermediate
files, there present diff file not to my last patch, but to files, as
patched by Bart.

- buildall.bat, clean.bat: not all DELs was NULed.
- config.b: comment for NASM updated by request of Bernd. :)
- kernel\makefile: not all individual rules was present (asmsupt.asm), not
  all dependencies was present (eg, segs.inc for irqstack.asm).
- kernel\nls_load.c: removed.

PS: config.h also may be removed, because it is dummy (for this only
required to remove reference in globals.h). When (and if!) it will be
required, it may be added back.

PS2: kernel\nls\001-437.hc is desynced with kernel\nls_hc.asm.

PS3: header files in globals.h and init-mode.h included in different order.

PS4: repeat for my previous question: why to duplicate clean and
clobber? Another one: who make files status.me, *.cod, *.las?




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


Re: [Freedos-kernel] patch: batch and make files

2004-04-06 Thread Bart Oldeman
On Mon, 5 Apr 2004, Arkady V.Belousov wrote:

 PS: config.h also may be removed, because it is dummy (for this only
 required to remove reference in globals.h). When (and if!) it will be
 required, it may be added back.

config.h contains
struct config { /* Configuration variables */

after Lucho's patch


 PS2: kernel\nls\001-437.hc is desynced with kernel\nls_hc.asm.

It was accidentally checked into CVS as ascii instead of as binary, so I
had to correct that and fix the CRLF at the time (the .asm didn't change).

 PS3: header files in globals.h and init-mode.h included in different order.

is that a problem?

 PS4: repeat for my previous question: why to duplicate clean and
 clobber? Another one: who make files status.me, *.cod, *.las?

ask Pat Villani. AFAICS clobber is a little more thorough than clean,
where clean removes enough to force a kernel rebuild, clobber tries to
remove all generated files (incl. kernel.sys).

Bart



---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files

2004-04-05 Thread Arkady V.Belousov
Hi!

 [Don't know what happen, but SF silently ignores/losts my letters. B-E
Second day: one was saturday, second was today. Not funny. Below _repost_ of
my letter with new patch from today, monday.]

 New updates for my patches. Because I already remove intermediate
files, there present diff file not to my last patch, but to files, as
patched by Bart.

- BUILDALL.BAT, CLEAN.BAT: not all DELs was NULed.
- CONFIG.B: comment for NASM updated by request of Bernd. :)
- KERNEL\MAKEFILE: not all individual rules was present (asmsupt.asm), not
  all dependencies was present (eg, segs.inc for irqstack.asm).
- KERNEL\NLS_LOAD.C: removed.

PS: config.h also may be removed, because it is dummy (for this only
required to remove reference in globals.h). When (and if!) it will be
required, it may be added back.

PS2: KERNEL\NLS\001-437.HC is desynced with KERNEL\NLS_HC.ASM.

PS3: header files in globals.h and init-mode.h included in different order.

PS4: repeat for my previous question: why to duplicate clean and
clobber? Another one: who make files status.me, *.cod, *.las?




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files (diff file)

2004-04-05 Thread Arkady V.Belousov
---BeginMessage---
diff -ruNp 0old/build.bat 0new/build.bat
--- 0old/build.bat  2004-03-27 01:42:32.0 +
+++ 0new/build.bat  2004-04-03 10:16:14.0 +
@@ -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.0 +
+++ 0new/buildall.bat   2004-03-31 13:25:20.0 +
@@ -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 tc86 fat16
-%ONERROR%
-call build -r tc   186 fat32
-%ONERROR%
-call build -r tc86 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 wc386 fat32
-%ONERROR%
-call build -r wc386 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

[Freedos-kernel] patch: batch and make files (description)

2004-04-05 Thread Arkady V.Belousov
Hi!

 [Don't know what happen, but SF silently ignores/losts my letters. B-E
Second day: one was saturday, second was today. Not funny. Below _repost_ of
my letter with new patch from today, monday.]

 New updates for my patches. Because I already remove intermediate
files, there present diff file not to my last patch, but to files, as
patched by Bart.

- buildall.bat, clean.bat: not all DELs was NULed.
- config.b: comment for NASM updated by request of Bernd. :)
- kernel\makefile: not all individual rules was present (asmsupt.asm), not
  all dependencies was present (eg, segs.inc for irqstack.asm).
- kernel\nls_load.c: removed.

PS: config.h also may be removed, because it is dummy (for this only
required to remove reference in globals.h). When (and if!) it will be
required, it may be added back.

PS2: kernel\nls\001-437.hc is desynced with kernel\nls_hc.asm.

PS3: header files in globals.h and init-mode.h included in different order.

PS4: repeat for my previous question: why to duplicate clean and
clobber? Another one: who make files status.me, *.cod, *.las?




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


Re: [Freedos-kernel] patch: batch and make files (description)

2004-04-05 Thread Jim Hall
At least one of your emails was trapped by the SF mail system until I 
was able to free it this morning.  Emails may not be over 40k in length, 
or else they are held until the list owner (me) accepts or rejects them 
(a manual process.)

-jh



Arkady V.Belousov wrote:
Hi!

 [Don't know what happen, but SF silently ignores/losts my letters. B-E
Second day: one was saturday, second was today. Not funny. Below _repost_ of
my letter with new patch from today, monday.]
 New updates for my patches. Because I already remove intermediate
files, there present diff file not to my last patch, but to files, as
patched by Bart.
- buildall.bat, clean.bat: not all DELs was NULed.
- config.b: comment for NASM updated by request of Bernd. :)
- kernel\makefile: not all individual rules was present (asmsupt.asm), not
  all dependencies was present (eg, segs.inc for irqstack.asm).
- kernel\nls_load.c: removed.
PS: config.h also may be removed, because it is dummy (for this only
required to remove reference in globals.h). When (and if!) it will be
required, it may be added back.
PS2: kernel\nls\001-437.hc is desynced with kernel\nls_hc.asm.

PS3: header files in globals.h and init-mode.h included in different order.

PS4: repeat for my previous question: why to duplicate clean and
clobber? Another one: who make files status.me, *.cod, *.las?



--
_
This email message has been automatically encrypted using ROT-26.
---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files

2004-04-05 Thread Arkady V.Belousov
Hi!

 [Don't know what happen, but SF silently ignores/losts my letters. B-E
Second day: one was saturday, second was today. Not funny. Below _repost_ of
my letter with new patch from today, monday.]

 New updates for my patches. Because I already remove intermediate
files, there present diff file not to my last patch, but to files, as
patched by Bart.

- buildall.bat, clean.bat: not all DELs was NULed.
- config.b: comment for NASM updated by request of Bernd. :)
- kernel\makefile: not all individual rules was present (asmsupt.asm), not
  all dependencies was present (eg, segs.inc for irqstack.asm).
- kernel\nls_load.c: removed.

PS: config.h also may be removed, because it is dummy (for this only
required to remove reference in globals.h). When (and if!) it will be
required, it may be added back.

PS2: kernel\nls\001-437.hc is desynced with kernel\nls_hc.asm.

PS3: header files in globals.h and init-mode.h included in different order.

PS4: repeat for my previous question: why to duplicate clean and
clobber? Another one: who make files status.me, *.cod, *.las?




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files (diff file, 1/2)

2004-04-04 Thread Arkady V.Belousov
---BeginMessage---
diff -ruNp 0old/build.bat 0new/build.bat
--- 0old/build.bat  2004-03-27 01:42:32.0 +
+++ 0new/build.bat  2004-04-03 10:16:14.0 +
@@ -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.0 +
+++ 0new/buildall.bat   2004-03-31 13:25:20.0 +
@@ -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 tc86 fat16
-%ONERROR%
-call build -r tc   186 fat32
-%ONERROR%
-call build -r tc86 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 wc386 fat32
-%ONERROR%
-call build -r wc386 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

Re: [Freedos-kernel] patch: batch and make files

2004-04-04 Thread tom ehlert
Hello Arkady,

AVB  I test batch and make files both under OW12 and BC31
would be great if you ewoild test them with TV 2.01 also (this is a
reference compiler, BC31 not)

btw: there is absolutely no need to mess with them - they usually
work.

tom




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


Re: [Freedos-kernel] patch: batch and make files

2004-04-04 Thread Bernd Blaauw
Arkady V.Belousov schreef:
Hi!

4--2004 17:55 [EMAIL PROTECTED] (tom ehlert) wrote to Arkady V.Belousov
[EMAIL PROTECTED]:
AVB  I test batch and make files both under OW12 and BC31
te would be great if you ewoild
 ewoild=perform?

would - 'if you would test them'
te test them with TV 2.01 also (this is a reference compiler, BC31 not)

 How big is it? Where I may download it (without answering question and
other scripting issues)? If it longer than 3M (www4mail limit), who may send
it to me?
te btw: there is absolutely no need to mess with them - they usually work.

 they=BC? It depends. :)

'they' = '(your changed) batchfiles'

---
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_id70alloc_id638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel


[Freedos-kernel] patch: batch and make files

2004-04-03 Thread Arkady V.Belousov
Hi!

 [Looks like SF sometime eats my letters, so I repost diff file and
comments again, now in different letters. Also, there added two changes,
which I forget in previous letter, about TURBOC.CFG and KERNEL.CFG.]

 I test batch and make files both under OW12 and BC31 and have new
changes. Below full list of changes, new/updated entries are quoted.

- UTILS\RMFILES.BAT: for DEL added NUL (this prevents showing names of
  deleted files under 4DOS/NDOS).
- UTILS\PROTO.BAT, UTILS\INDENT: removed.
- UTILS\WLINKER.BAT: linker now called through CALL.
- UTILS\WLINKER.BAT: instead redirection to WLINK, directives now passed
  through @ option.

- all batch files now check if environment is enough; this prevents wrong
  actions in case of small environment.
- *.BAT: %MAKE% now called through CALL; this allows to place into PATH
  batch file instead utility itself.
- DEFAULT.BAT renamed to DEFAULTS.BAT, for all call batchfile added
  suffix .BAT; this solves compatability problem with 4DOS (where DEFAULT
  is a built-in command).
- CONFIG.B: added possibility to define librarian.
- CONFIG.B: added MAKER -S as choice for MAKE.
- CONFIG.B: ::SET WATCOM=%WATCOM% replaced back to ::SET WATCOM=c:\watcom.
- CLOBBER.BAT now uses CLEAN.BAT for its job; this eases to update cleaning
  code because no code duplication.

- MKFILES\*.MAK: removed space after = in macros definitions; this makes
  command lines shorter.
- common definitions from makefiles moved to MKFILES\GENERIC.MAK
  (directories) and CONFIG.B/DEFAULTS.BAT (LINK, NASM, LIBUTIL, etc).
- MKFILES\GENERIC.MAK: XCPU=86 and XFAT=32 are defined here, if environment
  doesn't contains these variables; this allows to reduce count of variables
  in environment.
- MKFILES\WATCOM.MAK: removed INCLUDE and EDPATH macroses.
- MKFILES\WATCOM.MAK: added option -d1 (to allow make listings with sources).

- KERNEL\MAKEFILE: removed unneccessary macroses.
- KERNEL\MAKEFILE: PRODUCTION now depends from $(TARGET).sys (not from
  KERNEL.SYS); list of object files now written to $(TARGET).LNK (not to
  KERNEL.RES); all recompiled targets (including *.asm) now depends from
  $(TARGET).LNK (not from $(CONFIGURATION)). This forces full recompilation
  in case of another compiler, CPU or FAT supprot are selected.
- KERNEL\MAKEFILE: $(TARGET).LNK now depends from configuration files, not
  from object files and libraries; this allows to create $(TARGET).LNK file
  once, not at each compilation.
- KERNEL\KERNEL.CFG: removed.
- KERNEL\TURBOC.CFG: removed redefinition of __STDC__.

PS: Most my utilities are called through batch files, not directly.
PPS: Kernel now may be recompiled by another compiler or with other target
options without calling build -r or clobber directly. Unfortunately,
other makefiles are not (yet) such smart.

PPPS: Bart! What the reason to use both `clean' and `clobber'?




---
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=1470alloc_id=3638op=click
___
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel