From 71ff50e26b685ca05bd453527f5b02ce40511f16 Mon Sep 17 00:00:00 2001 From: Peter Feij Date: Fri, 10 Nov 2017 16:06:18 +0000 Subject: [PATCH] Omdat de disk tegenwoordig in Emmen is toch maar gebruik van %temp% tbv snelheid svn path=/Database/trunk/; revision=35965 --- FCLT.NMK | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/FCLT.NMK b/FCLT.NMK index b6707d4b..e4e6a667 100644 --- a/FCLT.NMK +++ b/FCLT.NMK @@ -3,7 +3,7 @@ ## ## Project: FACILITOR ## -## (c) 1995-2017 Facilitor B.V. +## (c) 1995-2018 Facilitor B.V. ## ## Auteur: Ir. P.G. Feij ## $Revision$ @@ -44,7 +44,7 @@ ############################################################################### ## ## Steps performed are: -## All files are preprocessed directly into their result, no temp files +## All files are preprocessed using intermediate temp files ############# @@ -60,9 +60,9 @@ PROJEXE=z:\Project\FACILITOR\BUILD ## ## New style using schemanumbers ## -CURRENTVERSION=31 -NEXTVERSION=32 -FILEVERSION=a +CURRENTVERSION=32 +NEXTVERSION=33 +FILEVERSION= NEXTCAREVERSION=32 NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION) CURRENTUPDATE=DB$(CURRENTVERSION)to$(NEXTVERSION) @@ -260,9 +260,11 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL: \ $(MSRC)\web\web_tri.src \ $(MSRC)\web\web_vie.src @IF NOT EXIST $(EXE)\$(NEXTROOT)\NUL mkdir $(EXE)\$(NEXTROOT) - $(PRECOMP) $(PRECOMP_OPTIONS) $(MSRC)\fclt.src>$*_.sql - $(CLEANUP1) $*_.sql - $(WRAP1) iname=$*_.sql oname=$*.sql + $(PRECOMP) $(PRECOMP_OPTIONS) $(MSRC)\fclt.src>$(TEMP)\$(*B)_.sql + $(CLEANUP1) $(TEMP)\$(*B)_.sql + COPY $(TEMP)\$(*B)_.sql $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION)_.SQL + $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql + COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL $(MSRC)\fac\_fac_lclmdl.src: \ $(MSRC)\fac\fac_lclmdl.csv @@ -280,9 +282,11 @@ $(EXE)\$(NEXTROOT)\$(CURRENTUPDATE)$(FILEVERSION).SQL: \ $(MSRC)\comsql.h \ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).sql @IF NOT EXIST $(EXE)\$(NEXTROOT)\NUL mkdir $(EXE)\$(NEXTROOT) - $(PRECOMP) $(PRECOMP_OPTIONS) $(SRCUPDATE).src>$*_.sql - $(CLEANUP1) $*_.sql - $(WRAP1) iname=$*_.sql oname=$*.sql + $(PRECOMP) $(PRECOMP_OPTIONS) $(SRCUPDATE).src>$(TEMP)\$(*B)_.sql + $(CLEANUP1) $(TEMP)\$(*B)_.sql + COPY $(TEMP)\$(*B)_.sql $(EXE)\$(NEXTROOT)\$(CURRENTUPDATE)$(FILEVERSION)_.SQL + $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql + COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\$(CURRENTUPDATE)$(FILEVERSION).SQL $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL: \ $(SRCRECREA).src \ @@ -292,9 +296,11 @@ $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL: \ $(MSRC)\comsql.h \ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).sql @IF NOT EXIST $(EXE)\$(NEXTROOT)\NUL mkdir $(EXE)\$(NEXTROOT) - $(PRECOMP) $(PRECOMP_OPTIONS) $(SRCRECREA).src>$*_.sql - $(CLEANUP1) $*_.sql - $(WRAP1) iname=$*_.sql oname=$*.sql + $(PRECOMP) $(PRECOMP_OPTIONS) $(SRCRECREA).src>$(TEMP)\$(*B)_.sql + $(CLEANUP1) $(TEMP)\$(*B)_.sql + COPY $(TEMP)\$(*B)_.sql $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION)_.SQL + $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql + COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL ########################################################################## @@ -312,9 +318,11 @@ $(EXE)\CARE\CARE$(NEXTCAREVERSION).SQL: \ $(MSRC)\care\care_pac.src \ $(MSRC)\care\care_ini.src @IF NOT EXIST $(EXE)\CARE\NUL mkdir $(EXE)\CARE - $(PRECOMP) $(PRECOMP_OPTIONS) $(MSRC)\care.src>$*_.sql - $(CLEANUP1) $*_.sql - $(WRAP1) iname=$*_.sql oname=$*.sql + $(PRECOMP) $(PRECOMP_OPTIONS) $(MSRC)\care.src>$(TEMP)\$(*B)_.sql + $(CLEANUP1) $(TEMP)\$(*B)_.sql + COPY $(TEMP)\$(*B)_.sql $(EXE)\CARE\CARE$(NEXTCAREVERSION)_.SQL + $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql + COPY $(TEMP)\$(*B).sql $(EXE)\CARE\CARE$(NEXTCAREVERSION).SQL $(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL: \ $(CARERECREA).src \ @@ -323,8 +331,10 @@ $(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL: \ $(MSRC)\comsql.h \ $(EXE)\CARE\CARE$(NEXTCAREVERSION).sql @IF NOT EXIST $(EXE)\CARE\NUL mkdir $(EXE)\CARE - $(PRECOMP) $(PRECOMP_OPTIONS) $(CARERECREA).src>$*_.sql - $(CLEANUP1) $*_.sql - $(WRAP1) iname=$*_.sql oname=$*.sql + $(PRECOMP) $(PRECOMP_OPTIONS) $(CARERECREA).src>$(TEMP)\$(*B)_.sql + $(CLEANUP1) $(TEMP)\$(*B)_.sql + COPY $(TEMP)\$(*B)_.sql $(EXE)\CARE\RECAR$(NEXTCAREVERSION)_.SQL + $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql + COPY $(TEMP)\$(*B).sql $(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL ## END-OF-FILE