* update makefiles for testing

* update example which did not compile

docs/Makefile

@@ -164,8 +164,10 @@ help:
 	@echo ' txt           : dvi, convert to text using dvi2tty'
 	@echo ' htm           : Convert .html to .htm files, zip result'
 	@echo ' clean         : Clean up the mess.'
+	@echo ' examples      : Comple all generic examples'
 	@echo ' linuxexamples : Compile all examples for linux'
 	@echo ' dosexamples   : Compile all examples for dos'
+	@echo ' execute       : Execute examples (DOS/Windows/OS/2 only)'
 	@echo ' htmldist      : html, and rchive result.'
 	@echo ' psdist        : ps, and archive result.'
 	@echo ' pdfdist       : pdf, and archive result.'
@@ -538,6 +540,7 @@ examples:
 	$(MAKE) -C crtex
 	$(MAKE) -C dosex
 	$(MAKE) -C optex
+	$(MAKE) -C mathex
 	$(MAKE) -C printex
 	$(MAKE) -C refex
 	$(MAKE) -C stringex
@@ -554,11 +557,31 @@ linuxexamples: examples
 	$(MAKE) -C linuxex
 	$(MAKE) -C sockex
 	$(MAKE) -C ipcex
+	
+execute:
+	$(MAKE) -C dosex all
+	$(MAKE) -C dosex execute
+	$(MAKE) -C refex all
+	$(MAKE) -C refex execute
+	$(MAKE) -C mathex all
+	$(MAKE) -C mathex execute
+	$(MAKE) -C stringex all
+	$(MAKE) -C stringex execute
+	$(MAKE) -C objectex all
+	$(MAKE) -C objectex execute
+	$(MAKE) -C sysutex all
+	$(MAKE) -C sysutex execute
+	$(MAKE) -C typinfex all
+	$(MAKE) -C typinfex execute
 
 
 #
 # $Log$
-# Revision 1.14  2002-04-23 18:03:50  michael
+# Revision 1.15  2002-11-10 12:22:10  carl
+#   * update makefiles for testing
+#   * update example which did not compile
+#
+# Revision 1.14  2002/04/23 18:03:50  michael
 # + removed fcl target in HTML
 #
 # Revision 1.13  2002/03/19 14:33:18  pierre

docs/crtex/Makefile

@@ -46,6 +46,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/dosex/Makefile

@@ -28,15 +28,20 @@ ifdef UNITDIR
 PPOPTS:=$(PPOPTS) -Up$(UNITDIR);
 endif
 
-.SUFFIXES: .pp .tex
+.SUFFIXES: .pp .tex .log .exe
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex13 ex14 \
 #        ex15 ex16
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
+LOGFILE=$(addsuffix .log, $(OBJECTS))
+
+
+execute: $(LOGFILE)
+
 all : $(OBJECTS)
 
 tex : $(TEXOBJECTS)
@@ -46,9 +51,15 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
- 
+	rm -f *.ow *.sw *.exe *.dll *.log *.tmp
+	
+	
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
+	
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log
+	
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*

docs/dynlibex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/go32ex/Makefile

@@ -46,6 +46,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/graphex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/heapex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/ipcex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/kbdex/Makefile

@@ -47,6 +47,7 @@ onetex : tex
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS) logkeys.ppu logkeys.o
 	rm -f keyboard.log
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/linuxex/Makefile

@@ -51,6 +51,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/mathex/Makefile

@@ -30,7 +30,7 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 \
         ex11 ex12 ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 \
@@ -40,18 +40,35 @@ OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 \
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
+# This is not the same list as objects, since some of the
+# tests are interactive.
+TOTEST=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 \
+        ex11 ex12 ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 \
+        ex21 ex22 ex23 ex24 ex25 ex26 ex27 ex28 ex29 ex30 \
+        ex31 ex32 ex33 ex34 ex35 ex36 ex37 ex38 ex39 ex40 \
+        ex41 ex42 ex43 ex44 ex45 ex46 ex47 ex48 ex49 ex50
+LOGFILE=$(addsuffix .log, $(TOTEST))
+
+
 all : $(OBJECTS)
 
 tex : $(TEXOBJECTS)
 
+execute: $(LOGFILE)
+
+
 onetex : tex
 	$(MAKETEX) $(TEXOBJECTS)
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll *.log *.tmp
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/mathex/ex14.pp

@@ -7,7 +7,7 @@ Uses math;
 Procedure dofrexp(Const X : extended);
 
 var man : extended;
-    exp: integer;
+    exp: longint;
 
 begin
   man:=0;

docs/mmouseex/Makefile

@@ -46,6 +46,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/mouseex/Makefile

@@ -47,6 +47,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/objectex/Makefile

