From 89a33bc0ea66e89e3e8f68d00bc2662e9ab759d0 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 19 Nov 2020 12:30:25 +0100 Subject: [PATCH] Publish MSIs to and _latest folders on the download server Signed-off-by: Simon Rozman --- Makefile | 12 +++++------- MakefileLangPlatCfg.mak | Bin 5836 -> 6340 bytes 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b4ace5e..b259ef9 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ Publish :: !INCLUDE "MSI\MSIBuild\Version\Version.mak" !INCLUDE "include\MSIBuildCfg.mak" -PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR) PUBLISH_PACKAGE_URL=http://prenos.amebis.si/ZRCola/$(MSIBUILD_VERSION_STR) ###################################################################### @@ -111,12 +110,9 @@ SetupDebug :: \ # Publishing ###################################################################### -PublishPre :: \ - "$(PUBLISH_PACKAGE_DIR)" \ - "$(PUBLISH_DIR)" - Publish :: \ PublishPre \ + "$(PUBLISH_DIR)" \ "$(PUBLISH_DIR)\catalog-0001.xml" @@ -197,14 +193,16 @@ UnregisterShortcuts :: "$(OUTPUT_DIR)\Keys" \ "$(OUTPUT_DIR)\locale" \ "$(PUBLISH_DIR)" \ -"$(PUBLISH_PACKAGE_DIR)" \ +"$(PUBLISH_DIR)\_latest" \ +"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" \ "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" : if not exist $@ md $@ "$(OUTPUT_DIR)\Keys" \ "$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)" -"$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)" +"$(PUBLISH_DIR)\_latest" \ +"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" : "$(PUBLISH_DIR)" ###################################################################### diff --git a/MakefileLangPlatCfg.mak b/MakefileLangPlatCfg.mak index 64000e952f3a299cbbf29ea5f06d555635424d2f..fe1a9dc2851cef251ae4b909c77d763d82239ece 100644 GIT binary patch delta 225 zcmX@3d&F?VBHqb$d|Z>8#Ka`S7+e{G7=jr*8T=Xi7~+Af5FlTZL1}U$uOdv9Fcwvl z8~KDM#|gxU@-lESfN%gqDMJ!N4nrnGF+;{=dv5W`d3;j*@j#J8h7yKUplAugR9+PE i$^HVln-lnMFoG<^l$xBt$2M6>K#Y)cHpdC%u>kG25%tg&fv-r&)~w~$q>Y#Ir$@>GB1kU<{9