From 69595782527c66839786ce8ef31a8cac2251794f Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Tue, 3 Dec 2019 14:37:01 +0100 Subject: [PATCH 1/2] fix(developer): ci alternate installer path CI needs to build the model compiler from an alternate path because the production build from npm can have files not in the development build. This was causing CI errors such as: kmlmc.wxs(170) : error LGHT0103 : The system cannot find the file 'C:\...\node_modules\.bin\node.ps1'. --- windows/src/developer/inst/copydev.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/windows/src/developer/inst/copydev.in b/windows/src/developer/inst/copydev.in index 2270783b07..ccc278fc86 100644 --- a/windows/src/developer/inst/copydev.in +++ b/windows/src/developer/inst/copydev.in @@ -33,7 +33,10 @@ candle: heat-cef heat-xml heat-templates heat-model-compiler $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dXmlSourceDir=$(ROOT)\src\developer\TIKE\xml xml.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dCefSourceDir=$(KEYMAN_CEF4DELPHI_ROOT) cef.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dTemplatesSourceDir=$(KEYMAN_DEVELOPER_TEMPLATES_ROOT) templates.wxs - $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dModelCompilerSourceDir=$(KEYMAN_MODELCOMPILER_ROOT) kmlmc.wxs + $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dModelCompilerSourceDir=$(KEYMAN_WIX_TEMP_MODELCOMPILER) kmlmc.wxs + $(MAKE) -fcopydev.mak clean-heat + +clean-heat: clean-heat-model-compiler heat-xml: # We copy the files to a temp folder in order to exclude thumbs.db, .vs, etc from harvesting @@ -103,6 +106,8 @@ heat-model-compiler: cd $(ROOT)\src\developer\inst $(WIXHEAT) dir $(KEYMAN_WIX_TEMP_MODELCOMPILER) -o kmlmc.wxs -ag -cg ModelCompiler -dr INSTALLDIR -var var.ModelCompilerSourceDir -wx -nologo +clean-heat-model-compiler: + # the production build generates files that are not in source, e.g. .ps1 scripts # When we candle/light build, we can grab the source files from the proper root so go ahead and delete the temp folder again -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER) From e8441b1f8909ae1bb9e6193ab39beab5b06cb097 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Wed, 4 Dec 2019 03:43:03 +0100 Subject: [PATCH 2/2] fix: move clean operation --- windows/src/developer/inst/Makefile | 1 + windows/src/developer/inst/copydev.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/src/developer/inst/Makefile b/windows/src/developer/inst/Makefile index 9b274f1e89..53a189e9b6 100644 --- a/windows/src/developer/inst/Makefile +++ b/windows/src/developer/inst/Makefile @@ -23,6 +23,7 @@ setup: $(MAKE) -fcopydev.mak candle $(WIXLIGHT) -sice:ICE91 -sice:ICE60 -dWixUILicenseRtf=License.rtf -out keymandeveloper.msi -ext WixUIExtension $(DEVELOPER_FILES) + $(MAKE) -fcopydev.mak clean-heat # # Sign the installation archive diff --git a/windows/src/developer/inst/copydev.in b/windows/src/developer/inst/copydev.in index ccc278fc86..560721d977 100644 --- a/windows/src/developer/inst/copydev.in +++ b/windows/src/developer/inst/copydev.in @@ -34,7 +34,6 @@ candle: heat-cef heat-xml heat-templates heat-model-compiler $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dCefSourceDir=$(KEYMAN_CEF4DELPHI_ROOT) cef.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dTemplatesSourceDir=$(KEYMAN_DEVELOPER_TEMPLATES_ROOT) templates.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dModelCompilerSourceDir=$(KEYMAN_WIX_TEMP_MODELCOMPILER) kmlmc.wxs - $(MAKE) -fcopydev.mak clean-heat clean-heat: clean-heat-model-compiler