diff --git a/src/test/x11/mines/compatIn.Mod b/src/test/x11/mines/compatIn.Mod new file mode 100644 index 00000000..ce8eb03c --- /dev/null +++ b/src/test/x11/mines/compatIn.Mod @@ -0,0 +1,50 @@ +MODULE compatIn; +(* module created to compile Make utility from Trianus v4 system with less changes in original file ; -- noch *) +IMPORT Args, IntStr := oocIntStr; + +VAR Done* : BOOLEAN; + argnum : INTEGER; + +PROCEDURE Open*; +BEGIN + argnum := 0; + Done := FALSE; +END Open; + +PROCEDURE Name*(VAR name : ARRAY OF CHAR); +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + Done := TRUE +ELSE + Done := FALSE +END +END Name; + +PROCEDURE Int*(VAR i : INTEGER); +VAR l : LONGINT; + r : IntStr.ConvResults; + name : ARRAY 32 OF CHAR; +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + IntStr.StrToInt(name, l, r); + IF r = IntStr.strAllRight THEN + i := SHORT(l); + Done := TRUE + ELSE + Done := FALSE + END +ELSE + Done := FALSE; +END +END Int; + + +BEGIN + Open(); +END compatIn. diff --git a/src/test/x11/mines/makefile b/src/test/x11/mines/makefile index 2b486cf2..41f63d7f 100644 --- a/src/test/x11/mines/makefile +++ b/src/test/x11/mines/makefile @@ -6,7 +6,7 @@ export CFLAGS VOC = $(SETPATH) /opt/voc/bin/voc all: - $(VOC) -s Linie.Mod Minesweeper.Mod -m + $(VOC) -s compatIn.Mod Linie.Mod Minesweeper.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/tetris/compatIn.Mod b/src/test/x11/tetris/compatIn.Mod new file mode 100644 index 00000000..ce8eb03c --- /dev/null +++ b/src/test/x11/tetris/compatIn.Mod @@ -0,0 +1,50 @@ +MODULE compatIn; +(* module created to compile Make utility from Trianus v4 system with less changes in original file ; -- noch *) +IMPORT Args, IntStr := oocIntStr; + +VAR Done* : BOOLEAN; + argnum : INTEGER; + +PROCEDURE Open*; +BEGIN + argnum := 0; + Done := FALSE; +END Open; + +PROCEDURE Name*(VAR name : ARRAY OF CHAR); +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + Done := TRUE +ELSE + Done := FALSE +END +END Name; + +PROCEDURE Int*(VAR i : INTEGER); +VAR l : LONGINT; + r : IntStr.ConvResults; + name : ARRAY 32 OF CHAR; +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + IntStr.StrToInt(name, l, r); + IF r = IntStr.strAllRight THEN + i := SHORT(l); + Done := TRUE + ELSE + Done := FALSE + END +ELSE + Done := FALSE; +END +END Int; + + +BEGIN + Open(); +END compatIn. diff --git a/src/test/x11/tetris/makefile b/src/test/x11/tetris/makefile index d5a93d6c..adf9bc81 100644 --- a/src/test/x11/tetris/makefile +++ b/src/test/x11/tetris/makefile @@ -6,7 +6,7 @@ export CFLAGS VOC = $(SETPATH) /opt/voc/bin/voc all: - $(VOC) -s Linie.Mod Ziffer.Mod Tetris.Mod -m + $(VOC) -s compatIn.Mod Linie.Mod Ziffer.Mod Tetris.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/tron/compatIn.Mod b/src/test/x11/tron/compatIn.Mod new file mode 100644 index 00000000..ce8eb03c --- /dev/null +++ b/src/test/x11/tron/compatIn.Mod @@ -0,0 +1,50 @@ +MODULE compatIn; +(* module created to compile Make utility from Trianus v4 system with less changes in original file ; -- noch *) +IMPORT Args, IntStr := oocIntStr; + +VAR Done* : BOOLEAN; + argnum : INTEGER; + +PROCEDURE Open*; +BEGIN + argnum := 0; + Done := FALSE; +END Open; + +PROCEDURE Name*(VAR name : ARRAY OF CHAR); +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + Done := TRUE +ELSE + Done := FALSE +END +END Name; + +PROCEDURE Int*(VAR i : INTEGER); +VAR l : LONGINT; + r : IntStr.ConvResults; + name : ARRAY 32 OF CHAR; +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + IntStr.StrToInt(name, l, r); + IF r = IntStr.strAllRight THEN + i := SHORT(l); + Done := TRUE + ELSE + Done := FALSE + END +ELSE + Done := FALSE; +END +END Int; + + +BEGIN + Open(); +END compatIn. diff --git a/src/test/x11/tron/makefile b/src/test/x11/tron/makefile index dcc2db7d..24c667e3 100644 --- a/src/test/x11/tron/makefile +++ b/src/test/x11/tron/makefile @@ -6,7 +6,7 @@ export CFLAGS VOC = $(SETPATH) /opt/voc/bin/voc all: - $(VOC) Tron.Mod -m + $(VOC) compatIn.Mod Tron.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/test/x11/vier/compatIn.Mod b/src/test/x11/vier/compatIn.Mod new file mode 100644 index 00000000..ce8eb03c --- /dev/null +++ b/src/test/x11/vier/compatIn.Mod @@ -0,0 +1,50 @@ +MODULE compatIn; +(* module created to compile Make utility from Trianus v4 system with less changes in original file ; -- noch *) +IMPORT Args, IntStr := oocIntStr; + +VAR Done* : BOOLEAN; + argnum : INTEGER; + +PROCEDURE Open*; +BEGIN + argnum := 0; + Done := FALSE; +END Open; + +PROCEDURE Name*(VAR name : ARRAY OF CHAR); +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + Done := TRUE +ELSE + Done := FALSE +END +END Name; + +PROCEDURE Int*(VAR i : INTEGER); +VAR l : LONGINT; + r : IntStr.ConvResults; + name : ARRAY 32 OF CHAR; +BEGIN +INC(argnum); + +IF argnum < Args.argc THEN + Args.Get(argnum, name); + IntStr.StrToInt(name, l, r); + IF r = IntStr.strAllRight THEN + i := SHORT(l); + Done := TRUE + ELSE + Done := FALSE + END +ELSE + Done := FALSE; +END +END Int; + + +BEGIN + Open(); +END compatIn. diff --git a/src/test/x11/vier/makefile b/src/test/x11/vier/makefile index c99f0ca2..3738cd68 100644 --- a/src/test/x11/vier/makefile +++ b/src/test/x11/vier/makefile @@ -6,7 +6,7 @@ export CFLAGS VOC = $(SETPATH) /opt/voc/bin/voc all: - $(VOC) -s Ausgabe.Mod Vier.Mod -m + $(VOC) -s compatIn.Mod Ausgabe.Mod Vier.Mod -m #$(VOC) -Cm test.Mod #gcc -o test test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11 diff --git a/src/tools/vmake/makefile b/src/tools/vmake/makefile index 764ee959..c835d3e2 100644 --- a/src/tools/vmake/makefile +++ b/src/tools/vmake/makefile @@ -10,6 +10,8 @@ all: clean: rm *.o rm *.c + rm *.h + rm *.sym install: cp vmake /opt/voc/bin/ diff --git a/src/tools/vmake/vmake.Mod b/src/tools/vmake/vmake.Mod index f44fbceb..5cf90e01 100644 --- a/src/tools/vmake/vmake.Mod +++ b/src/tools/vmake/vmake.Mod @@ -11,7 +11,7 @@ Make.Order {filename} ~ (* taken from trianus system source ; -- noch *) MODULE vmake; (*HM 94-06-22 / *) -IMPORT Texts := CmdlnTexts, In := compatIn, Out := Console; +IMPORT Texts, In := compatIn, Out := Console; TYPE ModuleName = ARRAY 64 OF CHAR; diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id index 370f367a..8d5d7ade 100644 --- a/voc.REMOVED.git-id +++ b/voc.REMOVED.git-id @@ -1 +1 @@ -a2c52756242dc0366a361e7e7a30874cb3078505 \ No newline at end of file +8419554a07e6b9fb5fa1b56e1e153fc4662c6d9a \ No newline at end of file diff --git a/vocstatic.linux.gcc.x86_64.REMOVED.git-id b/vocstatic.linux.gcc.x86_64.REMOVED.git-id index 7c1c0887..8d5d7ade 100644 --- a/vocstatic.linux.gcc.x86_64.REMOVED.git-id +++ b/vocstatic.linux.gcc.x86_64.REMOVED.git-id @@ -1 +1 @@ -d6d7155f3f849158074a9c59e37d93ea30fa4c16 \ No newline at end of file +8419554a07e6b9fb5fa1b56e1e153fc4662c6d9a \ No newline at end of file