[Developer] Continue integration

This commit is contained in:
Marc Durdin 2019-08-21 12:07:42 +10:00
parent 5779fd931d
commit 19decd4b8d
3 changed files with 8 additions and 8 deletions

View file

@ -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:

View file

@ -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

View file

@ -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>