From 0b586aa14199f342151cd31c2eccd9af6ab411c5 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 3 Mar 2020 14:44:32 +0100 Subject: [PATCH] Upgrade to current MSIBuild Signed-off-by: Simon Rozman --- MSI/MSIBuild | 2 +- MSI/MSICA | 2 +- MSI/ZRCola/Main/Makefile | Bin 294352 -> 293064 bytes Makefile | 36 ++++++++++++++++++++++++------ MakefileLang.mak | Bin 7088 -> 6664 bytes MakefileLangPlat.mak | Bin 0 -> 3380 bytes MakefileLangPlatCfg.mak | Bin 7640 -> 5836 bytes MakefilePlat.mak | Bin 2058 -> 3730 bytes MakefilePlatCfg.mak | 34 +++++++++++----------------- Updater | 2 +- ZRCola/MSIBuild/Makefile | 14 ------------ include/MSIBuildCfg.mak | Bin 10320 -> 9548 bytes lib/libZRColaUI/MSIBuild/Makefile | 2 -- lib/wxExtend | 2 +- output/.gitignore | 15 ++++++------- 15 files changed, 53 insertions(+), 56 deletions(-) create mode 100644 MakefileLangPlat.mak diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 29009bb..e1a0146 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 29009bb892cd31686fa40fab56770f9467865c33 +Subproject commit e1a01465701da2f554e27a9eaccf7a2a5da0f23b diff --git a/MSI/MSICA b/MSI/MSICA index ad49c00..1e48c20 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit ad49c00a058ca601f9bc4a451bf78853c09f9b39 +Subproject commit 1e48c204063258c12615033e5bc66fc39c0d081a diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index d18f5e3398c3fc17287d0970322192309f1820c7..bc278ea3280f0de917c6563dc8ad0552e7fd253f 100644 GIT binary patch delta 311 zcmcccTkyn3!3|E_(@$8jXicy1Ve#4gft!T|%-tL&z{5Y?B7#M4x{ol6RP!VG_DAxJ zK+LrLkv#K51H;(N<{uZ!-I@=%EvqW%!6zEI` zGTF8-@?a@p20M5=(EVvpCeYe>FlGqL0p{&Me{?|vrt8JCgl(^iVF_Y_Xan-Q*da`* ebe1n*+o6V6DcK{2ydY|$0@RO-`x`7ajT(gyYyOlg65HoGJl4t(#jsnA!rfcxCsBE9b$CATL zrZLNbZek@<@ALx!EPUHD#93^}wH*{9Jlk(cv80gg2A~Nn+jA6H_HmHw3y=xZfhKI) z&ZWg7L8e2DxBKa{2yv3<2IJ{K%{<#@Sg_QPnJz82yVHCF=U&-7R?g2y(@wxh>5(YH{1?1p^Ked i&AXCVzL1$>Ew?|&VCf*k NUL reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL @@ -223,7 +246,6 @@ UnregisterShortcuts :: "$(OUTPUT_DIR)\ZRColaRu64.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.msi" \ "$(OUTPUT_DIR)\ZRColaSl64.msi" - -if exist $@ del /f /q $@ copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi" diff --git a/MakefileLang.mak b/MakefileLang.mak index f0c191bd2d56d64e4cc7aeb9ab634abfcd294cf3..029daad224c192a1ee9e853079f3bc8b4a9d96d4 100644 GIT binary patch delta 43 xcmdmB-eI!g1ncHItc!#u&ysjFd5fgUDM#&&BH8(81YEn$7jUNN?8!?x{({~{~e zrN!1pYMN@u>uGXUdy(~c4v~%0`Pf=$m)iSx)X?!O$bvs=o+rM~~ zS*qYcz@*_m%rJ?p!bx%Jn!28-i)y} zU{9V0CQlrt#Bov%@}3;n2d|sG)K<~n<5SiBk|%-56`$9TZ7{@wLr%$G@lU=skth*G z)n{5gX0?u7gHr|MBHjY40+x9{{*K+f)IU|4I2#dn3_2~(#q@zbaOxOFhqr;xg=C9ghg0fki%k9-&-1aXj#Wo}bZ1#!>}L`9s>_X#OuXV$-}3eiQ6!8p z9czOFyjx^!x8Yipl=&lOY lnXj}eXy`_*Qxn3a1P*=r_a(E7Iqqln^K7}_cKM%L{|TV5tu_Dv literal 0 HcmV?d00001 diff --git a/MakefileLangPlatCfg.mak b/MakefileLangPlatCfg.mak index a9eb0d3164f38e4f7dac05a80668452d945cc495..64000e952f3a299cbbf29ea5f06d555635424d2f 100644 GIT binary patch delta 236 zcmca%eMWb~308h*h8%`ehD3%u1_cHy2CL0i*(Nh{1_Omk7)lumCOdLWoqU0lWwITg z*=9fPB^;Ca_~RyLNNP=9ATGnJ$)Lxe!l1$6%;3i0KG{)5cybOu-{d@Q2}zJ>0D}*M kBSQ!Ss;X!yQ{1wf&r2yXVl~J|V-M4>9au18M9cfe4DcV~LP=!foL*ve-k8o~-!p9k(OWf`tO(wh_X6 ztYa0En5pmlJc+AavUZ|(@+5+2J;Jg5aKnW@Xe=^UjG4Fa4r@e}fS(ARI}6o+#*gmT zF#^ab2o+i->=RN2W$~x?R0Q0?YS?ww+Z7Obt2ninU-gHvRz5Eog;B8MCfxmLIq znMh{mFK&#v<~Uo%IkodB<0HN*EiwqOY!7r&6-pandiw zStIOMy7r2s-N>?qQzw*cC849ib8%`%DMh6-O0_ICOS7E^uvk(7 z22Fr$Hha#TIdk55=W^PgKj!U;J+^s^@@LJ?ZEROIvBXa8%rfMQ_LgVSUfOGWpO3ALb=f^bu;{w zZ?ZOFr#udR6)O$fu|uQ{G)At~#@ER9z|diofHJbCf2EPSy|!B#|JF(UoF1B;KTs7X zZGa$fa^M(BP9obt5^%S{nlKyL3#`SA!+v@G&GDuAdSq{qRlTX=lm&5CWoZFE#cGIx z>?)^8d4w>u=h4>dMv9mmlEg^5loR+XA zDT;rHVyI8xSRcrwm2_kN%g3L(^6BGmn( z8Z2(AC1N6tN8Zs@^;+q{du-o5de3aZwz05Ey{PWisV&t|1DQJ9+|0d}vVVlMxM!!o zb$D9BQgKQ|jFlBaH6nX-6JL-GW#?X|Mq@0-$dpgTjy+`33iUO#WfRUlN7e$@zxpJP zx9r3{SKnBvjB8*iynHx59l~|bS>GSH9rM zAv*fK_X$0%JY~GY&L%7C{Fc+5v`wG;ipRx&vZ4mpkeqV64Sjvi_m|d}*9?t}> diff --git a/MakefilePlatCfg.mak b/MakefilePlatCfg.mak index 06bf602..f6cb734 100644 --- a/MakefilePlatCfg.mak +++ b/MakefilePlatCfg.mak @@ -17,8 +17,6 @@ # along with ZRCola. If not, see . # -All :: - Clean :: msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT) !IF "$(PLAT)" == "Win32" @@ -26,10 +24,10 @@ Clean :: !ENDIF msbuild.exe $(MSBUILDFLAGS) "MSI\MSICA\MSICA.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT) msbuild.exe $(MSBUILDFLAGS) "Updater\Updater.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT) - -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" + -if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" + -if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" + -if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" + -if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" !IFDEF HAS_VERSION @@ -43,24 +41,18 @@ Clean :: # 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) - -"$(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 $@ +"$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" : \ +# "$(OUTPUT_DIR)\de_DE.$(PLAT).$(CFG).2.msi" \ + "$(OUTPUT_DIR)\en_US.$(PLAT).$(CFG).2.msi" \ + "$(OUTPUT_DIR)\ru_RU.$(PLAT).$(CFG).2.msi" \ + "$(OUTPUT_DIR)\sl_SI.$(PLAT).$(CFG).2.msi" -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 + cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\$(PLAT).$(CFG)" /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" +"$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" \ +"$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" \ +"$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" : "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" makecab.exe /F $** !ENDIF \ No newline at end of file diff --git a/Updater b/Updater index 8baf612..dc4cc1b 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 8baf612a6ca9eb6955912f208776929413bd5b79 +Subproject commit dc4cc1b22e46b376d273d420a50ea4d4c588ec3a diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 6f643f1..d43d1a7 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -40,7 +40,6 @@ MSIBUILD_IS_LOCALIZEABLE=1 All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Property Signature_ s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) @@ -59,7 +58,6 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp" "$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" - -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data s$(MSIBUILD_LENGTH_ID) v0 @@ -85,7 +83,6 @@ bintutorial3.bmp tutorial3.bmp All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Signature_ ComponentId Type s$(MSIBUILD_LENGTH_ID) s38 I2 @@ -100,7 +97,6 @@ clZRCola.exe.$(PLAT) {6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E} All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" "$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) @@ -118,7 +114,6 @@ compZRCola.mo.$(LANG) {4F59C403-D6DE-4B3F-$(MSIBUILD_LANG_GUID)-1190DB941EB3} ZR All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt" "en_US.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help s$(MSIBUILD_LENGTH_ID) s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L$(MSIBUILD_LENGTH_HELP) @@ -156,7 +151,6 @@ dlgTutorial3 ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Event Argument Condition Ordering s$(MSIBUILD_LENGTH_ID) s50 s50 s255 S255 I2 @@ -173,7 +167,6 @@ dlgTutorial3 ctlContinue EndDialog Return 1 1000 All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt" "$(LANG).$(PLAT).$(CFG).Dialog-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel s$(MSIBUILD_LENGTH_ID) i2 i2 i2 i2 I4 L128 s50 S50 S50 @@ -190,7 +183,6 @@ dlgTutorial3 50 50 400 300 3 [Setup] [SimpleProductName] [DisplayVersion] ctlTit All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence s$(MSIBUILD_LENGTH_ID) S255 I2 @@ -207,7 +199,6 @@ dlgTutorial3 NOT Installed AND &featZRCola>=3 1402 All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" "en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Feature Feature_Parent Title Description Display Level Directory_ Attributes s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_ID) i2 @@ -230,7 +221,6 @@ featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Feature_ Component_ s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) @@ -258,7 +248,6 @@ featZRCola compwxstd.mo.$(LANG) All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" "$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 @@ -278,7 +267,6 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico" "$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1" - -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data s$(MSIBUILD_LENGTH_ID) v0 @@ -296,7 +284,6 @@ iconZRCola.ico ZRCola.ico All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL FileKey Component_ FileName DirProperty InstallMode s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) L255 s$(MSIBUILD_LENGTH_ID) i2 @@ -311,7 +298,6 @@ rmfiZRCola compZRCola.exe.$(PLAT) ZRColaShortcutDir 2 All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S255 L255 I2 S$(MSIBUILD_LENGTH_ID) I2 I2 S$(MSIBUILD_LENGTH_ID) diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index f456154903df7fc351456e9282fd078520bade1f..7a601fbecb08e9220dce8b55872122e59b3b3af4 100644 GIT binary patch delta 12 TcmcZ*aK>xHE1u2o_>&|6EIbAW delta 366 zcmX@(bs=EGD<0Pnh75*O1_g#BhD3&9Fe?wp$_2CX8Pb3Q z@C3@HF=R62Ox`Fg%NxSr$PmQf&fv-r!eBc&P)>aE7B&fCO$I#%6$T9kAE2xsP!`Ca z>?q}qsoES_zb1njg9!sK0~doL&^#ZYU9MnW0N5O$`3&Jed-E8K8H^?ia)@J^CWvYp zNS(fn=;Uqee6r3AZeVvP0bOqkgbEBw3@$+bCINkxKKUZIB&KO-ZgaunGKi_Rzz|4f S$N^$-XaeorxcL=Nk^}$>3_zIx diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile index 26aa6b4..9e06233 100644 --- a/lib/libZRColaUI/MSIBuild/Makefile +++ b/lib/libZRColaUI/MSIBuild/Makefile @@ -34,7 +34,6 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" "$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) @@ -51,7 +50,6 @@ complibZRColaUI.mo.$(LANG) {1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EF All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" "$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 diff --git a/lib/wxExtend b/lib/wxExtend index f3e2085..d5593ed 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit f3e208572f8c3aa16d7a220f8b3671c6c4fa8e8c +Subproject commit d5593edd0066cdad15f48370360595ff505bfbbb diff --git a/output/.gitignore b/output/.gitignore index 0bf083b..42c3fd5 100644 --- a/output/.gitignore +++ b/output/.gitignore @@ -5,11 +5,10 @@ /Win32.Release /x64.Debug /x64.Release -/PackageGUID.mak -/ZRCola*.cab -/ZRCola*.ddf -/ZRCola*.dep -/ZRCola*.inf -/ZRCola*.msi -/ZRCola*.out -/ZRCola*.rpt +/*.cab +/*.ddf +/*.dep +/*.inf +/*.msi +/*.out +/*.rpt