From b5ba1290f9b75fa0935bb593cd455211b7e688a1 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Oct 2016 13:28:09 +0200
Subject: [PATCH] Setup sub-folder abolished and final MSI output CAB embedding
 and signing re-established

---
 MSILocal.mak            | Bin 12398 -> 12410 bytes
 Makefile                |  70 +++++++++++++++++++---------------------
 output/Setup/.gitignore |   1 -
 3 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 output/Setup/.gitignore

diff --git a/MSILocal.mak b/MSILocal.mak
index baa8061f918180a73a0a9e152bb6162325cd04ef..be8e4f9ac3f7786a016372bd8ad3b4eb2d92f43f 100644
GIT binary patch
delta 1675
zcmd6nO-lk{5XVQ{7F}0cSCGn!?-+_@7)Ye}R%z&Fz8vb}R)-1+s-u_u49&Ge=T3sq
zxepM1f`|^CqjQ%Ub$tmp^dz$E!ZZ7ydH(a;XXjJ?mYW|sEO>Zq8m#y(Ft-AaPJQ@q
zh{HM;848KWace_sVd(u5KAU;`;(8_8YYt^YFaJ=<^R_ZPtHno)fKT)F!S=M5B}bu6
zToq#!?&Y(shUL{f&<QB{GWg;t;I%)Df|s2;fg?D^gv*6zD+|UHBp?YvxS(hauUrmW
z9!ij<ScRTBNJABhut!%JqWI&r9XP=bqna|+DZ&nHk*=z|kAfTGs_GKetB^iL`o0=N
zo)q5OO^c(|vmn7X?H}^^sRxry%|W-5o`yZ`^a<*23!R?Q<RR7ZE0Oy=d5MzV4L+6r
z{>xa#kZoPTZ6(%s3TH;2CaSZ{I)P2AIF>boZ$5qk-b}6E@6?!g|Dm|Z5cf37{xY%O
znBnuS3G9#IeHmo%!OxB5O}caCbWM%64|i#jG>CTGEn+N~B-)V~KjoT0qV0ApbzuVH
bx|=CY6#Ak@;5xU1W|BlRI7`#dsHNa9cuGYi

delta 1414
zcmeyB@GfD)6AsQ`hE#?UhEj%t$qzX)QFz9at2ixCL^LPcaq&!k!fApb>VhJoI+=@`
zZ?Xud8HT7Enuvt1(Bx;FMyR5jZ*Yq-Pc9IVKoK^bq{TM*5`WO-Iwg_Ge*9XK4TL2a
zjVDj!cgIi)ai<5r0Z@(D<ODSq9O}UCWL98^nS7Ri>f{7nF=jmm>?W#Cme3Ug+nS&&
z1vV{wvWcqL<U7(vo23N(1fh;;R9ZQC4Tlu73WLMsMs9I1-7hFUc?u`UxoVC|3@Qv7
z3=Rxd3`z{P44Mpjz@X1%C;;*l80>)9k0F%7hk=)Yi-D6NnV}enix@J2@+Cl(sSFhi
zsgniO<->g$f*Cx4BIQ68X<)tj4EhXS4EYR6K$9U6>dfHC-~==gB;yB^$pPYYAXWgX
z$Ki&_6FGG!$0@T-{-eU74{<{-P)8ZiW{^3Rc=aw6P@KF#%nledjY^TgAP>P44xlIz
z8UkUlL`{IKa3~P50w<(KrO?R+A|jKt9B>8(FwIT=peZl}0wY0(%{-GK51io0NgM?t
kki-ED5-G7sT4s~?>GI$S7L6egBp>uSC<qei$yo*h07qIIV*mgE

diff --git a/Makefile b/Makefile
index 7d2c861..b336c1a 100644
--- a/Makefile
+++ b/Makefile
@@ -117,26 +117,24 @@ All :: \
 	Setup
 
 Setup :: \
-	"$(OUTPUT_DIR)\Setup" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
+#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl64.msi"
 
 SetupDebug :: \
-	"$(OUTPUT_DIR)\Setup" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+#	"$(OUTPUT_DIR)\ZRColaDe32D.msi" \
+#	"$(OUTPUT_DIR)\ZRColaDe64D.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn32D.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn64D.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu32D.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu64D.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl32D.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl64D.msi"
 
 
 ######################################################################
@@ -249,15 +247,13 @@ Localization :: \
 "$(OUTPUT_DIR)\locale\de_DE" \
 "$(OUTPUT_DIR)\locale\ru_RU" \
 "$(OUTPUT_DIR)\locale\sl_SI" \
-"$(OUTPUT_DIR)\Setup" \
 "$(PUBLISH_DIR)" \
 "$(PUBLISH_PACKAGE_DIR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
 	if not exist $@ md $@
 
 "$(OUTPUT_DIR)\Keys" \
-"$(OUTPUT_DIR)\locale" \
-"$(OUTPUT_DIR)\Setup" : "$(OUTPUT_DIR)"
+"$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)"
 
 "$(OUTPUT_DIR)\locale\de_DE" \
 "$(OUTPUT_DIR)\locale\ru_RU" \
@@ -430,25 +426,25 @@ Localization :: \
 	output\$(PLAT).Release\UpdSignXML.exe $** $@
 
 "$(OUTPUT_DIR)\catalog.xml" : \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
+#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl64.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaDe32.msi"
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaDe64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaRu32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaRu64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
 	move /y "$(@:"=).tmp" $@ > NUL
 
 !ENDIF
diff --git a/output/Setup/.gitignore b/output/Setup/.gitignore
deleted file mode 100644
index bb6e4ad..0000000
--- a/output/Setup/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ZRCola*.msi