From 19decd4b8d4937ef53fedf1778da13c96aaa4e6c Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Wed, 21 Aug 2019 12:07:42 +1000
Subject: [PATCH] [Developer] Continue integration

---
 windows/src/developer/inst/Makefile   |  2 +-
 windows/src/developer/inst/copydev.in |  2 +-
 windows/src/developer/inst/kmdev.wxs  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/windows/src/developer/inst/Makefile b/windows/src/developer/inst/Makefile
index 04c3187a4c..9b274f1e89 100644
--- a/windows/src/developer/inst/Makefile
+++ b/windows/src/developer/inst/Makefile
@@ -6,7 +6,7 @@
 
 # ----------------------------------------------------------------------
 
-DEVELOPER_FILES=kmdev.wixobj xml.wixobj cef.wixobj templates.wixobj
+DEVELOPER_FILES=kmdev.wixobj xml.wixobj cef.wixobj templates.wixobj kmlmc.wixobj
 
 setup:
 
diff --git a/windows/src/developer/inst/copydev.in b/windows/src/developer/inst/copydev.in
index 14b4bd9b75..8aff6f2290 100644
--- a/windows/src/developer/inst/copydev.in
+++ b/windows/src/developer/inst/copydev.in
@@ -23,7 +23,7 @@ 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_WIX_TEMP_MODELCOMPILER) kmlmc.wxs
+    $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dModelCompilerSourceDir=$(KEYMAN_MODELCOMPILER_ROOT) kmlmc.wxs
     
 heat-xml:
     # We copy the files to a temp folder in order to exclude thumbs.db, .vs, etc from harvesting
diff --git a/windows/src/developer/inst/kmdev.wxs b/windows/src/developer/inst/kmdev.wxs
index 7b32825163..5781ce7761 100644
--- a/windows/src/developer/inst/kmdev.wxs
+++ b/windows/src/developer/inst/kmdev.wxs
@@ -248,14 +248,14 @@
 
     <ComponentGroup Id="Node">
       <Component Directory="dirNode">
-        <File Name='node.exe' KeyPath="yes" Source="..\..\developer\inst\dist\node.exe" />
-        <File Name='CHANGELOG.md' Source="..\..\developer\inst\dist\CHANGELOG.md" />
-        <File Name='LICENSE' Source="..\..\developer\inst\dist\LICENSE" />
-        <File Name='README.md' Source="..\..\developer\inst\dist\README.md" />
+        <File Name='node.exe' KeyPath="yes" Source="..\..\..\..\developer\inst\dist\node.exe" />
+        <File Name='CHANGELOG.md' Source="..\..\..\..\developer\inst\dist\CHANGELOG.md" />
+        <File Name='LICENSE' Source="..\..\..\..\developer\inst\dist\LICENSE" />
+        <File Name='README.md' Source="..\..\..\..\developer\inst\dist\README.md" />
       </Component>
 
       <Component Directory="INSTALLDIR">
-        <File Name='kmlmc.cmd' KeyPath="yes" Source="..\..\developer\inst\kmlmc.cmd" />
+        <File Name='kmlmc.cmd' KeyPath="yes" Source="..\..\..\..\developer\inst\kmlmc.cmd" />
       </Component>
     </ComponentGroup>
 <!--
@@ -347,7 +347,7 @@
       <ComponentGroupRef Id="CEF" />
       <ComponentGroupRef Id="Templates" />
       <ComponentGroupRef Id="ModelCompiler" />
-      <ComponentRef Id="Node" />
+      <ComponentGroupRef Id="Node" />
       
       <MergeRef Id='keymanengine' />
     </Feature>