From 9f0c831fb5b57dd4fb2ce75efe7f57ebbccef7d4 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sat, 8 Sep 2018 01:21:52 +0200 Subject: [PATCH] Split Makefile into multiple reusable .mak files --- MSILocal.mak | Bin 14108 -> 0 bytes Makefile | 240 ++++++---------------------------------- MakefileLang.mak | Bin 0 -> 7140 bytes MakefileLangPlatCfg.mak | Bin 0 -> 7664 bytes MakefilePlat.mak | Bin 0 -> 2058 bytes MakefilePlatCfg.mak | 66 +++++++++++ 6 files changed, 99 insertions(+), 207 deletions(-) delete mode 100644 MSILocal.mak create mode 100644 MakefileLang.mak create mode 100644 MakefileLangPlatCfg.mak create mode 100644 MakefilePlat.mak create mode 100644 MakefilePlatCfg.mak diff --git a/MSILocal.mak b/MSILocal.mak deleted file mode 100644 index 98ea55e98840147408ae5e9271aef1630d3854c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14108 zcmeHOZBOGy5T378>VNRTeSoSY2d%CxEvIsUaOikb5{j-uiUI_PE(A(Kf&Tcm&oh(7 z-Z%jg+nkY3RcSgRIZ)8S-{#B9-xs*G(l9rsxne@=UAiv;Rka<~@ zH@N?dwiP*-rW~SIw-3RGQ^Qz(3*-d%Hu?tr_e*I2I^ka6TOfZ*ML264?S-MRqCFgx z6ToOH)ULwm$&JEo$`WASq3s&?BeZpJXWwI;zo(QP;%l#u6ER`0V<}?P72eKqXYUih z@u_Ml-q+f@seOB(le7`q6-JU`qsx6+mu=ZY>pFULv{wVP2C@qr4)N3imVs>Qojtk= zuc44G@B4Iho@4YpjA7+wDgy)KNmX$Oc@jt&ErxdkxVG@tk?#SmiDw&6%KujUy8Z8g z{D3x}8Xr$WAkTa*&4Qogs!4%xsZ(y&IlPnKceqpL#<{_{pRNhR2$`Ou$hMcxCaO~s3t zm?oF?eH(qNxTpm?7)5-kf5f$h9wkt*sc&rEL+dX3RWYi7egU3LtBjXE9+PSJNgqF2 z8g(`R-A!<(p|a?X@B^QehXLec+-xhiC{60ES@{v3TKY~-Ht;*bD0;L(O`ZgEpLW_Y z?dTM+os8@&pE)`6xJ(Eke0Mb!&ZWuBpn zmUkY1h|?>~QU=Uvc`dV$UIp?i^`%aU*HyYDXe{-14c}@i=QWwbm_U|sarBC8$*R1S zAMs4M25B7-_@$0HsAJToI()+-MwNj50s375-&6c;K$od!=JV+dXXO?V<1J<~OxFN` zx|I%m2Xh;ElLvfX1@u4g+s5AoM6BfqS4Pt^2RgQZ_mR@#qDlZ5jAPfJj9$A6iCt@S zxWF5s7w|g(A1**S^|>QI;eA7~I8eQ&c6OkX1=YoK#gTaOw*shyyM)WNmC(|}eDo2n zeF|f#(bK@O3g`!3+%#!TDVewyGr)Ke@qzJc7g-P2HWm^1Wgfp8TA33K zu0L!A`59v`kR92IjIniR+~Ph zzGq}EnVeD|W}1`^kNX?2dfGR$@3!W*@hqSKA8?BwGl0iw40F{2d}lOA^)rs~W}b`_ z9F-sM5Y__UBQNF(j0zCqqwDZfd}F=DY1i_AH*zC(F$;TH&FmbjZL6mw zrNz||>|R1FW&MM-1wKcq%Reo9;O((;iB}Y0#3b?v5{)H1v0PwvtrpdGNYv zNIYBZeVVsQgN|%9cRV^C*V=4WtkJzCu0)b&#Cw{{wgD@eSv*hnI35>62_;$c=b3{c zg%3qE?#q&Mk8{uWVA0)}ht|@B`@B1st~!*)Zsp^<92Dz5CmPI|<=>26@2M_vdfV69m z*eZagzDPDku}U*(LErZ9I)^7{M=!Q_pa)>0iHJHo{{UF zwjAU0ZeXXUtkjXWPdV){DA_nn<2gAt9!w|eVf?YvUaP2{@qAbvSo74^+CAoREJlss zsWNKQc%FW=4bpQ(tL5ogVcaK9W<`XP)Dj89$>*yrK71Z%_tnKk NUL - -"$(OUTPUT_DIR)\ZRCola32D.ddf" : \ -# "$(OUTPUT_DIR)\ZRCola.de_DE.32D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.en_US.32D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.ru_RU.32D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.sl_SI.32D.2.msi" - -if exist $@ del /f /q $@ - -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola32D" /C:LZX - move /y "$(@:"=).tmp" $@ > NUL - -"$(OUTPUT_DIR)\ZRCola64.ddf" : \ -# "$(OUTPUT_DIR)\ZRCola.de_DE.64.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.en_US.64.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.ru_RU.64.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.sl_SI.64.2.msi" - -if exist $@ del /f /q $@ - -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64" /C:LZX - move /y "$(@:"=).tmp" $@ > NUL - -"$(OUTPUT_DIR)\ZRCola64D.ddf" : \ -# "$(OUTPUT_DIR)\ZRCola.de_DE.64D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.en_US.64D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.ru_RU.64D.2.msi" \ - "$(OUTPUT_DIR)\ZRCola.sl_SI.64D.2.msi" - -if exist $@ del /f /q $@ - -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64D" /C:LZX - move /y "$(@:"=).tmp" $@ > NUL - -"$(OUTPUT_DIR)\ZRCola32.cab" \ -"$(OUTPUT_DIR)\ZRCola32.inf" \ -"$(OUTPUT_DIR)\ZRCola32.rpt" : "$(OUTPUT_DIR)\ZRCola32.ddf" - makecab.exe /F $** - -"$(OUTPUT_DIR)\ZRCola32D.cab" \ -"$(OUTPUT_DIR)\ZRCola32D.inf" \ -"$(OUTPUT_DIR)\ZRCola32D.rpt" : "$(OUTPUT_DIR)\ZRCola32D.ddf" - makecab.exe /F $** - -"$(OUTPUT_DIR)\ZRCola64.cab" \ -"$(OUTPUT_DIR)\ZRCola64.inf" \ -"$(OUTPUT_DIR)\ZRCola64.rpt" : "$(OUTPUT_DIR)\ZRCola64.ddf" - makecab.exe /F $** - -"$(OUTPUT_DIR)\ZRCola64D.cab" \ -"$(OUTPUT_DIR)\ZRCola64D.inf" \ -"$(OUTPUT_DIR)\ZRCola64D.rpt" : "$(OUTPUT_DIR)\ZRCola64D.ddf" - makecab.exe /F $** - "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml" if exist $@ del /f /q $@ "$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" $** $@ @@ -432,19 +236,41 @@ Localization :: \ !ENDIF +###################################################################### +# Platform Specific +###################################################################### + +PLAT=Win32 +PLAT_SUFFIX=32 +PLAT_SLN=x86 +!INCLUDE "MakefilePlat.mak" + +PLAT=x64 +PLAT_SUFFIX=64 +PLAT_SLN=x64 +!INCLUDE "MakefilePlat.mak" + + +###################################################################### +# Language Specific +###################################################################### #LANG=de_DE -#LANG_OUT=De -#!INCLUDE "MSILocal.mak" +#LANG_BASE=de +#LANG_SUFFIX=De +#!INCLUDE "MakefileLang.mak" LANG=en_US -LANG_OUT=En -!INCLUDE "MSILocal.mak" +LANG_BASE=en +LANG_SUFFIX=En +!INCLUDE "MakefileLang.mak" LANG=ru_RU -LANG_OUT=Ru -!INCLUDE "MSILocal.mak" +LANG_BASE=ru +LANG_SUFFIX=Ru +!INCLUDE "MakefileLang.mak" LANG=sl_SI -LANG_OUT=Sl -!INCLUDE "MSILocal.mak" +LANG_BASE=sl +LANG_SUFFIX=Sl +!INCLUDE "MakefileLang.mak" diff --git a/MakefileLang.mak b/MakefileLang.mak new file mode 100644 index 0000000000000000000000000000000000000000..1cfea06f955ab9479e11dd211116391ddaf52318 GIT binary patch literal 7140 zcmd^^Yfl?T6o$`ND)m2XfDcd=yP;LprX?!(L^1|pQ<4e^*~U0luyL>{&>!FSdC%rY`0LLF`_jI!1xwOr(=M%NcXnlMYuP&+F#p_ssZt3K=o4$c|2A2YAvyI-WR|o>9}V#unX@cYl;14hbF2Q%ooPu%0fge=iq2M z*1qEz*p1_D+6!>rF?Y?o!CaTOV9%WXz$L4*I!JjECxSY&BD<~_b$AQ<96Wic+Rpd2 zLpL3EfSi&|*sj(?2Un5O4jcrXRGf#QP7>Q;Ch%Q@*EXZBeGRrI-(kNb|K0iPr|XG*%UoWXJfFfK zo#nN(gg&L!U6QQ$S%P?@0^EVsdp)V!J0Qf zUbsc-uK8=Xz&YBwKtp-Sg5M-|Y_F|quWTR7R-v+vjo;hF(>@uLi(3h zny%$6Z*Bah2eme9;yifrm1}9>dXf$Dob1`Q$IYvh*1B!LQ_1-fC&80$!Xq!( zXP5Yu|B2Ts5SvI*@{wkbm^}cl!ma{v317jhf-duXOy=F^DSwJI`D}vRO|(;UTl7DY z2j0346YLYTdEwfUHRZP<${T#OeJoAZ_%+z2j5g}YlW?AwU2&{9YJodic{HCT=vP^; z3*^8fPVp^ne@2P{PmhdM`An-f z;1QNHc#<{e!IytzS@BkMx<&gib&8U9`jTa<&WinkH5y1+&&WA#$sVE@E&B}H>|mj7 z{w8Fhbt3fCe)Wt{VQnAlMA!vt`>Z_TX#tK`@nuEl0TG}&*SybdE6i4zReX%rqR>se z_ei?ouWHX39yiSK$|Ul|SUYA#?$Bce>1T^4S)+6x-)+2n*d5FwzvAg*{Dv%-kdp*8 z_k^sb9QJf9<8$LQ@IE$A%%TP5aq2}?yF&-v@D5=1{ciFqDSrxec`mKKp&Q6o;YIre zxQ=H=eam|KJ(cdK)c5&&s@9OXgBp!8{U^!sMOiMDjUVGy}MKYt3FQM zSnRP*sqIHZj5_%@bX*0Z=9XXZsfTQPjK6g`#jUdMkX@l8RK-2Xox3NYFB#`D-F4A> z>_z*ECqV{z^Gkj@{g!6luQuqp0+wBau?m0se(C=iyp-T#8_Mc*pTgNGQK&w7+hgb{JdVSZ z=Qc#f!*yW5Zf63%if?9#1*?uiDB;$7QX8h?UN zPSIUnm)$x=4s4A(ys%qidA#mpbT`%KS#x-uOv9~Rh-mSp-{jROpK->Ys2=BylX-tO z-{z^0^M=nuBU(3jwMH>Q9!KxrW%%#=&*!XH*;^3BlkW0D#*Z~sRcp!i$PydWEZwGU zk#|&ycbU_@<$SJc9uXtLp!=#m?=I`Q=NQoK4eNq+Eqqt%%oJ( z^nrUv70V1gH#?v2-qySm8(l9^RYxtmiQnxqoA24QGpvl_)r#tOne`IBtGgk2>mL5| z9!h1ri(Z2xz{*mDT literal 0 HcmV?d00001 diff --git a/MakefileLangPlatCfg.mak b/MakefileLangPlatCfg.mak new file mode 100644 index 0000000000000000000000000000000000000000..b5ca20778d76f83bd96b7b585f11743745654349 GIT binary patch literal 7664 zcmds+ZBH9V5Xa{&mHHhnkQYf+?1sK+X%p2L45$uR#xzZZglw?Eig6rlO6iAh`}@y& zIiKye)Dq66I+?rOot>TMnH~Q8W6eId&uq<-@l&?Vc+t+uyxz8 zuXumMT*h54fbj+u@3JZu*rBluqN1r_dRQg{bF^~sXgWkb8$^VL@XU} zv>ofv@r>-&@wROfoOjIK@IGU%&s(tPe*VZgYq2^S(;gwCrQ=c=Iyzh8R=RtDQXFuE$=IK>(>T-tk67+NFGz3juj_C{9 zyalr78fm%YZ(IW%q}4-0S}J4eUDiZ-u;go((#Yi`9b_qaZ9DEad*ic8wgpX9r%RLsORo6%0N5iQ zS-~N@M6c{mv^Ib!!$s9cnmuN=2HX+53cw|N1*;0O%+j%#b$7<}$LTvqKhTHUvkO!Qs#eJl3Vp0QrCAF%*=YtcE-o~FG6XN>5pzBUP6 zaXZ=txAsj^Ap1HX2EKIcaU`gk?`e!z;wbE|-0vu3ySrc&XDJtxXK%w#9f-)qI(8t* zx9vB+hDcg`Ye(=}S$e}xE$++8LU57FQ}{XNe0kH)oS?Nx=e)H*>-0*&vqKjeg0)Lu zL9#{rkQ>^f^*n*s3bNVZZ$hLiA%j!4@FHJ?nBg>C`LuY>qvgp{(p!P59Qn+}|IACW9M;D5-#mX&hTb9z?~`%% z$UdrA%Ty&LDuJDe%q_pndfG#GE;Hx25Dw;y|m`B@EuE|GjD>-mDzEfU5HO`Ka`?;K zeMppEGCOhRx9)cy^((`=yhXLtEcB80H}yX?-H{^n$FC4( zDcvV$Ra_p@#&Ya!mI`IIt));AEpVRJYHlCf{sq-=$^`%b literal 0 HcmV?d00001 diff --git a/MakefilePlat.mak b/MakefilePlat.mak new file mode 100644 index 0000000000000000000000000000000000000000..28d9c584d08507684923aa342a8a7e69f98d3846 GIT binary patch literal 2058 zcmd6o?N1Xy5XR@TiT}e&zi6UG^o#Ea77He&5ZVUui|Na?Tr8#OT_OGF)!#FFCtN{e zh#$!2vb!_0GtWFTyZ7@)%^unVt63;U!_IAPD_dA<6FapW`IfzAY}qq=Vb7UgA=|by zOKgBuR(PoT>2g-OU}NSfwxQV1t&ey4Jx3Sps~wr5PLbDd^>y8%^fJar;$AcNliQ{H zP3#RmSICykLu4~%*^WGZ?wJkH<^?7pk=4jHIkjMS#w_bGeyUlej(h3WiQDGnsodmk z!AWHt^C~sF*0vtfT`Xp9)hE|rhhP}6NJ#?jd&R7pN9NXJ|9dCgR#)+q5<_)~^*MD6u~Mf6zF5smET>+Pfiu7K3XEZE3PaV* zV&4Qiw$IkJJv*SXU7~DL;}hm%R!0o&yGY(5lYgNQ|6(O^mak(=>6Bmcehck8vd9^8UaU>VrH?w^ zW^_s&`vvPw?+axWUxp0HhYCLtQ;j$LevFbMz3DS@*MDS5E?4i4I%-ZvLv+#)i{8E; z_=Q3_=xcCecI`bkBB2fmIjDM9nr~#%!$$Y)3wF{xV%_Fs3(XF9DA. +# + +All :: + +Clean :: + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT_SLN) +!IF "$(PLAT)" == "Win32" + msbuild.exe $(MSBUILDFLAGS) "ZRColaUtils.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT_SLN) +!ENDIF + msbuild.exe $(MSBUILDFLAGS) "MSI\MSICA\MSICA.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT_SLN) + msbuild.exe $(MSBUILDFLAGS) "Updater\Updater.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT_SLN) + -if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" + -if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" + -if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" + -if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" + + +!IFDEF HAS_VERSION + +###################################################################### +# 2nd Phase +# - The version is known, do the rest. +###################################################################### + +###################################################################### +# Building +###################################################################### + +"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" :: Localization + +"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" :: + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=$(CFG) /p:Platform=$(PLAT_SLN) + +"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" : \ +# "$(OUTPUT_DIR)\ZRCola.de_DE.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \ + "$(OUTPUT_DIR)\ZRCola.en_US.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \ + "$(OUTPUT_DIR)\ZRCola.ru_RU.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \ + "$(OUTPUT_DIR)\ZRCola.sl_SI.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" + -if exist $@ del /f /q $@ + -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" + cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX)" /C:LZX + move /y "$(@:"=).tmp" $@ > NUL + +"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" \ +"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" \ +"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" : "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" + makecab.exe /F $** + +!ENDIF \ No newline at end of file