@@ -30,12 +30,22 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 \
         ex11 ex12 ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 \
         ex21 ex22 ex23 ex24 ex25 ex26 ex27 ex28 ex29 ex30 \
         ex31 ex32 ex33 ex34 ex35 ex36 ex37 ex38 ex39 ex40 
+        
+# This might not be the same list as objects, since some of the
+# tests might be interactive.
+TOTEST=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 \
+        ex11 ex12 ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 \
+        ex21 ex22 ex23 ex24 ex25 ex26 ex27 ex28 ex29 ex30 \
+        ex31 ex32 ex33 ex34 ex35 ex37 ex38 ex39 ex40 
+        
+LOGFILE=$(addsuffix .log, $(TOTEST))
+        
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
@@ -43,14 +53,21 @@ all : $(OBJECTS)
 
 tex : $(TEXOBJECTS) myobject.tex mysortc.tex
 
+execute: $(LOGFILE)
+
+
 onetex : tex
 	$(MAKETEX) $(TEXOBJECTS)
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS) mysortc.ppu myobject.ppu mysortc.tex myobject.tex test.dat
+	rm -f *.ow *.sw *.exe *.dll *.ppw
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
 
 $(TEXOBJECTS) myobject.tex mysortc.tex: %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/optex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/printex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/progex/Makefile

