erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-14 18:07:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #2407 from keymanapp/fix/ci/npm-prod-mismatch-ps1-files

Browse source 
fix(developer): ci alternate installer path
This commit is contained in:
Marc Durdin 2019-12-04 04:17:51 +00:00 • committed by GitHub
commit cf7dcf6706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
windows/src/developer/inst/Makefile
View file

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

6
windows/src/developer/inst/copydev.in
View file

@ -33,7 +33,9 @@ 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
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 +105,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)