From cbf3ee97ac75107cedc81cc2cbfbce1d7c3ab314 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Mon, 3 Feb 2014 16:39:46 +0400 Subject: [PATCH] compatIn improved, vmake makefile added Former-commit-id: 1e13d96ce192ce5af6380a2935a2d7474e40c868 --- makefile | 34 ++++++++++++++++++++++------------ makefile.gnuc.armv6j | 34 ++++++++++++++++++++++------------ makefile.gnuc.armv6j_hardfp | 34 ++++++++++++++++++++++------------ makefile.gnuc.armv7a_hardfp | 34 ++++++++++++++++++++++------------ makefile.gnuc.powerpc | 34 ++++++++++++++++++++++------------ makefile.gnuc.x86 | 34 ++++++++++++++++++++++------------ makefile.gnuc.x86_64 | 34 ++++++++++++++++++++++------------ src/lib/v4/compatIn.Mod | 29 ++++++++++++++++++++++++++--- src/tools/vmake/makefile | 17 +++++++++++++++++ 9 files changed, 197 insertions(+), 87 deletions(-) create mode 100644 src/tools/vmake/makefile diff --git a/makefile b/makefile index 86097c64..443710ed 100644 --- a/makefile +++ b/makefile @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.armv6j b/makefile.gnuc.armv6j index 5e1b5c54..6954f531 100644 --- a/makefile.gnuc.armv6j +++ b/makefile.gnuc.armv6j @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.armv6j_hardfp b/makefile.gnuc.armv6j_hardfp index 4961f4a2..b79b7062 100644 --- a/makefile.gnuc.armv6j_hardfp +++ b/makefile.gnuc.armv6j_hardfp @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.armv7a_hardfp b/makefile.gnuc.armv7a_hardfp index 48e192cd..8d6c6277 100644 --- a/makefile.gnuc.armv7a_hardfp +++ b/makefile.gnuc.armv7a_hardfp @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.powerpc b/makefile.gnuc.powerpc index bb00e2af..1396a93a 100644 --- a/makefile.gnuc.powerpc +++ b/makefile.gnuc.powerpc @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.x86 b/makefile.gnuc.x86 index 4cb8bfe6..00ac1b7e 100644 --- a/makefile.gnuc.x86 +++ b/makefile.gnuc.x86 @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/makefile.gnuc.x86_64 b/makefile.gnuc.x86_64 index 86097c64..443710ed 100644 --- a/makefile.gnuc.x86_64 +++ b/makefile.gnuc.x86_64 @@ -23,6 +23,10 @@ ifndef PREFIX PREFIX = /opt/voc-$(RELEASE) endif +ifndef PREFIXLN +PREFIXLN = /opt/voc +endif + CCOPT = -fPIC $(INCLUDEPATH) -g CC = cc $(CCOPT) -c @@ -87,8 +91,6 @@ stage4: $(VOCSTATIC0) -smPS voc.Mod $(VOCSTATIC0) -smPS BrowserCmd.Mod $(VOCSTATIC0) -smPS OCatCmd.Mod - $(VOCSTATIC0) -sPS compatIn.Mod - $(VOCSTATIC0) -smPS vmake.Mod #this is to build the compiler from C sources. #this is a way to create a bootstrap binary. @@ -110,17 +112,8 @@ stage5: $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o - $(CC) compatIn.c - $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o version.o architecture.o - - # build all library files stage6: - #more v4 libs - $(VOCSTATIC) -sP Printer.Mod - $(VOCSTATIC) -sP Strings.Mod - $(VOCSTATIC) -sP Sets.Mod - $(VOCSTATIC) -sP Sets0.Mod #ooc libs $(VOCSTATIC) -sP oocAscii.Mod @@ -220,6 +213,13 @@ stage6: $(VOCSTATIC) -sP ulmRandomGenerators.Mod $(VOCSTATIC) -sP ulmTCrypt.Mod + #more v4 libs + $(VOCSTATIC) -sP Printer.Mod + $(VOCSTATIC) -sP Strings.Mod + $(VOCSTATIC) -sP Sets.Mod + $(VOCSTATIC) -sP Sets0.Mod + $(VOCSTATIC) -sP compatIn.Mod + #pow32 libs $(VOCSTATIC) -sP powStrings.Mod @@ -245,6 +245,14 @@ stage6: $(VOCSTATIC) -sP ethGZWriters.Mod +# build remaining tools +# $(VOCSTATIC0) -sPS compatIn.Mod +# $(VOCSTATIC0) -smPS vmake.Mod +# $(CC) compatIn.c +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o + + + stage7: #objects := $(wildcard *.o) #$(LD) objects @@ -268,7 +276,7 @@ install: cp voc $(PREFIX)/bin/ cp showdef $(PREFIX)/bin/ cp ocat $(PREFIX)/bin/ - cp vmake $(PREFIX)/bin/ + #cp vmake $(PREFIX)/bin/ cp -a src $(PREFIX)/ test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc @@ -284,7 +292,9 @@ install: cp 05vishap.conf /etc/ld.so.conf.d/ ldconfig + ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ uninstall: rm -rf $(PREFIX) + rm -rf $(PREFIXLN) diff --git a/src/lib/v4/compatIn.Mod b/src/lib/v4/compatIn.Mod index b44a5034..ce8eb03c 100644 --- a/src/lib/v4/compatIn.Mod +++ b/src/lib/v4/compatIn.Mod @@ -1,13 +1,14 @@ MODULE compatIn; (* module created to compile Make utility from Trianus v4 system with less changes in original file ; -- noch *) -IMPORT Args; +IMPORT Args, IntStr := oocIntStr; VAR Done* : BOOLEAN; argnum : INTEGER; + PROCEDURE Open*; BEGIN -argnum := 0; -Done := FALSE; + argnum := 0; + Done := FALSE; END Open; PROCEDURE Name*(VAR name : ARRAY OF CHAR); @@ -22,6 +23,28 @@ ELSE 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/tools/vmake/makefile b/src/tools/vmake/makefile new file mode 100644 index 00000000..3d0e0de2 --- /dev/null +++ b/src/tools/vmake/makefile @@ -0,0 +1,17 @@ + +VOC = /opt/voc/bin/voc + + + + +all: + $(VOC) -M vmake.Mod + +clean: + rm *.o + rm *.c + +install: + cp vmake /opt/voc/bin/ + +