@@ -51,6 +51,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s *.so $(OBJECTS) $(COBJECTS) $(TEXOBJECTS) $(CTEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp $(LIBOBJECT)
 	$(PP) $(PPOPTS) $*

docs/refex/Makefile

@@ -30,7 +30,7 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex13 ex14 \
         ex15 ex16 ex17 ex18 ex19 ex20 ex21 ex22 ex23 ex24 ex25 ex26 ex27 \
@@ -44,18 +44,38 @@ OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex13 ex14 \
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
+# This is not the same list as objects, since some of the
+# tests are interactive.
+TOTEST=ex1 ex2 ex3 ex4 ex5 ex8 ex9 ex10 ex11 ex12 ex13 ex14 \
+        ex15 ex16 ex17 ex20 ex21 ex22 ex23 ex25 ex26 ex27 \
+        ex28 ex29 ex31 ex32 ex33 ex34 ex36 ex37 ex38 ex39 ex40 \
+        ex41 ex42 ex43 ex44 ex45 ex47 ex48 ex52 ex53 \
+        ex54 ex56 ex59 ex60 ex62 ex63 ex64 ex65 ex66 \
+        ex67 ex68 ex69 ex70 ex71 ex72 ex73 ex75 ex76 ex78 ex79 \
+	ex80 ex81 ex82 ex83  ex85 ex86 ex87 ex88 ex89 \
+	ex90 ex91 ex92 ex93 ex96 ex97 ex98 ex99 ex100 ex101 ex102\
+        ex103 ex104 ex105 ex106 ex107 ex108 ex109 ex110 ex111 ex112
+LOGFILE=$(addsuffix .log, $(TOTEST))
+
+
 all : $(OBJECTS)
 
 tex : $(TEXOBJECTS)
 
+execute: $(LOGFILE)
+
 onetex : tex
 	$(MAKETEX) $(TEXOBJECTS)
 
 clean : 
 	rm -f *.o *.s *.rst $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll *.log *.tmp
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/refex/ex112.pp

@@ -10,5 +10,5 @@ begin
   For I:=1 to 10 do
     Writeln (OctStr(Value,I));
   For I:=1 to 16 do
-    Writeln (OctStr(I),3);
+    Writeln (OctStr(I,3));
 end.

docs/refex/ex23.pp

@@ -8,7 +8,7 @@ Var F : File of Longint;
 begin
   { Fill a file with data : 
     Each position contains the position ! }
-  Assign (F,'test.dat');
+  Assign (F,'test.tmp');
   Rewrite (F);
   For L:=0 to 100 do
     begin

docs/refex/ex52.pp

@@ -6,7 +6,7 @@ Var F : File;
     I : longint;
 
 begin
-  Assign (F,'Test.dat');
+  Assign (F,'Test.tmp');
   { Create the file. Recordsize is 4 } 
   Rewrite (F,Sizeof(I));
   For I:=1 to 10 do

docs/refex/ex56.pp

@@ -8,7 +8,7 @@ Var
   
 begin
   { Create a file and fill it with data } 
-  Assign (F,'test.dat');
+  Assign (F,'test.tmp');
   Rewrite(F); { Create file }
   Close(f);   
   FileMode:=2;

docs/refex/ex71.pp

@@ -6,7 +6,7 @@ Var F : File of longint;
     I,L : Longint;
     
 begin
-  Assign (F,'test.dat');
+  Assign (F,'test.tmp');
   Rewrite (F);
   For I:=1 to 10 Do 
     Write (F,I);

docs/refex/ex75.pp

@@ -10,7 +10,7 @@ begin
   Write ('This is on the first line ! '); { No CR/LF pair! }
   Writeln ('And this too...');
   Writeln ('But this is already on the second line...');
-  Assign (f,'test.dat');
+  Assign (f,'test.tmp');
   Rewrite (f);
   For L:=1 to 10 do 
     write (F,L); { No writeln allowed here ! }

docs/refex/ex88.pp

@@ -7,7 +7,7 @@ Program Example88;
 Var F : text;
 
 begin
-  AssignFile(F,'textfile.txt');
+  AssignFile(F,'textfile.tmp');
   Rewrite(F);
   Writeln (F,'This is a silly example of AssignFile and CloseFile.');
   CloseFile(F);

docs/sockex/Makefile

@@ -45,6 +45,7 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*

docs/stringex/Makefile

@@ -30,14 +30,23 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex13 ex14 ex15 ex16 ex17
 
+# This might not be the same list as objects, since some of the
+# tests might be interactive.
+TOTEST=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex13 ex14 ex15 ex16 ex17
+LOGFILE=$(addsuffix .log, $(TOTEST))
+
+
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
 all : $(OBJECTS)
 
+execute: $(LOGFILE)
+
+
 tex : $(TEXOBJECTS)
 
 onetex : tex
@@ -45,9 +54,13 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll *.log *.tmp
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/sysutex/Makefile

@@ -30,7 +30,7 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12\
         ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 ex21 ex22 ex23 ex24\
@@ -40,11 +40,27 @@ OBJECTS=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12\
         ex59 ex60 ex61 ex62 ex63 ex64 ex65 ex66 ex67 ex68 ex69 ex70\
         ex71 ex72 ex73 ex74 ex75 ex76 ex77 ex78 ex79 ex80 \
         ex81 ex82 ex83 ex84 ex85 ex86 ex87 ex88
+        
+# This might not be the same list as objects, since some of the
+# tests might be interactive.
+TOTEST=ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 ex12\
+        ex13 ex14 ex15 ex16 ex17 ex18 ex19 ex20 ex21 ex22 ex23 ex24\
+        ex25 ex26 ex27 ex28 ex29 ex30 ex31 ex32 ex35 ex36\
+        ex37 ex39 ex41 ex42 ex43 ex44 ex45 ex46 ex47\
+        ex48 ex49 ex50 ex51 ex52 ex53 ex54 ex55 ex56 ex57 ex58\
+        ex59 ex60 ex61 ex62 ex63 ex64 ex65 ex66 ex67 ex68 ex69 ex70\
+        ex72 ex73 ex74 ex75 ex76 ex77 ex78 ex79 ex80 \
+        ex81 ex82 ex83 ex84 ex85 ex86 ex87 ex88
+
+LOGFILE=$(addsuffix .log, $(TOTEST))
+        
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
 all : $(OBJECTS)
 
+execute: $(LOGFILE)
+
 tex : $(TEXOBJECTS)
 
 onetex : tex
@@ -52,9 +68,13 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
+	rm -f *.ow *.sw *.exe *.dll *.ppw *.tmp *.log *.dat
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/typinfex/Makefile

@@ -30,15 +30,26 @@ endif
 
 .SUFFIXES: .pp .tex
 
-.PHONY: all tex clean
+.PHONY: all tex clean execute
 
 OBJECTS=rttiobj trtti1 trtti2 trtti3 ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 \
         ex10 ex11 ex12 ex13  ex14 ex15 ex16 ex17 ex18
+        
+# This might not be the same list as objects, since some of the
+# tests might be interactive.
+TOTEST=trtti1 trtti2 trtti3 ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 \
+        ex10 ex11 ex12 ex13  ex14 ex15 ex16 ex17 ex18
+        
+LOGFILE=$(addsuffix .log, $(TOTEST))
+        
 
 TEXOBJECTS=$(addsuffix .tex, $(OBJECTS))
 
 all : $(OBJECTS)
 
+execute: $(LOGFILE)
+
+
 tex : $(TEXOBJECTS)
 
 onetex : tex
@@ -46,9 +57,15 @@ onetex : tex
 
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS) rttiobj.ppu
+	rm -f *.ow *.sw *.exe *.dll *.tmp *.log rttiobj.ppw
  
 $(OBJECTS): %: %.pp
 	$(PP) $(PPOPTS) $*
+	
+	
 
 $(TEXOBJECTS): %.tex: %.pp head.tex foot.tex
 	$(PP2TEX) $*
+
+$(LOGFILE): %.log: %.exe 
+	$* > $*.log

docs/videoex/Makefile

@@ -49,6 +49,7 @@ onetex : tex
 clean : 
 	rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS)
 	rm -f vidutil.ppu vidutil.o viddbg.ppu viddbg.o Video.log
+	rm -f *.ow *.sw *.exe *.dll
  
 $(OBJECTS): %: %.pp vidutil.ppu
 	$(PP) $(PPOPTS) $*