From b4ffbd452fb6a9238c68d2bf455a02201eb3d178 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Mar 2014 11:20:15 +0000 Subject: [PATCH] Osamosvajanje projekta MSIBuild ... --- .gitattributes | 12 +- .gitignore | 27 ++ CAB.mak | 48 +-- {Jedro => Core}/Makefile | 257 ++++++------ MSI.js | 222 +--------- MSI.wsf | 396 ++++-------------- MSM.mak | 62 +-- Makefile | 151 ++++--- UI/Binary/{UIMapaNova.ico => UIFolderNew.ico} | Bin UI/Binary/{UIMapaGor.ico => UIFolderUp.ico} | Bin UI/Binary/{UIObvestilo.ico => UIInfo.ico} | Bin UI/Binary/{UIOpozorilo.ico => UIWarning.ico} | Bin UI/Makefile | 154 +++---- Version/Makefile | 99 +++++ Verzija/Makefile | 99 ----- 15 files changed, 566 insertions(+), 961 deletions(-) create mode 100644 .gitignore rename {Jedro => Core}/Makefile (90%) rename UI/Binary/{UIMapaNova.ico => UIFolderNew.ico} (100%) rename UI/Binary/{UIMapaGor.ico => UIFolderUp.ico} (100%) rename UI/Binary/{UIObvestilo.ico => UIInfo.ico} (100%) rename UI/Binary/{UIOpozorilo.ico => UIWarning.ico} (100%) create mode 100644 Version/Makefile delete mode 100644 Verzija/Makefile diff --git a/.gitattributes b/.gitattributes index 1875b53..e4c08aa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,14 @@ * text=auto !eol /CAB.mak -text +Core/Makefile -text /Empty.msi -text -Jedro/Makefile -text /MSI.js -text svneol=unset#text/javascript /MSI.wsf -text svneol=unset#text/xml /MSM.mak -text /Makefile -text -UI/Binary/UIMapaGor.ico -text svneol=unset#image/x-icon -UI/Binary/UIMapaNova.ico -text svneol=unset#image/x-icon -UI/Binary/UIObvestilo.ico -text svneol=unset#image/x-icon -UI/Binary/UIOpozorilo.ico -text svneol=unset#image/x-icon +UI/Binary/UIFolderNew.ico -text svneol=unset#image/x-icon +UI/Binary/UIFolderUp.ico -text svneol=unset#image/x-icon +UI/Binary/UIInfo.ico -text svneol=unset#image/x-icon +UI/Binary/UIWarning.ico -text svneol=unset#image/x-icon UI/Makefile -text -Verzija/Makefile -text +Version/Makefile -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..863b587 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +Core/*-1.idt +Core/*-2.idt +Core/*-2.idtx +Core/*.Binary-1 +Core/*.Binary-2 +Core/*.Icon-1 +Core/*.Icon-2 +Core/*.lst +Core/*.msm +UI/*-1.idt +UI/*-2.idt +UI/*-2.idtx +UI/*.Binary-1 +UI/*.Binary-2 +UI/*.Icon-1 +UI/*.Icon-2 +UI/*.lst +UI/*.msm +Version/*-1.idt +Version/*-2.idt +Version/*-2.idtx +Version/*.Binary-1 +Version/*.Binary-2 +Version/*.Icon-1 +Version/*.Icon-2 +Version/*.lst +Version/*.msm diff --git a/CAB.mak b/CAB.mak index b989f11..31202a2 100644 --- a/CAB.mak +++ b/CAB.mak @@ -1,46 +1,46 @@ -!IFNDEF MSI_CILJNI_PAKET -!ERROR Spremenljivka MSI_CILJNI_PAKET ni definirana! +!IFNDEF MSIBUILD_ROOT +!ERROR Parameter MSIBUILD_ROOT is undefined. !ENDIF -!IFNDEF MSI_IZVORNI_PAKET -!ERROR Spremenljivka MSI_IZVORNI_PAKET ni definirana! +!IFNDEF MSIBUILD_TARGET_MSI +!ERROR Parameter MSIBUILD_TARGET_MSI is undefined. !ENDIF -!IFNDEF MSI_DATOTEKA_INF -!ERROR Spremenljivka MSI_DATOTEKA_INF ni definirana! +!IFNDEF MSIBUILD_SOURCE_MSI +!ERROR Parameter MSIBUILD_SOURCE_MSI is undefined. !ENDIF -!IFDEF MSI_DATOTEKA_CAB -MSI_NASTAVI_CAB_STIKALA=/V +!IFNDEF MSIBUILD_INF +!ERROR Parameter MSIBUILD_INF is undefined. +!ENDIF + +!IFDEF MSIBUILD_CAB +MSIBUILD_SETCAB_SWITCH=/V !ELSE -MSI_NASTAVI_CAB_STIKALA= +MSIBUILD_SETCAB_SWITCH= !ENDIF !IFNDEF MSIBUILD_VENDOR_URL -!ERROR Spremenljivka MSIBUILD_VENDOR_URL ni definirana! +!ERROR Parameter MSIBUILD_VENDOR_URL is undefined. !ENDIF !IFNDEF MSIBUILD_PRODUCT_NAME -!ERROR Spremenljivka MSIBUILD_PRODUCT_NAME ni definirana! -!ENDIF - -!IFNDEF IMENIK_ASKUPNO -IMENIK_ASKUPNO=C:\Inetpub\spletne-skripte\ASkupno +!ERROR Parameter MSIBUILD_PRODUCT_NAME is undefined. !ENDIF -Vse : \ - "$(MSI_CILJNI_PAKET)" +All : \ + "$(MSIBUILD_TARGET_MSI)" -"$(MSI_CILJNI_PAKET)" : \ - "$(MSI_IZVORNI_PAKET)" \ -!IFDEF MSI_DATOTEKA_CAB - "$(MSI_DATOTEKA_CAB)" \ +"$(MSIBUILD_TARGET_MSI)" : \ + "$(MSIBUILD_SOURCE_MSI)" \ +!IFDEF MSIBUILD_CAB + "$(MSIBUILD_CAB)" \ !ENDIF - "$(MSI_DATOTEKA_INF)" + "$(MSIBUILD_INF)" -if exist $@ del /f /q $@ - copy /y "$(MSI_IZVORNI_PAKET)" "$(@:"=).tmp" > NUL - cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NastaviCAB //Nologo "$(@:"=).tmp" "$(MSI_DATOTEKA_INF)" $(MSI_NASTAVI_CAB_STIKALA) + copy /y "$(MSIBUILD_SOURCE_MSI)" "$(@:"=).tmp" > NUL + cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:SetCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_INF)" $(MSIBUILD_SETCAB_SWITCH) msiinfo.exe "$(@:"=).tmp" /nologo /U 4 !IFDEF MANIFESTCERTIFICATETHUMBPRINT signcode.exe -i "$(MSIBUILD_VENDOR_URL)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSIBUILD_PRODUCT_NAME)" "$(@:"=).tmp" > NUL diff --git a/Jedro/Makefile b/Core/Makefile similarity index 90% rename from Jedro/Makefile rename to Core/Makefile index b727437..60e1beb 100644 --- a/Jedro/Makefile +++ b/Core/Makefile @@ -1,17 +1,17 @@ -!INCLUDE "..\..\..\include\MSIBuildCfg.mak" -!IFDEF MSM_IMA_VERZIJO -!INCLUDE "..\Verzija\Verzija.mak" +!INCLUDE "..\..\include\MSIBuildCfg.mak" +!IFDEF MSIBUILD_HAS_VERSION +!INCLUDE "..\Version\Version.mak" !ENDIF MSIBUILD_IS_LOCALIZEABLE=1 -MSI_POLNO_IME_IZDELKA=$(MSIBUILD_PRODUCT_NAME) $(MSI_VERZIJA_STR) +MSIBUILD_PRODUCT_NAME_FULL=$(MSIBUILD_PRODUCT_NAME) $(MSIBUILD_VERSION_STR) !IF "$(CFG)" == "Debug" -MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) Diag +MSIBUILD_PRODUCT_NAME_FULL=$(MSIBUILD_PRODUCT_NAME_FULL) Diag !ENDIF !IFDEF MSIBUILD_HAS_X64 !IFDEF PLAT -MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) $(PLAT) +MSIBUILD_PRODUCT_NAME_FULL=$(MSIBUILD_PRODUCT_NAME_FULL) $(PLAT) !ENDIF !ENDIF @@ -19,48 +19,43 @@ MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) $(PLAT) !IFDEF UI_DUMMY ###################################################################### -# Primer parametra MSI_PID_TEMPLATE: -# MSI_PID_TEMPLATE=12345<###-%%%%%%%>@@@@@ +# ___ (stub for creating new tables) +All :: "$(LANG).$(PLAT).$(CFG).___-1.idt" -###################################################################### -# ___ - -Vse :: "$(LANG).$(CFG).$(PLAT).___-1.idt" - -"$(LANG).$(CFG).$(PLAT).___-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).___-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL < NUL < NUL < NUL !ENDIF @@ -69,9 +64,9 @@ Vse :: \ ###################################################################### # _Validation -Vse :: "$(LANG).$(CFG).$(PLAT)._Validation-1.idt" +All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" -"$(LANG).$(CFG).$(PLAT)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description @@ -510,9 +505,9 @@ Verb Verb N Text The verb for the command. ###################################################################### # ActionText -Vse :: "$(LANG).$(CFG).$(PLAT).ActionText-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" -"Sl.$(CFG).$(PLAT).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Description Template @@ -590,25 +585,25 @@ WriteIniValues Zapisovanje vrednosti datotek INI Datoteka: [1], razdelek: [2], k WriteRegistryValues Zapisovanje vrednosti v sistemski register Ključ: [1], ime: [2], vrednost: [3] < NUL ###################################################################### # AdminExecuteSequence -Vse :: "$(LANG).$(CFG).$(PLAT).AdminExecuteSequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).AdminExecuteSequence-1.idt" -"$(LANG).$(CFG).$(PLAT).AdminExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AdminExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -628,9 +623,9 @@ InstallFinalize 6600 ###################################################################### # AdvtExecuteSequence -Vse :: "$(LANG).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).AdvtExecuteSequence-1.idt" -"$(LANG).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AdvtExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -655,9 +650,9 @@ InstallFinalize 6600 ###################################################################### # AppSearch -Vse :: "$(LANG).$(CFG).$(PLAT).AppSearch-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" -"$(LANG).$(CFG).$(PLAT).AppSearch-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Signature_ @@ -669,9 +664,9 @@ AppSearch Property Signature_ ###################################################################### # BBControl -Vse :: "$(LANG).$(CFG).$(PLAT).BBControl-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).BBControl-1.idt" -"$(LANG).$(CFG).$(PLAT).BBControl-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).BBControl-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Billboard_ BBControl Type X Y Width Height Attributes Text @@ -683,9 +678,9 @@ BBControl Billboard_ BBControl ###################################################################### # Billboard -Vse :: "$(LANG).$(CFG).$(PLAT).Billboard-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).Billboard-1.idt" -"$(LANG).$(CFG).$(PLAT).Billboard-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Billboard-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Billboard Feature_ Action Ordering @@ -697,11 +692,11 @@ Billboard Billboard ###################################################################### # Binary -Vse :: \ - "$(LANG).$(CFG).$(PLAT).Binary-1" \ - "$(LANG).$(CFG).$(PLAT).Binary-1.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Binary-1" \ + "$(LANG).$(PLAT).$(CFG).Binary-1.idt" -"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -713,9 +708,9 @@ Binary Name ###################################################################### # CheckBox -Vse :: "$(LANG).$(CFG).$(PLAT).CheckBox-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).CheckBox-1.idt" -"$(LANG).$(CFG).$(PLAT).CheckBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CheckBox-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Value @@ -727,9 +722,9 @@ CheckBox Property ###################################################################### # ComboBox -Vse :: "$(LANG).$(CFG).$(PLAT).ComboBox-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ComboBox-1.idt" -"$(LANG).$(CFG).$(PLAT).ComboBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ComboBox-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Order Value Text @@ -741,9 +736,9 @@ ComboBox Property Order ###################################################################### # Control -Vse :: "$(LANG).$(CFG).$(PLAT).Control-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).Control-1.idt" -"$(LANG).$(CFG).$(PLAT).Control-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Control-1.idt" : "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 @@ -755,9 +750,9 @@ Control Dialog_ Control ###################################################################### # ControlCondition -Vse :: "$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ControlCondition-1.idt" -"$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ControlCondition-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Action Condition @@ -769,9 +764,9 @@ ControlCondition Dialog_ Control_ Action Condition ###################################################################### # ControlEvent -Vse :: "$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" -"$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Event Argument Condition Ordering @@ -783,9 +778,9 @@ ControlEvent Dialog_ Control_ Event Argument Condition ###################################################################### # CreateFolder -Vse :: "$(LANG).$(CFG).$(PLAT).CreateFolder-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).CreateFolder-1.idt" -"$(LANG).$(CFG).$(PLAT).CreateFolder-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CreateFolder-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Directory_ Component_ @@ -797,9 +792,9 @@ CreateFolder Directory_ Component_ ###################################################################### # CustomAction -Vse :: "$(LANG).$(CFG).$(PLAT).CustomAction-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).CustomAction-2.idt" -"Sl.$(CFG).$(PLAT).CustomAction-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).CustomAction-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -809,25 +804,25 @@ caNewerProductFound 19 Novej caFaultyProductFound 19 Ta namestitveni paket ne more nadgraditi trenutno nameščenega programskega paketa [SimpleProductName]. Prosimo, najprej odstranite nameščeni programski paket in nato poskusite ponovno. < NUL ###################################################################### # Dialog -Vse :: "$(LANG).$(CFG).$(PLAT).Dialog-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt" -"$(LANG).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(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 @@ -839,9 +834,9 @@ Dialog Dialog ###################################################################### # Error -Vse :: "$(LANG).$(CFG).$(PLAT).Error-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).Error-2.idt" -"Sl.$(CFG).$(PLAT).Error-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Error Message @@ -1010,25 +1005,25 @@ i2 L0 2943 Ta verzija operacijskega sistema Windows ne omogoča distribucije 64-bitnih namestitvenih paketov. Skripta »[2]« so namenjena 64-bitnim namestitvenim paketom. < NUL ###################################################################### # EventMapping -Vse :: "$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).EventMapping-1.idt" -"$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).EventMapping-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Event Attribute @@ -1040,9 +1035,9 @@ EventMapping Dialog_ Control_ Event ###################################################################### # Extension -Vse :: "$(LANG).$(CFG).$(PLAT).Extension-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).Extension-1.idt" -"$(LANG).$(CFG).$(PLAT).Extension-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Extension-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Extension Component_ ProgId_ MIME_ Feature_ @@ -1054,9 +1049,9 @@ Extension Extension Component_ ###################################################################### # InstallExecuteSequence -Vse :: "$(LANG).$(CFG).$(PLAT).InstallExecuteSequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" -"$(LANG).$(CFG).$(PLAT).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -1132,9 +1127,9 @@ RemoveExistingProducts 6700 ###################################################################### # InstallUISequence -Vse :: "$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" -"$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -1158,9 +1153,9 @@ ExecuteAction 1300 ###################################################################### # LaunchCondition -Vse :: "$(LANG).$(CFG).$(PLAT).LaunchCondition-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).LaunchCondition-1.idt" -"$(LANG).$(CFG).$(PLAT).LaunchCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).LaunchCondition-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Condition Description @@ -1172,9 +1167,9 @@ LaunchCondition Condition ###################################################################### # ListBox -Vse :: "$(LANG).$(CFG).$(PLAT).ListBox-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ListBox-1.idt" -"$(LANG).$(CFG).$(PLAT).ListBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ListBox-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Order Value Text @@ -1186,9 +1181,9 @@ ListBox Property Order ###################################################################### # ListView -Vse :: "$(LANG).$(CFG).$(PLAT).ListView-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ListView-1.idt" -"$(LANG).$(CFG).$(PLAT).ListView-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ListView-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Order Value Text Binary_ @@ -1200,9 +1195,9 @@ ListView Property Order ###################################################################### # LockPermissions -Vse :: "$(LANG).$(CFG).$(PLAT).LockPermissions-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).LockPermissions-1.idt" -"$(LANG).$(CFG).$(PLAT).LockPermissions-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).LockPermissions-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL LockObject Table Domain User Permission @@ -1214,9 +1209,9 @@ LockPermissions LockObject Table Domain User ###################################################################### # ModuleComponents -Vse :: "$(LANG).$(CFG).$(PLAT).ModuleComponents-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ModuleComponents-1.idt" -"$(LANG).$(CFG).$(PLAT).ModuleComponents-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ModuleComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component ModuleID Language @@ -1228,9 +1223,9 @@ ModuleComponents Component ModuleID Language ###################################################################### # ModuleDependency -Vse :: "$(LANG).$(CFG).$(PLAT).ModuleDependency-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ModuleDependency-1.idt" -"$(LANG).$(CFG).$(PLAT).ModuleDependency-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ModuleDependency-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL ModuleID ModuleLanguage RequiredID RequiredLanguage RequiredVersion @@ -1242,9 +1237,9 @@ ModuleDependency ModuleID ModuleLanguage RequiredID RequiredLanguage ###################################################################### # ModuleSignature -Vse :: "$(LANG).$(CFG).$(PLAT).ModuleSignature-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ModuleSignature-1.idt" -"$(LANG).$(CFG).$(PLAT).ModuleSignature-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ModuleSignature-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL ModuleID Language Version @@ -1256,9 +1251,9 @@ ModuleSignature ModuleID Language ###################################################################### # MsiAssembly -Vse :: "$(LANG).$(CFG).$(PLAT).MsiAssembly-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).MsiAssembly-1.idt" -"$(LANG).$(CFG).$(PLAT).MsiAssembly-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).MsiAssembly-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component_ Feature_ File_Manifest File_Application Attributes @@ -1270,9 +1265,9 @@ MsiAssembly Component_ ###################################################################### # MsiAssemblyName -Vse :: "$(LANG).$(CFG).$(PLAT).MsiAssemblyName-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).MsiAssemblyName-1.idt" -"$(LANG).$(CFG).$(PLAT).MsiAssemblyName-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).MsiAssemblyName-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component_ Name Value @@ -1284,9 +1279,9 @@ MsiAssemblyName Component_ Name ###################################################################### # MsiFileHash -Vse :: "$(LANG).$(CFG).$(PLAT).MsiFileHash-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).MsiFileHash-1.idt" -"$(LANG).$(CFG).$(PLAT).MsiFileHash-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).MsiFileHash-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File_ Options HashPart1 HashPart2 HashPart3 HashPart4 @@ -1298,9 +1293,9 @@ MsiFileHash File_ ###################################################################### # MsiSFCBypass -Vse :: "$(LANG).$(CFG).$(PLAT).MsiSFCBypass-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).MsiSFCBypass-1.idt" -"$(LANG).$(CFG).$(PLAT).MsiSFCBypass-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).MsiSFCBypass-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File_ @@ -1312,11 +1307,11 @@ MsiSFCBypass File_ ###################################################################### # Property -Vse :: \ - "$(LANG).$(CFG).$(PLAT).Property-1.idt" \ - "$(LANG).$(CFG).$(PLAT).Property-2.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Property-1.idt" \ + "$(LANG).$(PLAT).$(CFG).Property-2.idt" -"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Value @@ -1340,12 +1335,12 @@ ARPURLUPDATEINFO $(MSIBUILD_PRODUCT_UPGRADE_URL) Manufacturer $(MSIBUILD_VENDOR_NAME) MSICHECKCRCS 1 ProductID none -ProductName $(MSI_POLNO_IME_IZDELKA) +ProductName $(MSIBUILD_PRODUCT_NAME_FULL) SimpleProductName $(MSIBUILD_PRODUCT_NAME) PROMPTROLLBACKCOST P < NUL Property Value @@ -1354,25 +1349,25 @@ s$(MSIBUILD_LENGTH_ID) l0 ProductLanguage 1060 < NUL ###################################################################### # RadioButton -Vse :: "$(LANG).$(CFG).$(PLAT).RadioButton-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).RadioButton-1.idt" -"$(LANG).$(CFG).$(PLAT).RadioButton-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).RadioButton-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Order Value X Y Width Height Text Help @@ -1384,9 +1379,9 @@ RadioButton Property Order ###################################################################### # RegLocator -Vse :: "$(LANG).$(CFG).$(PLAT).RegLocator-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).RegLocator-1.idt" -"$(LANG).$(CFG).$(PLAT).RegLocator-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).RegLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Signature_ Root Key Name Type @@ -1398,9 +1393,9 @@ RegLocator Signature_ ###################################################################### # Signature -Vse :: "$(LANG).$(CFG).$(PLAT).Signature-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).Signature-1.idt" -"$(LANG).$(CFG).$(PLAT).Signature-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Signature-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Signature FileName MinVersion MaxVersion MinSize MaxSize MinDate MaxDate Languages @@ -1412,9 +1407,9 @@ Signature Signature ###################################################################### # SxsMsmGenComponents -Vse :: "$(LANG).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).SxsMsmGenComponents-1.idt" -"$(LANG).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).SxsMsmGenComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component_ Guid @@ -1426,9 +1421,9 @@ SxsMsmGenComponents Component_ ###################################################################### # TextStyle -Vse :: "$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).TextStyle-1.idt" -"$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).TextStyle-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL TextStyle FaceName Size Color StyleBits @@ -1440,9 +1435,9 @@ TextStyle TextStyle ###################################################################### # TypeLib -Vse :: "$(LANG).$(CFG).$(PLAT).TypeLib-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).TypeLib-1.idt" -"$(LANG).$(CFG).$(PLAT).TypeLib-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).TypeLib-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL LibID Language Component_ Version Description Directory_ Feature_ Cost @@ -1454,9 +1449,9 @@ TypeLib LibID Language Component_ ###################################################################### # UIText -Vse :: "$(LANG).$(CFG).$(PLAT).UIText-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).UIText-2.idt" -"Sl.$(CFG).$(PLAT).UIText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).UIText-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Key Text @@ -1515,21 +1510,21 @@ VolumeCostSize Velikost VolumeCostVolume Pogon < NUL ###################################################################### -# Izdelava modula MSM +# Build MSM module! ###################################################################### !INCLUDE "..\MSM.mak" diff --git a/MSI.js b/MSI.js index d6306b6..088eb6e 100644 --- a/MSI.js +++ b/MSI.js @@ -93,23 +93,23 @@ var PID_SECURITY = 19; // VT_I4 -function MSIVrniDatoteke(installer, pot_msi, pot_izvor) +function MSIGetFiles(installer, msi_path, source_path) { // Create an install session and execute actions in order to perform directory resolution. var - database = installer.OpenDatabase(pot_msi, msiOpenDatabaseModeReadOnly), + database = installer.OpenDatabase(msi_path, msiOpenDatabaseModeReadOnly), session = installer.OpenPackage(database, 1), shortNames = session.Mode(msiRunModeSourceShortNames), stat, view, d = new Array(); - if (pot_izvor) - session.Property("OriginalDatabase") = pot_izvor; + if (source_path) + session.Property("OriginalDatabase") = source_path; stat = session.DoAction("CostInitialize"); if (stat != 1) - throw new Error(MSI_NAPAKA_COST_INITIALIZE, Format(__("Pri klicu funkcije CostInitialize je prišlo do napake (koda %1)."), stat)); + throw new Error("Error calling CostInitialize() (code " + stat + ")."); // Join File table to Component table in order to find directories. view = database.OpenView("SELECT File,FileName,Directory_,File.Attributes FROM File,Component WHERE Component_=Component ORDER BY Directory_"); @@ -136,7 +136,7 @@ function MSIVrniDatoteke(installer, pot_msi, pot_izvor) if (!(fileKey in d)) d[fileKey] = sourcePath; else if (installer.FileAttributes(sourcePath) == -1) - throw new Error(MSI_NAPAKA_DATOTEKA_MANJKA, Format(__("Datoteka »%1« manjka."), sourcePath)); + throw new Error("File \"" + sourcePath + "\" not found."), sourcePath)); } } view.Close(); @@ -148,214 +148,14 @@ function MSIVrniDatoteke(installer, pot_msi, pot_izvor) } -function MSIZlijDatoteke(datoteke, d) +function MSIMergeFiles(files, d) { for (fileKey in d) { - if (!(fileKey in datoteke)) - datoteke[fileKey] = d[fileKey]; - else if (datoteke[fileKey] != d[fileKey]) - throw new Error(MSI_NAPAKA_PODVOJEN_KLJUC, Format(__("Datoteki »%1« in »%2« uporabljata enak kljuÄŤ »%3«."), datoteke[fileKey], d[fileKey], fileKey)); + if (!(fileKey in files)) + files[fileKey] = d[fileKey]; + else if (files[fileKey] != d[fileKey]) + throw new Error("Files \"" + files[fileKey] + "\" and \"" + d[fileKey] + "\" are using the same key \"" + fileKey + "\"."); } } /*@end @*/ - -// SIG // Begin signature block -// SIG // MIIZVQYJKoZIhvcNAQcCoIIZRjCCGUICAQExDjAMBggq -// SIG // hkiG9w0CBQUAMGYGCisGAQQBgjcCAQSgWDBWMDIGCisG -// SIG // AQQBgjcCAR4wJAIBAQQQEODJBs441BGiowAQS9NQkAIB -// SIG // AAIBAAIBAAIBAAIBADAgMAwGCCqGSIb3DQIFBQAEEOgw -// SIG // a0WyGdcCXwgpgCmPzhigghQlMIID7jCCA1egAwIBAgIQ -// SIG // fpPr+3zGTlnqS5p31Ab8OzANBgkqhkiG9w0BAQUFADCB -// SIG // izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g -// SIG // Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV -// SIG // BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRp -// SIG // ZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3Rh -// SIG // bXBpbmcgQ0EwHhcNMTIxMjIxMDAwMDAwWhcNMjAxMjMw -// SIG // MjM1OTU5WjBeMQswCQYDVQQGEwJVUzEdMBsGA1UEChMU -// SIG // U3ltYW50ZWMgQ29ycG9yYXRpb24xMDAuBgNVBAMTJ1N5 -// SIG // bWFudGVjIFRpbWUgU3RhbXBpbmcgU2VydmljZXMgQ0Eg -// SIG // LSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -// SIG // ggEBALGss0lUS5ccEgrYJXmRIlcqb9y4JsRDc2vCvy5Q -// SIG // WvsUwnaOQwElQ7Sh4kX06Ld7w3TMIte0lAAC903tv7S3 -// SIG // RCRrzV9FO9FEzkMScxeCi2m0K8uZHqxyGyZNcR+xMd37 -// SIG // UWECU6aq9UksBXhFpS+JzueZ5/6M4lc/PcaS3Er4ezPk -// SIG // eQr78HWIQZz/xQNRmarXbJ+TaYdlKYOFwmAUxMjJOxTa -// SIG // wIHwHw103pIiq8r3+3R8J+b3Sht/p8OeLa6K6qbmqicW -// SIG // fWH3mHERvOJQoUvlXfrlDqcsn6plINPYlujIfKVOSET/ -// SIG // GeJEB5IL12iEgF1qeGRFzWBGflTBE3zFefHJwXECAwEA -// SIG // AaOB+jCB9zAdBgNVHQ4EFgQUX5r1blzMzHSa1N197z/b -// SIG // 7EyALt0wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAB -// SIG // hhZodHRwOi8vb2NzcC50aGF3dGUuY29tMBIGA1UdEwEB -// SIG // /wQIMAYBAf8CAQAwPwYDVR0fBDgwNjA0oDKgMIYuaHR0 -// SIG // cDovL2NybC50aGF3dGUuY29tL1RoYXd0ZVRpbWVzdGFt -// SIG // cGluZ0NBLmNybDATBgNVHSUEDDAKBggrBgEFBQcDCDAO -// SIG // BgNVHQ8BAf8EBAMCAQYwKAYDVR0RBCEwH6QdMBsxGTAX -// SIG // BgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTEwDQYJKoZIhvcN -// SIG // AQEFBQADgYEAAwmbj3nvf1kwqu9otfrjCR27T4IGXTdf -// SIG // plKfFo3qHJIJRG71betYfDDo+WmNI3MLEm9Hqa45Efgq -// SIG // sZuwGsOO61mWAK3ODE2y0DGmCFwqevzieh1XTKhlGOl5 -// SIG // QGIllm7HxzdqgyEIjkHq3dlXPx13SYcqFgZepjhqIhKj -// SIG // URmDfrYwggSjMIIDi6ADAgECAhAOz/Q4yP6/NW4E2GqY -// SIG // GxpQMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlVT -// SIG // MR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEw -// SIG // MC4GA1UEAxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBT -// SIG // ZXJ2aWNlcyBDQSAtIEcyMB4XDTEyMTAxODAwMDAwMFoX -// SIG // DTIwMTIyOTIzNTk1OVowYjELMAkGA1UEBhMCVVMxHTAb -// SIG // BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMTQwMgYD -// SIG // VQQDEytTeW1hbnRlYyBUaW1lIFN0YW1waW5nIFNlcnZp -// SIG // Y2VzIFNpZ25lciAtIEc0MIIBIjANBgkqhkiG9w0BAQEF -// SIG // AAOCAQ8AMIIBCgKCAQEAomMLOUS4uyOnREm7Dv+h8GEK -// SIG // U5OwmNutLA9KxW7/hjxTVQ8VzgQ/K/2plpbZvmF5C1vJ -// SIG // TIZ25eBDSyKV7sIrQ8Gf2Gi0jkBP7oU4uRHFI/JkWPAV -// SIG // Mm9OV6GuiKQC1yoezUvh3WPVF4kyW7BemVqonShQDhfu -// SIG // ltthO0VRHc8SVguSR/yrrvZmPUescHLnkudfzRC5xINk -// SIG // lBm9JYDh6NIipdC6Anqhd5NbZcPuF3S8QYYq3AhMjJKM -// SIG // kS2ed0QfaNaodHfbDlsyi1aLM73ZY8hJnTrFxeozC9Lx -// SIG // oxv0i77Zs1eLO94Ep3oisiSuLsdwxb5OgyYI+wu9qU+Z -// SIG // COEQKHKqzQIDAQABo4IBVzCCAVMwDAYDVR0TAQH/BAIw -// SIG // ADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8B -// SIG // Af8EBAMCB4AwcwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUF -// SIG // BzABhh5odHRwOi8vdHMtb2NzcC53cy5zeW1hbnRlYy5j -// SIG // b20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cy1haWEud3Mu -// SIG // c3ltYW50ZWMuY29tL3Rzcy1jYS1nMi5jZXIwPAYDVR0f -// SIG // BDUwMzAxoC+gLYYraHR0cDovL3RzLWNybC53cy5zeW1h -// SIG // bnRlYy5jb20vdHNzLWNhLWcyLmNybDAoBgNVHREEITAf -// SIG // pB0wGzEZMBcGA1UEAxMQVGltZVN0YW1wLTIwNDgtMjAd -// SIG // BgNVHQ4EFgQURsZpow5KFB7VTNpSYxc/Xja8DeYwHwYD -// SIG // VR0jBBgwFoAUX5r1blzMzHSa1N197z/b7EyALt0wDQYJ -// SIG // KoZIhvcNAQEFBQADggEBAHg7tJEqAEzwj2IwN3ijhCcH -// SIG // bxiy3iXcoNSUA6qGTiWfmkADHN3O43nLIWgG2rYytG2/ -// SIG // 9CwmYzPkSWRtDebDZw73BaQ1bHyJFsbpst+y6d0gxnEP -// SIG // zZV03LZc3r03H0N45ni1zSgEIKOq8UvEiCmRDoDREfzd -// SIG // XHZuT14ORUZBbg2w6jiasTraCXEQ/Bx5tIB7rGn0/Zy2 -// SIG // DBYr8X9bCT2bW+IWyhOBbQAuOA2oKY8s4bL0WqkBrxWc -// SIG // LC9JG9siu8P+eJRRw4axgohd8D20UaF5Mysue7ncIAkT -// SIG // cetqGVvP6KUwVyyJST+5z3/Jvz4iaGNTmr1pdKzFHTx/ -// SIG // kuDDvBzYBHUwggV6MIIEYqADAgECAhBAh4tnZ5CllwQo -// SIG // npQDAhobMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYDVQQG -// SIG // EwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAd -// SIG // BgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5 -// SIG // BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3 -// SIG // dy52ZXJpc2lnbi5jb20vcnBhIChjKTEwMS4wLAYDVQQD -// SIG // EyVWZXJpU2lnbiBDbGFzcyAzIENvZGUgU2lnbmluZyAy -// SIG // MDEwIENBMB4XDTEyMDkyNjAwMDAwMFoXDTE1MTAxMTIz -// SIG // NTk1OVowgb0xCzAJBgNVBAYTAlNJMREwDwYDVQQIEwhT -// SIG // bG92ZW5pYTEPMA0GA1UEBxMGS2FtbmlrMRYwFAYDVQQK -// SIG // FA1BbWViaXMgZC5vLm8uMT4wPAYDVQQLEzVEaWdpdGFs -// SIG // IElEIENsYXNzIDMgLSBNaWNyb3NvZnQgU29mdHdhcmUg -// SIG // VmFsaWRhdGlvbiB2MjEaMBgGA1UECxQRcHJvZ3JhbXNr -// SIG // YSBvcHJlbWExFjAUBgNVBAMUDUFtZWJpcyBkLm8uby4w -// SIG // ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1 -// SIG // BkVDOxxbnXL8SuZvvb6CRZQnoTF85LVQe80Bx59Z0Wbj -// SIG // JVfCqLxNFP4/lzNf5SMpuHvt3TQLE4NArut0tvz4SArJ -// SIG // sVP9tV9PbLxEy0R0bSojzhlLCHY85rMPQ/KIdv1c5E3b -// SIG // IofKSouI77pwm9leN82kap/8vGRdUm/LFp6Y3VdNH3Wi -// SIG // GFz3ts3IYI/Qzw80pFnoevm4qVnKvtAtihgCRoQ1h1ce -// SIG // s5yXkKYEAgvno2Bzy8iUsXaUs+YNh/Wpas+knJd+Pune -// SIG // JR8B7C0SlsLkV+EJp4fCCDjU1/GFFYJcQFN7AsdAm2lK -// SIG // jaSbC/lDVm5YwNSM964dncX+h8GglMTjAgMBAAGjggF7 -// SIG // MIIBdzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDBA -// SIG // BgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vY3NjMy0yMDEw -// SIG // LWNybC52ZXJpc2lnbi5jb20vQ1NDMy0yMDEwLmNybDBE -// SIG // BgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB -// SIG // BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9y -// SIG // cGEwEwYDVR0lBAwwCgYIKwYBBQUHAwMwcQYIKwYBBQUH -// SIG // AQEEZTBjMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52 -// SIG // ZXJpc2lnbi5jb20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9j -// SIG // c2MzLTIwMTAtYWlhLnZlcmlzaWduLmNvbS9DU0MzLTIw -// SIG // MTAuY2VyMB8GA1UdIwQYMBaAFM+Zqep7JvRLyY6P1/AF -// SIG // Ju/j0qedMBEGCWCGSAGG+EIBAQQEAwIEEDAWBgorBgEE -// SIG // AYI3AgEbBAgwBgEBAAEB/zANBgkqhkiG9w0BAQUFAAOC -// SIG // AQEA4w69Fkalsa4uIgBqqnbavZYA7PGKcul7Q7+kkKYG -// SIG // hTSUr8Sz8nJzhj3RDK++GhJUqhnaExDZjo3uhKSEeMqj -// SIG // +fxYhDA29qpm7gmk70iAfVaR+olaelVxpUY8DS4eG4OE -// SIG // 972AfpnojccLkYvuxz7PifSTPLV/cDIP4OKFCEPQn+L+ -// SIG // yAWIRoWbDCUkcy/pvjGYREx9/TnTLXmTzvlx1Gl4W9KM -// SIG // eSghRtjZt8+We+FZ3/h6J2RPcpjkumbhypQ7bTXrqnYK -// SIG // PF+L2QQa4M9gRiJf3iFCaNbBl8hjF1h0P1/6BVzI+mIy -// SIG // ymqflDAoc56fB6KwboHBezgfmrjlIvHWgn09RDCCBgow -// SIG // ggTyoAMCAQICEFIA5aolVvwahu2WydRLM8cwDQYJKoZI -// SIG // hvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVTMRcwFQYDVQQK -// SIG // Ew5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -// SIG // Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDIw -// SIG // MDYgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXpl -// SIG // ZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xh -// SIG // c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9u -// SIG // IEF1dGhvcml0eSAtIEc1MB4XDTEwMDIwODAwMDAwMFoX -// SIG // DTIwMDIwNzIzNTk1OVowgbQxCzAJBgNVBAYTAlVTMRcw -// SIG // FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMW -// SIG // VmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMy -// SIG // VGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlz -// SIG // aWduLmNvbS9ycGEgKGMpMTAxLjAsBgNVBAMTJVZlcmlT -// SIG // aWduIENsYXNzIDMgQ29kZSBTaWduaW5nIDIwMTAgQ0Ew -// SIG // ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1 -// SIG // I0tepdeKuzLp1Ff37+THJn6tGZj+qJ19lPY2axDXdYEw -// SIG // fwRof8srdR7NHQiM32mUpzejnHuA4Jnh7jdNX847FO6G -// SIG // 1ND1JzW8JQs4p4xjnRejCKWrsPvNamKCTNUh2hvZ8eOE -// SIG // O4oqT4VbkAFPyad2EH8nA3y+rn59wd35BbwbSJxp58Ck -// SIG // PDxBAD7fluXF5JRx1lUBxwAmSkA8taEmqQynbYCOkCV7 -// SIG // z78/HOsvlvrlh3fGtVayejtUMFMb32I0/x7R9FqTKIXl -// SIG // TBdOflv9pJOZf9/N76R17+8V9kfn+Bly2C40Gqa0p0x+ -// SIG // vbtPDD1X8TDWpjaO1oB21xkupc1+NC2JAgMBAAGjggH+ -// SIG // MIIB+jASBgNVHRMBAf8ECDAGAQH/AgEAMHAGA1UdIARp -// SIG // MGcwZQYLYIZIAYb4RQEHFwMwVjAoBggrBgEFBQcCARYc -// SIG // aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL2NwczAqBggr -// SIG // BgEFBQcCAjAeGhxodHRwczovL3d3dy52ZXJpc2lnbi5j -// SIG // b20vcnBhMA4GA1UdDwEB/wQEAwIBBjBtBggrBgEFBQcB -// SIG // DARhMF+hXaBbMFkwVzBVFglpbWFnZS9naWYwITAfMAcG -// SIG // BSsOAwIaBBSP5dMahqyNjmvDz4Bq1EgYLHsZLjAlFiNo -// SIG // dHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvLmdp -// SIG // ZjA0BgNVHR8ELTArMCmgJ6AlhiNodHRwOi8vY3JsLnZl -// SIG // cmlzaWduLmNvbS9wY2EzLWc1LmNybDA0BggrBgEFBQcB -// SIG // AQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZl -// SIG // cmlzaWduLmNvbTAdBgNVHSUEFjAUBggrBgEFBQcDAgYI -// SIG // KwYBBQUHAwMwKAYDVR0RBCEwH6QdMBsxGTAXBgNVBAMT -// SIG // EFZlcmlTaWduTVBLSS0yLTgwHQYDVR0OBBYEFM+Zqep7 -// SIG // JvRLyY6P1/AFJu/j0qedMB8GA1UdIwQYMBaAFH/TZafC -// SIG // 3ey78DAJ80M5+gKvMzEzMA0GCSqGSIb3DQEBBQUAA4IB -// SIG // AQBWIuY0pMRhy0i5Aa1WqGQP2YyRxLvMDOWteqAif99H -// SIG // OEotbNF/cRp87HCpsfBP5A8MU/oVXv50mEkkhYEmHJEU -// SIG // R7BMY4y7oTTUxkXoDYUmcwPQqYxkbdxxkuZFBWAVWVE5 -// SIG // /FgUa/7UpO15awgMQXLnNyIGCb4j6T9Emh7pYZ3MsZBc -// SIG // /D3SjaxCPWU21LQ9QCiPmxDPIybMSyDLkB9djEw0yjzY -// SIG // 5TfWb6UgvTTrJtmuDefFmvehtCGRM2+G6Fi7JXx0Dlj+ -// SIG // dRtjP84xfJuPG5aexVN2hFucrZH6rO2Tul3IIVPCglNj -// SIG // rxINUIcRGz1UUpaKLJw9khoImgUux5OlSJHTMYIEmjCC -// SIG // BJYCAQEwgckwgbQxCzAJBgNVBAYTAlVTMRcwFQYDVQQK -// SIG // Ew5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -// SIG // Z24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMg -// SIG // b2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNv -// SIG // bS9ycGEgKGMpMTAxLjAsBgNVBAMTJVZlcmlTaWduIENs -// SIG // YXNzIDMgQ29kZSBTaWduaW5nIDIwMTAgQ0ECEECHi2dn -// SIG // kKWXBCielAMCGhswDAYIKoZIhvcNAgUFAKCBlDAZBgkq -// SIG // hkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3 -// SIG // AgELMQ4wDAYKKwYBBAGCNwIBFTAfBgkqhkiG9w0BCQQx -// SIG // EgQQSl9T2V7rD4xNBy8y8cPR3zA4BgorBgEEAYI3AgEM -// SIG // MSowKKAOgAwATQBTAEkALgBqAHOhFoAUaHR0cDovL3d3 -// SIG // dy5hbWViaXMuc2kwDQYJKoZIhvcNAQEBBQAEggEAbHaG -// SIG // F9RhbFfP5SpmJb+OnactO+nZLwLEHm4gN4DiL5BrDppz -// SIG // lPQrzvlGxYJVCl0aPenIYYFwAJpPc9LqlFrmRbEb+XbA -// SIG // Kjr6mcumeZv/S7SpEVa9btnewIpp79UWfcUA+0H9Yf/z -// SIG // +Tdo+WhkCAozb1DWvZRVe/8HmfpMHjMifNM3KNdNf4Bh -// SIG // 6IoPj5LUAKW91sD61nyxnj7IdtrwKF4qKuXFza+WMHuA -// SIG // CbnV+P498DBWJPilc3TfE7WWLFblkOrgQVt3xWn3tbr2 -// SIG // I8tuHZzG50s2LObcbZMV4MTRfTV6GxT3wdG3jAsHYKk+ -// SIG // UrXho/zVlAfame9uDcPS3OSBmVB/RqGCAgswggIHBgkq -// SIG // hkiG9w0BCQYxggH4MIIB9AIBATByMF4xCzAJBgNVBAYT -// SIG // AlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlv -// SIG // bjEwMC4GA1UEAxMnU3ltYW50ZWMgVGltZSBTdGFtcGlu -// SIG // ZyBTZXJ2aWNlcyBDQSAtIEcyAhAOz/Q4yP6/NW4E2GqY -// SIG // GxpQMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJ -// SIG // KoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMzExMjQw -// SIG // NzQ2MzdaMCMGCSqGSIb3DQEJBDEWBBSdHrpn0o5lKO5r -// SIG // fA9Z0wEOEuGSEzANBgkqhkiG9w0BAQEFAASCAQBPzhkj -// SIG // oBISP82ifAIoTZDZnW3k3ux8CMuHW3VHIAFH+F1kGr8A -// SIG // 0yHna29JDTfkvTSc9l7MhDyF9zcxACUxco88slIG5XQS -// SIG // oyt65gAHWrlrFksN2oILIMj2nJaBK132xAQlcGR2dlG0 -// SIG // oBg5L57G9Yy2nwXYabhCdI6NFpDCDdOcZBIZLeeffSn9 -// SIG // zMecJeo0RQmp2wt/UBU4+/i/lYNaeFMgjQGPvuNDHQmg -// SIG // OlfOnPJ3WN4190p5Af5nccTLokfnkbt1yLobWNcs5Atj -// SIG // 3sZ/KSFdkUJ5b27TCh0Y/NRPklE2RtBhcshpmz48Z9rs -// SIG // iHmqJ4Wb+BdbjQ1etxpA5dTwMRs0 -// SIG // End signature block diff --git a/MSI.wsf b/MSI.wsf index 9064a1e..24765cf 100644 --- a/MSI.wsf +++ b/MSI.wsf @@ -1,19 +1,15 @@  - + - Ta skripta iz vhodnih datotek MSI pripravi datoteko DDF za skupni arhiv CAB. - - - - - + Compile DDF file for shared CAB archive from input MSI files. + + + + + - - + - Ta skripta iz vhodnih datotek MSI pripravi datoteko odvisnosti DEP. - - - - + Compile DEP dependency file from input MSI files. + + + + - - + - Ta skripta nastavi namestitveni paket MSI na zunanjo datoteko CAB. - - - - + Configures MSI package to use external CAB file. + + + + - - - -** SIG ** MIIZVwYJKoZIhvcNAQcCoIIZSDCCGUQCAQExDjAMBggq -** SIG ** hkiG9w0CBQUAMGYGCisGAQQBgjcCAQSgWDBWMDIGCisG -** SIG ** AQQBgjcCAR4wJAIBAQQQcAVhGs441BGiowAQS9NQkAIB -** SIG ** AAIBAAIBAAIBAAIBADAgMAwGCCqGSIb3DQIFBQAEEBS1 -** SIG ** 0mup/h8B8BYPLED66lKgghQlMIID7jCCA1egAwIBAgIQ -** SIG ** fpPr+3zGTlnqS5p31Ab8OzANBgkqhkiG9w0BAQUFADCB -** SIG ** izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g -** SIG ** Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV -** SIG ** BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRp -** SIG ** ZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3Rh -** SIG ** bXBpbmcgQ0EwHhcNMTIxMjIxMDAwMDAwWhcNMjAxMjMw -** SIG ** MjM1OTU5WjBeMQswCQYDVQQGEwJVUzEdMBsGA1UEChMU -** SIG ** U3ltYW50ZWMgQ29ycG9yYXRpb24xMDAuBgNVBAMTJ1N5 -** SIG ** bWFudGVjIFRpbWUgU3RhbXBpbmcgU2VydmljZXMgQ0Eg -** SIG ** LSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -** SIG ** ggEBALGss0lUS5ccEgrYJXmRIlcqb9y4JsRDc2vCvy5Q -** SIG ** WvsUwnaOQwElQ7Sh4kX06Ld7w3TMIte0lAAC903tv7S3 -** SIG ** RCRrzV9FO9FEzkMScxeCi2m0K8uZHqxyGyZNcR+xMd37 -** SIG ** UWECU6aq9UksBXhFpS+JzueZ5/6M4lc/PcaS3Er4ezPk -** SIG ** eQr78HWIQZz/xQNRmarXbJ+TaYdlKYOFwmAUxMjJOxTa -** SIG ** wIHwHw103pIiq8r3+3R8J+b3Sht/p8OeLa6K6qbmqicW -** SIG ** fWH3mHERvOJQoUvlXfrlDqcsn6plINPYlujIfKVOSET/ -** SIG ** GeJEB5IL12iEgF1qeGRFzWBGflTBE3zFefHJwXECAwEA -** SIG ** AaOB+jCB9zAdBgNVHQ4EFgQUX5r1blzMzHSa1N197z/b -** SIG ** 7EyALt0wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAB -** SIG ** hhZodHRwOi8vb2NzcC50aGF3dGUuY29tMBIGA1UdEwEB -** SIG ** /wQIMAYBAf8CAQAwPwYDVR0fBDgwNjA0oDKgMIYuaHR0 -** SIG ** cDovL2NybC50aGF3dGUuY29tL1RoYXd0ZVRpbWVzdGFt -** SIG ** cGluZ0NBLmNybDATBgNVHSUEDDAKBggrBgEFBQcDCDAO -** SIG ** BgNVHQ8BAf8EBAMCAQYwKAYDVR0RBCEwH6QdMBsxGTAX -** SIG ** BgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTEwDQYJKoZIhvcN -** SIG ** AQEFBQADgYEAAwmbj3nvf1kwqu9otfrjCR27T4IGXTdf -** SIG ** plKfFo3qHJIJRG71betYfDDo+WmNI3MLEm9Hqa45Efgq -** SIG ** sZuwGsOO61mWAK3ODE2y0DGmCFwqevzieh1XTKhlGOl5 -** SIG ** QGIllm7HxzdqgyEIjkHq3dlXPx13SYcqFgZepjhqIhKj -** SIG ** URmDfrYwggSjMIIDi6ADAgECAhAOz/Q4yP6/NW4E2GqY -** SIG ** GxpQMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlVT -** SIG ** MR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEw -** SIG ** MC4GA1UEAxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBT -** SIG ** ZXJ2aWNlcyBDQSAtIEcyMB4XDTEyMTAxODAwMDAwMFoX -** SIG ** DTIwMTIyOTIzNTk1OVowYjELMAkGA1UEBhMCVVMxHTAb -** SIG ** BgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMTQwMgYD -** SIG ** VQQDEytTeW1hbnRlYyBUaW1lIFN0YW1waW5nIFNlcnZp -** SIG ** Y2VzIFNpZ25lciAtIEc0MIIBIjANBgkqhkiG9w0BAQEF -** SIG ** AAOCAQ8AMIIBCgKCAQEAomMLOUS4uyOnREm7Dv+h8GEK -** SIG ** U5OwmNutLA9KxW7/hjxTVQ8VzgQ/K/2plpbZvmF5C1vJ -** SIG ** TIZ25eBDSyKV7sIrQ8Gf2Gi0jkBP7oU4uRHFI/JkWPAV -** SIG ** Mm9OV6GuiKQC1yoezUvh3WPVF4kyW7BemVqonShQDhfu -** SIG ** ltthO0VRHc8SVguSR/yrrvZmPUescHLnkudfzRC5xINk -** SIG ** lBm9JYDh6NIipdC6Anqhd5NbZcPuF3S8QYYq3AhMjJKM -** SIG ** kS2ed0QfaNaodHfbDlsyi1aLM73ZY8hJnTrFxeozC9Lx -** SIG ** oxv0i77Zs1eLO94Ep3oisiSuLsdwxb5OgyYI+wu9qU+Z -** SIG ** COEQKHKqzQIDAQABo4IBVzCCAVMwDAYDVR0TAQH/BAIw -** SIG ** ADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8B -** SIG ** Af8EBAMCB4AwcwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUF -** SIG ** BzABhh5odHRwOi8vdHMtb2NzcC53cy5zeW1hbnRlYy5j -** SIG ** b20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cy1haWEud3Mu -** SIG ** c3ltYW50ZWMuY29tL3Rzcy1jYS1nMi5jZXIwPAYDVR0f -** SIG ** BDUwMzAxoC+gLYYraHR0cDovL3RzLWNybC53cy5zeW1h -** SIG ** bnRlYy5jb20vdHNzLWNhLWcyLmNybDAoBgNVHREEITAf -** SIG ** pB0wGzEZMBcGA1UEAxMQVGltZVN0YW1wLTIwNDgtMjAd -** SIG ** BgNVHQ4EFgQURsZpow5KFB7VTNpSYxc/Xja8DeYwHwYD -** SIG ** VR0jBBgwFoAUX5r1blzMzHSa1N197z/b7EyALt0wDQYJ -** SIG ** KoZIhvcNAQEFBQADggEBAHg7tJEqAEzwj2IwN3ijhCcH -** SIG ** bxiy3iXcoNSUA6qGTiWfmkADHN3O43nLIWgG2rYytG2/ -** SIG ** 9CwmYzPkSWRtDebDZw73BaQ1bHyJFsbpst+y6d0gxnEP -** SIG ** zZV03LZc3r03H0N45ni1zSgEIKOq8UvEiCmRDoDREfzd -** SIG ** XHZuT14ORUZBbg2w6jiasTraCXEQ/Bx5tIB7rGn0/Zy2 -** SIG ** DBYr8X9bCT2bW+IWyhOBbQAuOA2oKY8s4bL0WqkBrxWc -** SIG ** LC9JG9siu8P+eJRRw4axgohd8D20UaF5Mysue7ncIAkT -** SIG ** cetqGVvP6KUwVyyJST+5z3/Jvz4iaGNTmr1pdKzFHTx/ -** SIG ** kuDDvBzYBHUwggV6MIIEYqADAgECAhBAh4tnZ5CllwQo -** SIG ** npQDAhobMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYDVQQG -** SIG ** EwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAd -** SIG ** BgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5 -** SIG ** BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3 -** SIG ** dy52ZXJpc2lnbi5jb20vcnBhIChjKTEwMS4wLAYDVQQD -** SIG ** EyVWZXJpU2lnbiBDbGFzcyAzIENvZGUgU2lnbmluZyAy -** SIG ** MDEwIENBMB4XDTEyMDkyNjAwMDAwMFoXDTE1MTAxMTIz -** SIG ** NTk1OVowgb0xCzAJBgNVBAYTAlNJMREwDwYDVQQIEwhT -** SIG ** bG92ZW5pYTEPMA0GA1UEBxMGS2FtbmlrMRYwFAYDVQQK -** SIG ** FA1BbWViaXMgZC5vLm8uMT4wPAYDVQQLEzVEaWdpdGFs -** SIG ** IElEIENsYXNzIDMgLSBNaWNyb3NvZnQgU29mdHdhcmUg -** SIG ** VmFsaWRhdGlvbiB2MjEaMBgGA1UECxQRcHJvZ3JhbXNr -** SIG ** YSBvcHJlbWExFjAUBgNVBAMUDUFtZWJpcyBkLm8uby4w -** SIG ** ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1 -** SIG ** BkVDOxxbnXL8SuZvvb6CRZQnoTF85LVQe80Bx59Z0Wbj -** SIG ** JVfCqLxNFP4/lzNf5SMpuHvt3TQLE4NArut0tvz4SArJ -** SIG ** sVP9tV9PbLxEy0R0bSojzhlLCHY85rMPQ/KIdv1c5E3b -** SIG ** IofKSouI77pwm9leN82kap/8vGRdUm/LFp6Y3VdNH3Wi -** SIG ** GFz3ts3IYI/Qzw80pFnoevm4qVnKvtAtihgCRoQ1h1ce -** SIG ** s5yXkKYEAgvno2Bzy8iUsXaUs+YNh/Wpas+knJd+Pune -** SIG ** JR8B7C0SlsLkV+EJp4fCCDjU1/GFFYJcQFN7AsdAm2lK -** SIG ** jaSbC/lDVm5YwNSM964dncX+h8GglMTjAgMBAAGjggF7 -** SIG ** MIIBdzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDBA -** SIG ** BgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vY3NjMy0yMDEw -** SIG ** LWNybC52ZXJpc2lnbi5jb20vQ1NDMy0yMDEwLmNybDBE -** SIG ** BgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB -** SIG ** BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9y -** SIG ** cGEwEwYDVR0lBAwwCgYIKwYBBQUHAwMwcQYIKwYBBQUH -** SIG ** AQEEZTBjMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52 -** SIG ** ZXJpc2lnbi5jb20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9j -** SIG ** c2MzLTIwMTAtYWlhLnZlcmlzaWduLmNvbS9DU0MzLTIw -** SIG ** MTAuY2VyMB8GA1UdIwQYMBaAFM+Zqep7JvRLyY6P1/AF -** SIG ** Ju/j0qedMBEGCWCGSAGG+EIBAQQEAwIEEDAWBgorBgEE -** SIG ** AYI3AgEbBAgwBgEBAAEB/zANBgkqhkiG9w0BAQUFAAOC -** SIG ** AQEA4w69Fkalsa4uIgBqqnbavZYA7PGKcul7Q7+kkKYG -** SIG ** hTSUr8Sz8nJzhj3RDK++GhJUqhnaExDZjo3uhKSEeMqj -** SIG ** +fxYhDA29qpm7gmk70iAfVaR+olaelVxpUY8DS4eG4OE -** SIG ** 972AfpnojccLkYvuxz7PifSTPLV/cDIP4OKFCEPQn+L+ -** SIG ** yAWIRoWbDCUkcy/pvjGYREx9/TnTLXmTzvlx1Gl4W9KM -** SIG ** eSghRtjZt8+We+FZ3/h6J2RPcpjkumbhypQ7bTXrqnYK -** SIG ** PF+L2QQa4M9gRiJf3iFCaNbBl8hjF1h0P1/6BVzI+mIy -** SIG ** ymqflDAoc56fB6KwboHBezgfmrjlIvHWgn09RDCCBgow -** SIG ** ggTyoAMCAQICEFIA5aolVvwahu2WydRLM8cwDQYJKoZI -** SIG ** hvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVTMRcwFQYDVQQK -** SIG ** Ew5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -** SIG ** Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDIw -** SIG ** MDYgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXpl -** SIG ** ZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xh -** SIG ** c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9u -** SIG ** IEF1dGhvcml0eSAtIEc1MB4XDTEwMDIwODAwMDAwMFoX -** SIG ** DTIwMDIwNzIzNTk1OVowgbQxCzAJBgNVBAYTAlVTMRcw -** SIG ** FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMW -** SIG ** VmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMy -** SIG ** VGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlz -** SIG ** aWduLmNvbS9ycGEgKGMpMTAxLjAsBgNVBAMTJVZlcmlT -** SIG ** aWduIENsYXNzIDMgQ29kZSBTaWduaW5nIDIwMTAgQ0Ew -** SIG ** ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1 -** SIG ** I0tepdeKuzLp1Ff37+THJn6tGZj+qJ19lPY2axDXdYEw -** SIG ** fwRof8srdR7NHQiM32mUpzejnHuA4Jnh7jdNX847FO6G -** SIG ** 1ND1JzW8JQs4p4xjnRejCKWrsPvNamKCTNUh2hvZ8eOE -** SIG ** O4oqT4VbkAFPyad2EH8nA3y+rn59wd35BbwbSJxp58Ck -** SIG ** PDxBAD7fluXF5JRx1lUBxwAmSkA8taEmqQynbYCOkCV7 -** SIG ** z78/HOsvlvrlh3fGtVayejtUMFMb32I0/x7R9FqTKIXl -** SIG ** TBdOflv9pJOZf9/N76R17+8V9kfn+Bly2C40Gqa0p0x+ -** SIG ** vbtPDD1X8TDWpjaO1oB21xkupc1+NC2JAgMBAAGjggH+ -** SIG ** MIIB+jASBgNVHRMBAf8ECDAGAQH/AgEAMHAGA1UdIARp -** SIG ** MGcwZQYLYIZIAYb4RQEHFwMwVjAoBggrBgEFBQcCARYc -** SIG ** aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL2NwczAqBggr -** SIG ** BgEFBQcCAjAeGhxodHRwczovL3d3dy52ZXJpc2lnbi5j -** SIG ** b20vcnBhMA4GA1UdDwEB/wQEAwIBBjBtBggrBgEFBQcB -** SIG ** DARhMF+hXaBbMFkwVzBVFglpbWFnZS9naWYwITAfMAcG -** SIG ** BSsOAwIaBBSP5dMahqyNjmvDz4Bq1EgYLHsZLjAlFiNo -** SIG ** dHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvLmdp -** SIG ** ZjA0BgNVHR8ELTArMCmgJ6AlhiNodHRwOi8vY3JsLnZl -** SIG ** cmlzaWduLmNvbS9wY2EzLWc1LmNybDA0BggrBgEFBQcB -** SIG ** AQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZl -** SIG ** cmlzaWduLmNvbTAdBgNVHSUEFjAUBggrBgEFBQcDAgYI -** SIG ** KwYBBQUHAwMwKAYDVR0RBCEwH6QdMBsxGTAXBgNVBAMT -** SIG ** EFZlcmlTaWduTVBLSS0yLTgwHQYDVR0OBBYEFM+Zqep7 -** SIG ** JvRLyY6P1/AFJu/j0qedMB8GA1UdIwQYMBaAFH/TZafC -** SIG ** 3ey78DAJ80M5+gKvMzEzMA0GCSqGSIb3DQEBBQUAA4IB -** SIG ** AQBWIuY0pMRhy0i5Aa1WqGQP2YyRxLvMDOWteqAif99H -** SIG ** OEotbNF/cRp87HCpsfBP5A8MU/oVXv50mEkkhYEmHJEU -** SIG ** R7BMY4y7oTTUxkXoDYUmcwPQqYxkbdxxkuZFBWAVWVE5 -** SIG ** /FgUa/7UpO15awgMQXLnNyIGCb4j6T9Emh7pYZ3MsZBc -** SIG ** /D3SjaxCPWU21LQ9QCiPmxDPIybMSyDLkB9djEw0yjzY -** SIG ** 5TfWb6UgvTTrJtmuDefFmvehtCGRM2+G6Fi7JXx0Dlj+ -** SIG ** dRtjP84xfJuPG5aexVN2hFucrZH6rO2Tul3IIVPCglNj -** SIG ** rxINUIcRGz1UUpaKLJw9khoImgUux5OlSJHTMYIEnDCC -** SIG ** BJgCAQEwgckwgbQxCzAJBgNVBAYTAlVTMRcwFQYDVQQK -** SIG ** Ew5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -** SIG ** Z24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMg -** SIG ** b2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNv -** SIG ** bS9ycGEgKGMpMTAxLjAsBgNVBAMTJVZlcmlTaWduIENs -** SIG ** YXNzIDMgQ29kZSBTaWduaW5nIDIwMTAgQ0ECEECHi2dn -** SIG ** kKWXBCielAMCGhswDAYIKoZIhvcNAgUFAKCBljAZBgkq -** SIG ** hkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3 -** SIG ** AgELMQ4wDAYKKwYBBAGCNwIBFTAfBgkqhkiG9w0BCQQx -** SIG ** EgQQFbJWR6tIDr4iCJphIEQIfzA6BgorBgEEAYI3AgEM -** SIG ** MSwwKqAQgA4ATQBTAEkALgB3AHMAZqEWgBRodHRwOi8v -** SIG ** d3d3LmFtZWJpcy5zaTANBgkqhkiG9w0BAQEFAASCAQAd -** SIG ** EwXumLGjPzxpt/sbcCR9+2W/B673P3xNAn8A+Gbd359n -** SIG ** XKn9h04cbehzmpjI0lmsz9lfQ+Ro1ftPJazPNoDLYCY7 -** SIG ** +Hl0iWaE0RqRAR6ePabCqrqmt21knZWrL+71UqvfGp3W -** SIG ** fnqOcx2U4wW5+0HEvlsax1ljdbfErv39q3vMRLrw3VkR -** SIG ** AMP6Bb3+6F56NxCTdoB4RgjWnBHGL/vxZD1LRVf18XFA -** SIG ** OCddKnhDCXbYy5mIn1nH9mJNn0/O2knM3DMSN5MAE3iz -** SIG ** unwt3FjHOALHb8858IlsGqzv1AXGLVkOon04LRX1To1i -** SIG ** wSg5nRWOhzCw43biYqk8UED2YEL0CvuwoYICCzCCAgcG -** SIG ** CSqGSIb3DQEJBjGCAfgwggH0AgEBMHIwXjELMAkGA1UE -** SIG ** BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0 -** SIG ** aW9uMTAwLgYDVQQDEydTeW1hbnRlYyBUaW1lIFN0YW1w -** SIG ** aW5nIFNlcnZpY2VzIENBIC0gRzICEA7P9DjI/r81bgTY -** SIG ** apgbGlAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzEL -** SIG ** BgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE0MDIy -** SIG ** NzA3MTA0OFowIwYJKoZIhvcNAQkEMRYEFMj1Tvaz63NU -** SIG ** X1E40uFvbimgbAh1MA0GCSqGSIb3DQEBAQUABIIBAAuP -** SIG ** 8t9Mg70nQ/62zAcQ7zVXhrgP17/jfnwyhYEkN0HKCmlc -** SIG ** t6aRKtQn4bKXZkASr0fgzKgvQXoXQu7jJ1Ag05q7immx -** SIG ** XPnQJOHhUigGbVxOAyiUHhelAjoNHAgiSxzH+06CiRiO -** SIG ** UQ4WWQj3To1PssM7kyDslwrMZaBpXlUOvRr9gk5aBmuy -** SIG ** IZK1ySNjGO+pvSYHC+OySMyoHmyrnk0XNqBt9CLA743Z -** SIG ** FU784gP8bKXuEduvuD1/6cZQL8+7x1dJpzCu2SKv7v1E -** SIG ** Vh4uvNcYe6+tLOe6PorCyt1k+rsxeKpnO4WKMlnL6Z51 -** SIG ** 3RB8GsXzGERZBdUlfxsbG9J26cK7ir0= - diff --git a/MSM.mak b/MSM.mak index 860a1dd..39303c4 100644 --- a/MSM.mak +++ b/MSM.mak @@ -1,35 +1,35 @@ -Vse :: "$(LANG).$(CFG).$(PLAT).msm" +All :: "$(LANG).$(PLAT).$(CFG).msm" -Pocisti :: - -if exist "$(LANG).$(CFG).$(PLAT).*-1.idt" del /f /q "$(LANG).$(CFG).$(PLAT).*-1.idt" - -if exist "$(LANG).$(CFG).$(PLAT).Binary-1\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Binary-1\*.*" - -if exist "$(LANG).$(CFG).$(PLAT).Icon-1\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Icon-1\*.*" +Clean :: + -if exist "$(LANG).$(PLAT).$(CFG).*-1.idt" del /f /q "$(LANG).$(PLAT).$(CFG).*-1.idt" + -if exist "$(LANG).$(PLAT).$(CFG).Binary-1\*.*" del /f /q "$(LANG).$(PLAT).$(CFG).Binary-1\*.*" + -if exist "$(LANG).$(PLAT).$(CFG).Icon-1\*.*" del /f /q "$(LANG).$(PLAT).$(CFG).Icon-1\*.*" !IFDEF MSIBUILD_IS_LOCALIZEABLE - -if exist "$(LANG).$(CFG).$(PLAT).*-2.idt" del /f /q "$(LANG).$(CFG).$(PLAT).*-2.idt" - -if exist "$(LANG).$(CFG).$(PLAT).*-2.idtx" del /f /q "$(LANG).$(CFG).$(PLAT).*-2.idtx" - -if exist "$(LANG).$(CFG).$(PLAT).Binary-2\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Binary-2\*.*" - -if exist "$(LANG).$(CFG).$(PLAT).Icon-2\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Icon-2\*.*" + -if exist "$(LANG).$(PLAT).$(CFG).*-2.idt" del /f /q "$(LANG).$(PLAT).$(CFG).*-2.idt" + -if exist "$(LANG).$(PLAT).$(CFG).*-2.idtx" del /f /q "$(LANG).$(PLAT).$(CFG).*-2.idtx" + -if exist "$(LANG).$(PLAT).$(CFG).Binary-2\*.*" del /f /q "$(LANG).$(PLAT).$(CFG).Binary-2\*.*" + -if exist "$(LANG).$(PLAT).$(CFG).Icon-2\*.*" del /f /q "$(LANG).$(PLAT).$(CFG).Icon-2\*.*" !ENDIF - -if exist "$(LANG).$(CFG).$(PLAT).lst" del /f /q "$(LANG).$(CFG).$(PLAT).lst" - -if exist "$(LANG).$(CFG).$(PLAT).msm" del /f /q "$(LANG).$(CFG).$(PLAT).msm" + -if exist "$(LANG).$(PLAT).$(CFG).lst" del /f /q "$(LANG).$(PLAT).$(CFG).lst" + -if exist "$(LANG).$(PLAT).$(CFG).msm" del /f /q "$(LANG).$(PLAT).$(CFG).msm" ###################################################################### -# Izdelava modula +# Module compilation ###################################################################### !IFDEF MSIBUILD_IS_LOCALIZEABLE ###################################################################### -# Ker orodje msidb ne zna pravilno prilepiti v modul tabel iz datotek -# IDL, naredimo ločeno dva modula in jih nato zlepimo. +# Since msidb utility doesn't append tables from IDL files to MSM +# module correctly, create separate MSM modules and merge. -"$(LANG).$(CFG).$(PLAT).msm" : $(LANG).$(CFG).$(PLAT).*-1.idt $(LANG).$(CFG).$(PLAT).*-2.idt +"$(LANG).$(PLAT).$(CFG).msm" : $(LANG).$(PLAT).$(CFG).*-1.idt $(LANG).$(PLAT).$(CFG).*-2.idt -if exist $@ del /f /q $@ -if exist "$(@:"=)-1.tmp" del /f /q "$(@:"=)-1.tmp" -if exist "$(@:"=)-2.tmp" del /f /q "$(@:"=)-2.tmp" - msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-1.idt - msidb.exe -c -d "$(@:"=)-2.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-2.idt + msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(PLAT).$(CFG).*-1.idt + msidb.exe -c -d "$(@:"=)-2.tmp" -f "$(MAKEDIR)" -i $(LANG).$(PLAT).$(CFG).*-2.idt msidb.exe -d "$(@:"=)-1.tmp" -m "$(@:"=)-2.tmp" del /f /q "$(@:"=)-2.tmp" move /y "$(@:"=)-1.tmp" $@ > NUL @@ -37,46 +37,46 @@ Pocisti :: !ELSE ###################################################################### -# Modul ni lokaliziran, zato je njegova izdelava trivialna. +# Module is not localizeable => the compilation is trivial. -"$(LANG).$(CFG).$(PLAT).msm" : $(LANG).$(CFG).$(PLAT).*-1.idt +"$(LANG).$(PLAT).$(CFG).msm" : $(LANG).$(PLAT).$(CFG).*-1.idt -if exist $@ del /f /q $@ -if exist "$(@:"=)-1.tmp" del /f /q "$(@:"=)-1.tmp" - msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-1.idt + msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(PLAT).$(CFG).*-1.idt move /y "$(@:"=)-1.tmp" $@ > NUL !ENDIF ###################################################################### -# Odvisnosti +# Dependencies ###################################################################### -"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : $(LANG).$(CFG).$(PLAT).Binary-1\*.* +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : $(LANG).$(PLAT).$(CFG).Binary-1\*.* -"$(LANG).$(CFG).$(PLAT).Binary-2.idt" : $(LANG).$(CFG).$(PLAT).Binary-2\*.* +"$(LANG).$(PLAT).$(CFG).Binary-2.idt" : $(LANG).$(PLAT).$(CFG).Binary-2\*.* -"$(LANG).$(CFG).$(PLAT).Icon-1.idt" : $(LANG).$(CFG).$(PLAT).Icon-1\*.* +"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : $(LANG).$(PLAT).$(CFG).Icon-1\*.* -"$(LANG).$(CFG).$(PLAT).Icon-2.idt" : $(LANG).$(CFG).$(PLAT).Icon-2\*.* +"$(LANG).$(PLAT).$(CFG).Icon-2.idt" : $(LANG).$(PLAT).$(CFG).Icon-2\*.* ###################################################################### -# Ustvarjanje imenikov +# Folder creation ###################################################################### -"$(LANG).$(CFG).$(PLAT).Binary-1" : +"$(LANG).$(PLAT).$(CFG).Binary-1" : if not exist $@ md $@ -"$(LANG).$(CFG).$(PLAT).Icon-1" : +"$(LANG).$(PLAT).$(CFG).Icon-1" : if not exist $@ md $@ !IFDEF MSIBUILD_IS_LOCALIZEABLE -"$(LANG).$(CFG).$(PLAT).Binary-2" : +"$(LANG).$(PLAT).$(CFG).Binary-2" : if not exist $@ md $@ -"$(LANG).$(CFG).$(PLAT).Icon-2" : +"$(LANG).$(PLAT).$(CFG).Icon-2" : if not exist $@ md $@ -!ENDIF \ No newline at end of file +!ENDIF diff --git a/Makefile b/Makefile index dcd236a..a054cd4 100644 --- a/Makefile +++ b/Makefile @@ -1,151 +1,146 @@ !IFNDEF MSIBUILD_OUTPUT_DIR -!ERROR Spremenljivka MSIBUILD_OUTPUT_DIR ni definirana! +!ERROR Parameter MSIBUILD_OUTPUT_DIR is undefined. !ENDIF !IFNDEF MSIBUILD_ROOT -!ERROR Spremenljivka MSIBUILD_ROOT ni definirana! +!ERROR Parameter MSIBUILD_ROOT is undefined. !ENDIF !IFNDEF MSIBUILD_TARGET -!ERROR Spremenljivka MSIBUILD_TARGET ni definirana! +!ERROR Parameter MSIBUILD_TARGET is undefined. !ENDIF !IFNDEF MSIBUILD_VENDOR_NAME -!ERROR Spremenljivka MSIBUILD_VENDOR_NAME ni definirana! +!ERROR Parameter MSIBUILD_VENDOR_NAME is undefined. !ENDIF !IFNDEF MSIBUILD_VENDOR_URL -!ERROR Spremenljivka MSIBUILD_VENDOR_URL ni definirana! +!ERROR Parameter MSIBUILD_VENDOR_URL is undefined. !ENDIF !IFNDEF MSIBUILD_PRODUCT_NAME -!ERROR Spremenljivka MSIBUILD_PRODUCT_NAME ni definirana! +!ERROR Parameter MSIBUILD_PRODUCT_NAME is undefined. !ENDIF !IFNDEF MSIBUILD_PRODUCT_DESC -!ERROR Spremenljivka MSIBUILD_PRODUCT_DESC ni definirana! +!ERROR Parameter MSIBUILD_PRODUCT_DESC is undefined. !ENDIF !IFNDEF MSIBUILD_CODEPAGE -!ERROR Spremenljivka MSIBUILD_CODEPAGE ni definirana! +!ERROR Parameter MSIBUILD_CODEPAGE is undefined. +!ENDIF + +!IFNDEF MSIBUILD_LANGID +!ERROR Parameter MSIBUILD_LANGID is undefined. +!ENDIF + +!IFNDEF MSIBUILD_MSI_VERSION_MIN +!ERROR Parameter MSIBUILD_MSI_VERSION_MIN is undefined. +!ENDIF + +!IFNDEF MSIBUILD_LENGTH_ID +!ERROR Parameter MSIBUILD_LENGTH_ID is undefined. +!ENDIF + +!IFNDEF MSIBUILD_LENGTH_HELP +!ERROR Parameter MSIBUILD_LENGTH_HELP is undefined. +!ENDIF + +!IFNDEF MSIBUILD_PHASE +MSIBUILD_PHASE=0 !ENDIF !IFNDEF PLAT PLAT=Win32 !ENDIF - -!IFNDEF MSIBUILD_LANGID -!ERROR Spremenljivka MSIBUILD_LANGID ni definirana! -!ENDIF - -!IFNDEF MSIBUILD_MSI_VERSION_MIN -!ERROR Spremenljivka MSIBUILD_MSI_VERSION_MIN ni definirana! -!ENDIF - -!IFNDEF MSIBUILD_LENGTH_ID -!ERROR Spremenljivka MSIBUILD_LENGTH_ID ni definirana! -!ENDIF - -!IFNDEF MSIBUILD_LENGTH_HELP -!ERROR Spremenljivka MSIBUILD_LENGTH_HELP ni definirana! -!ENDIF - -!IFNDEF MSI_FAZA -MSI_FAZA=0 -!ENDIF - -!IFNDEF IMENIK_ASKUPNO -IMENIK_ASKUPNO=C:\Inetpub\spletne-skripte\ASkupno -!ENDIF - !IF "$(PLAT)" == "Win32" -MSI_PLATFORMA2=Intel +MSIBUILD_PLAT=Intel !ELSE -MSI_PLATFORMA2=$(PLAT) +MSIBUILD_PLAT=$(PLAT) !ENDIF -Vse :: +All :: -Pocisti :: +Clean :: -!IF $(MSI_FAZA) == 0 +!IF $(MSIBUILD_PHASE) == 0 ###################################################################### -# Pripravljalna faza -# - Priprava podatkov o verziji. +# Setup Phase +# - Version info parsing ###################################################################### -Vse :: \ - "$(MSIBUILD_ROOT)\Verzija\Verzija.mak" \ +All :: \ + "$(MSIBUILD_ROOT)\Version\Version.mak" \ "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=1 Vse + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_PHASE=1 All -Pocisti :: - $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=100 Pocisti +Clean :: + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_PHASE=100 Clean -"$(MSIBUILD_ROOT)\Verzija\Verzija.mak" :: +"$(MSIBUILD_ROOT)\Version\Version.mak" :: cd $(@D) - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Verzija + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Version cd "$(MAKEDIR)" - + "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" :: -if exist $@ del /f /q $@ -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" novguid.exe MSI_GUID_PAKETA | sed -e "s/set //i" >> "$(@:"=).tmp" move /y "$(@:"=).tmp" $@ > NUL -!ELSEIF $(MSI_FAZA) == 1 +!ELSEIF $(MSIBUILD_PHASE) == 1 ###################################################################### -# 1. faza -# - Priprava modulov, spiskov odvisnih datotek in začetne verzije -# namestitvenega paketa. +# 1st Phase +# - Module preparation, generating dependency lists and first version +# of MSI package ###################################################################### -!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak" +!INCLUDE "$(MSIBUILD_ROOT)\Version\Version.mak" !INCLUDE "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" -Vse :: \ +All :: \ "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" \ "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=2 Vse + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_PHASE=2 All "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" : $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED) -if exist $@ del /f /q $@ copy /y "$(MSIBUILD_ROOT)\Empty.msi" "$(@:"=).tmp" > NUL !if not exist "$(**R:"=).msmcfg" msidb.exe -d "$(@:"=).tmp" -m $** - msiinfo.exe "$(@:"=).tmp" /nologo /C $(MSIBUILD_CODEPAGE) /T "$(MSIBUILD_PRODUCT_NAME) $(MSI_VERZIJA_STR) ($(PLAT))" /J "$(MSIBUILD_PRODUCT_DESC)" /A "$(MSIBUILD_VENDOR_NAME)" /P "$(MSI_PLATFORMA2);$(MSIBUILD_LANGID)" /G $(MSIBUILD_MSI_VERSION_MIN) /V $(MSI_GUID_PAKETA) /W 0 /O "" + msiinfo.exe "$(@:"=).tmp" /nologo /C $(MSIBUILD_CODEPAGE) /T "$(MSIBUILD_PRODUCT_NAME) $(MSIBUILD_VERSION_STR) ($(PLAT))" /J "$(MSIBUILD_PRODUCT_DESC)" /A "$(MSIBUILD_VENDOR_NAME)" /P "$(MSIBUILD_PLAT);$(MSIBUILD_LANGID)" /G $(MSIBUILD_MSI_VERSION_MIN) /V $(MSI_GUID_PAKETA) /W 0 /O "" !if exist "$(**R:"=).msmcfg" msimsm.exe "$(@:"=).tmp" $** /N "$(**R:"=).msmcfg" /D "$(**R:"=).log" /Sd "$(MSIBUILD_OUTPUT_DIR)" /F move /y "$(@:"=).tmp" $@ > NUL "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" -if exist $@ del /f /q $@ -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" $** + cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:MakeDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" $** move /y "$(@:"=).tmp" $@ > NUL $(MSIBUILD_MODULES) :: cd $(@D) - $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSM_IMA_VERZIJO=1 + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_HAS_VERSION=1 cd "$(MAKEDIR)" -!ELSEIF $(MSI_FAZA) == 2 +!ELSEIF $(MSIBUILD_PHASE) == 2 ###################################################################### -# 2. faza -# - Dopolnitev namestitvenega paketa z verzijami in dolžinami datotek. +# 2nd Phase +# - MSI package population with exact file versions and sizes ###################################################################### !INCLUDE "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep" -!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak" +!INCLUDE "$(MSIBUILD_ROOT)\Version\Version.mak" -Vse :: \ +All :: \ !IFDEF MSIBUILD_COMPRESS "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" \ !ENDIF "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" !IFDEF MSIBUILD_COMPRESS - $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=3 Vse + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_PHASE=3 All !ENDIF "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" @@ -158,26 +153,26 @@ Vse :: \ "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" -if exist $@ del /f /q $@ -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" $** + cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:MakeDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" $** move /y "$(@:"=).tmp" $@ > NUL -!ELSEIF $(MSI_FAZA) == 3 +!ELSEIF $(MSIBUILD_PHASE) == 3 ###################################################################### -# 3. faza -# - Kompresija namestitvenega paketa +# 3rd Phase +# - MSI package compression ###################################################################### !INCLUDE "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" -!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak" +!INCLUDE "$(MSIBUILD_ROOT)\Version\Version.mak" -Vse :: \ +All :: \ "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.msi" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" -if exist $@ del /f /q $@ -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" - cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDDF //Nologo "$(@:"=).tmp" $** /O:"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET)" /K:LZX + cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET)" /C:LZX move /y "$(@:"=).tmp" $@ > NUL "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" \ @@ -191,7 +186,7 @@ Vse :: \ "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf" -if exist $@ del /f /q $@ copy /y "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" "$(@:"=).tmp" > NUL - cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NastaviCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf" /V + cscript.exe "$(MSIBUILD_ROOT)\MSI.wsf" //Job:SetCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf" /E msiinfo.exe "$(@:"=).tmp" /nologo /U 4 !IFDEF MANIFESTCERTIFICATETHUMBPRINT signcode.exe -i "$(MSIBUILD_VENDOR_URL)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSIBUILD_PRODUCT_NAME)" "$(@:"=).tmp" > NUL @@ -202,13 +197,13 @@ Vse :: \ !ELSE ###################################################################### -# Čistilna faza faza -# - Čiščenje modulov +# Cleanup phase +# - Cleaning modules ###################################################################### -Pocisti :: $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED) - cd "$(MSIBUILD_ROOT)\Verzija" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Pocisti +Clean :: $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED) + cd "$(MSIBUILD_ROOT)\Version" + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean cd "$(MAKEDIR)" -if exist "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" del /f /q "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" -if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" @@ -225,7 +220,7 @@ Pocisti :: $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED) $(MSIBUILD_MODULES) :: cd $(@D) - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Pocisti + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean cd "$(MAKEDIR)" !IFDEF MSIBUILD_MODULES_PRECOMPILED diff --git a/UI/Binary/UIMapaNova.ico b/UI/Binary/UIFolderNew.ico similarity index 100% rename from UI/Binary/UIMapaNova.ico rename to UI/Binary/UIFolderNew.ico diff --git a/UI/Binary/UIMapaGor.ico b/UI/Binary/UIFolderUp.ico similarity index 100% rename from UI/Binary/UIMapaGor.ico rename to UI/Binary/UIFolderUp.ico diff --git a/UI/Binary/UIObvestilo.ico b/UI/Binary/UIInfo.ico similarity index 100% rename from UI/Binary/UIObvestilo.ico rename to UI/Binary/UIInfo.ico diff --git a/UI/Binary/UIOpozorilo.ico b/UI/Binary/UIWarning.ico similarity index 100% rename from UI/Binary/UIOpozorilo.ico rename to UI/Binary/UIWarning.ico diff --git a/UI/Makefile b/UI/Makefile index cc235f1..74ae53c 100644 --- a/UI/Makefile +++ b/UI/Makefile @@ -1,6 +1,6 @@ -!INCLUDE "..\..\..\include\MSIBuildCfg.mak" -!IFDEF MSM_IMA_VERZIJO -!INCLUDE "..\Verzija\Verzija.mak" +!INCLUDE "..\..\include\MSIBuildCfg.mak" +!IFDEF MSIBUILD_HAS_VERSION +!INCLUDE "..\Version\Version.mak" !ENDIF MSIBUILD_IS_LOCALIZEABLE=1 @@ -9,9 +9,9 @@ MSIBUILD_IS_LOCALIZEABLE=1 ###################################################################### # AdminUISequence -Vse :: "$(LANG).$(CFG).$(PLAT).AdminUISequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).AdminUISequence-1.idt" -"$(LANG).$(CFG).$(PLAT).AdminUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AdminUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -37,45 +37,45 @@ ExecuteAction 1300 ###################################################################### # Binary -Vse :: \ - "$(LANG).$(CFG).$(PLAT).Binary-1" \ - "$(LANG).$(CFG).$(PLAT).Binary-1\UIOpozorilo.ico" \ - "$(LANG).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" \ - "$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" \ - "$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" \ - "$(LANG).$(CFG).$(PLAT).Binary-1.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Binary-1" \ + "$(LANG).$(PLAT).$(CFG).Binary-1\UIWarning.ico" \ + "$(LANG).$(PLAT).$(CFG).Binary-1\UIInfo.ico" \ + "$(LANG).$(PLAT).$(CFG).Binary-1\UIFolderNew.ico" \ + "$(LANG).$(PLAT).$(CFG).Binary-1\UIFolderUp.ico" \ + "$(LANG).$(PLAT).$(CFG).Binary-1.idt" -"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data s$(MSIBUILD_LENGTH_ID) v0 Binary Name -binUIOpozorilo.ico UIOpozorilo.ico -binUIObvestilo.ico UIObvestilo.ico -binUIMapaNova.ico UIMapaNova.ico -binUIMapaGor.ico UIMapaGor.ico +binUIOpozorilo.ico UIWarning.ico +binUIObvestilo.ico UIInfo.ico +binUIMapaNova.ico UIFolderNew.ico +binUIMapaGor.ico UIFolderUp.ico < NUL -"$(LANG).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" : "Binary\UIObvestilo.ico" +"$(LANG).$(PLAT).$(CFG).Binary-1\UIInfo.ico" : "Binary\UIInfo.ico" copy /y $** $@ > NUL -"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" : "Binary\UIMapaNova.ico" +"$(LANG).$(PLAT).$(CFG).Binary-1\UIFolderNew.ico" : "Binary\UIFolderNew.ico" copy /y $** $@ > NUL -"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" : "Binary\UIMapaGor.ico" +"$(LANG).$(PLAT).$(CFG).Binary-1\UIFolderUp.ico" : "Binary\UIFolderUp.ico" copy /y $** $@ > NUL ###################################################################### # CheckBox -Vse :: "$(LANG).$(CFG).$(PLAT).CheckBox-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).CheckBox-2.idt" -"Sl.$(CFG).$(PLAT).CheckBox-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).CheckBox-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Value @@ -83,25 +83,25 @@ s$(MSIBUILD_LENGTH_ID) S64 1250 CheckBox Property < NUL ###################################################################### # Control -Vse :: "$(LANG).$(CFG).$(PLAT).Control-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt" -"Sl.$(CFG).$(PLAT).Control-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(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 @@ -232,25 +232,25 @@ dlgFailed ctlText2 Text 15 89 370 24 196611 Prosimo, poskusite ponovno ali se o dlgFailed ctlClose PushButton 325 265 60 20 3 &Zapri ctlBannerBitmap < NUL ###################################################################### # ControlCondition -Vse :: "$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).ControlCondition-1.idt" -"$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ControlCondition-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Action Condition @@ -274,11 +274,11 @@ dlgCustomize ctlBrowse Disable Installed ###################################################################### # ControlEvent -Vse :: \ - "$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" \ - "$(LANG).$(CFG).$(PLAT).ControlEvent-2.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" \ + "$(LANG).$(PLAT).$(CFG).ControlEvent-2.idt" -"$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Event Argument Condition Ordering @@ -374,7 +374,7 @@ dlgUserExit ctlClose EndDialog Exit 1 1000 dlgFailed ctlClose EndDialog Exit 1 1000 < NUL Dialog_ Control_ Event Argument Condition Ordering @@ -392,25 +392,25 @@ dlgTypeMaintenance ctlContinue [Progress1] Odstranjujem InstallMode="Remove" 506 dlgTypeMaintenance ctlContinue [Progress2] Odstranitev InstallMode="Remove" 507 < NUL ###################################################################### # CustomAction -Vse :: "$(LANG).$(CFG).$(PLAT).CustomAction-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" -"$(LANG).$(CFG).$(PLAT).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -426,11 +426,11 @@ caSetInstallModeAdmin 51 InstallMode Server Image ###################################################################### # Dialog -Vse :: \ - "$(LANG).$(CFG).$(PLAT).Dialog-1.idt" \ - "$(LANG).$(CFG).$(PLAT).Dialog-2.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Dialog-1.idt" \ + "$(LANG).$(PLAT).$(CFG).Dialog-2.idt" -"$(LANG).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(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 @@ -457,7 +457,7 @@ dlgUserExit 50 50 400 300 3 [Setup] [SimpleProductName] [DisplayVersion] ctlTitl dlgFailed 50 50 400 300 3 [Setup] [SimpleProductName] [DisplayVersion] ctlTitle ctlClose ctlClose < NUL Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel @@ -466,25 +466,25 @@ s$(MSIBUILD_LENGTH_ID) i2 i2 i2 i2 I4 L128 s50 S50 S50 dlgError 50 50 260 120 65539 Napaka ErrorText < NUL ###################################################################### # EventMapping -Vse :: "$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).EventMapping-1.idt" -"$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).EventMapping-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control_ Event Attribute @@ -510,9 +510,9 @@ dlgBrowseAdmin ctlDirectoryCombo IgnoreChange IgnoreChange ###################################################################### # InstallUISequence -Vse :: "$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" -"$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -536,11 +536,11 @@ dlgProgress 1280 ###################################################################### # Property -Vse :: \ - "$(LANG).$(CFG).$(PLAT).Property-1.idt" \ - "$(LANG).$(CFG).$(PLAT).Property-2.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Property-1.idt" \ + "$(LANG).$(PLAT).$(CFG).Property-2.idt" -"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Value @@ -553,7 +553,7 @@ ErrorDialog dlgError InstallModeRB Change < NUL Property Value @@ -567,25 +567,25 @@ TitleCustomize Namestitev po meri ButtonTextInstall &Namesti zdaj < NUL ###################################################################### # RadioButton -Vse :: "$(LANG).$(CFG).$(PLAT).RadioButton-2.idt" +All :: "$(LANG).$(PLAT).$(CFG).RadioButton-2.idt" -"Sl.$(CFG).$(PLAT).RadioButton-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"Sl.$(PLAT).$(CFG).RadioButton-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Order Value X Y Width Height Text Help @@ -596,25 +596,25 @@ InstallModeRB 2 Repair 0 20 370 15 Ob&novi Odpravi napake pri namestitvi program InstallModeRB 3 Remove 0 40 370 15 &Odstrani Odstrani program z vašega računalnika.| < NUL ###################################################################### # TextStyle -Vse :: "$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" +All :: "$(LANG).$(PLAT).$(CFG).TextStyle-1.idt" -"$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).TextStyle-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL TextStyle FaceName Size Color StyleBits @@ -630,7 +630,7 @@ tsTitleVista Segoe UI 11 1 ###################################################################### -# Izdelava modula MSM +# Build MSM module! ###################################################################### !INCLUDE "..\MSM.mak" diff --git a/Version/Makefile b/Version/Makefile new file mode 100644 index 0000000..8bc401e --- /dev/null +++ b/Version/Makefile @@ -0,0 +1,99 @@ +!INCLUDE "..\..\include\MSIBuildCfg.mak" + +!IFNDEF MSIBUILD_VERSION_FILE +!ERROR Parameter MSIBUILD_VERSION_FILE is undefined. +!ENDIF + +All :: + +Clean :: + -if exist "Version.mak" del /f /q "Version.mak" + +!IFNDEF MSIBUILD_HAS_VERSION + +###################################################################### +# 1st Phase +# - Parse C++ version file and create NMake friendly variant. +###################################################################### + +All :: "Version.mak" + $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_HAS_VERSION=1 + +Version :: "Version.mak" + +"Version.mak" : "$(MSIBUILD_VERSION_FILE)" + -if exist $@ del /f /q $@ + -if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp" + grep.exe -e "#define[[:space:]]*.*_VERSION[[:space:]]*0x" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/.*0x\(.*\)/MSIBUILD_VERSION_NUM=\1/g" >> "$(@:"=).tmp" + grep.exe -e "#define[[:space:]]*.*_VERSION_STR[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSIBUILD_VERSION_STR=\1/g" >> "$(@:"=).tmp" + grep.exe -e "#define[[:space:]]*.*_VERSION_INST[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSIBUILD_VERSION_INST=\1/g" >> "$(@:"=).tmp" + grep.exe -e "#define[[:space:]]*.*_VERSION_GUID[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSIBUILD_VERSION_GUID=\1/g" >> "$(@:"=).tmp" + move /y "$(@:"=).tmp" $@ > NUL + +!ELSE + +###################################################################### +# 2nd Phase +# - Version file is ready, prepare the rest and compile module. +###################################################################### + +!INCLUDE "Version.mak" + +!IFNDEF MSIBUILD_UPGRADE_GUID +!ERROR Parameter MSIBUILD_UPGRADE_GUID is undefined. +!ENDIF + +!IFNDEF MSIBUILD_VERSION_INST +!ERROR Parameter MSIBUILD_VERSION_INST is undefined. +!ENDIF + +!IFNDEF MSIBUILD_VERSION_STR +!ERROR Parameter MSIBUILD_VERSION_STR is undefined. +!ENDIF + +!IFNDEF MSIBUILD_VERSION_GUID +!ERROR Parameter MSIBUILD_VERSION_GUID is undefined. +!ENDIF + + +###################################################################### +# Property + +All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt" + +"$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "Version.mak" "..\..\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +Property Value +s$(MSIBUILD_LENGTH_ID) l0 +Property Property +ProductVersion $(MSIBUILD_VERSION_INST) +DisplayVersion $(MSIBUILD_VERSION_STR) +ProductCode $(MSIBUILD_VERSION_GUID) +UpgradeCode $(MSIBUILD_UPGRADE_GUID) +< NUL +UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty +s38 S20 S20 S255 i4 S255 s$(MSIBUILD_LENGTH_ID) +Upgrade UpgradeCode VersionMin VersionMax Language Attributes +$(MSIBUILD_UPGRADE_GUID) 0 257 OLDPRODUCTFOUND +$(MSIBUILD_UPGRADE_GUID) $(MSIBUILD_VERSION_INST) 2 NEWPRODUCTFOUND +<> "$(@:"=).tmp" - grep.exe -e "#define[[:space:]]*.*_VERZIJA_STR[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_STR=\1/g" >> "$(@:"=).tmp" - grep.exe -e "#define[[:space:]]*.*_VERZIJA_INST[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_INST=\1/g" >> "$(@:"=).tmp" - grep.exe -e "#define[[:space:]]*.*_VERZIJA_GUID[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_GUID=\1/g" >> "$(@:"=).tmp" - move /y "$(@:"=).tmp" $@ > NUL - -!ELSE - -###################################################################### -# 2. faza -# - Imamo datoteko z verzijo, pripravimo druge datoteke in modul. -###################################################################### - -!INCLUDE "Verzija.mak" - -!IFNDEF MSIBUILD_UPGRADE_GUID -!ERROR Spremenljivka MSIBUILD_UPGRADE_GUID ni definirana! -!ENDIF - -!IFNDEF MSI_VERZIJA_INST -!ERROR Spremenljivka MSI_VERZIJA_INST ni definirana! -!ENDIF - -!IFNDEF MSI_VERZIJA_STR -!ERROR Spremenljivka MSI_VERZIJA_STR ni definirana! -!ENDIF - -!IFNDEF MSI_VERZIJA_GUID -!ERROR Spremenljivka MSI_VERZIJA_GUID ni definirana! -!ENDIF - - -###################################################################### -# Property - -Vse :: "$(LANG).$(CFG).$(PLAT).Property-1.idt" - -"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "Verzija.mak" "..\..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ - move /y << $@ > NUL -Property Value -s$(MSIBUILD_LENGTH_ID) l0 -Property Property -ProductVersion $(MSI_VERZIJA_INST) -DisplayVersion $(MSI_VERZIJA_STR) -ProductCode $(MSI_VERZIJA_GUID) -UpgradeCode $(MSIBUILD_UPGRADE_GUID) -< NUL -UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty -s38 S20 S20 S255 i4 S255 s$(MSIBUILD_LENGTH_ID) -Upgrade UpgradeCode VersionMin VersionMax Language Attributes -$(MSIBUILD_UPGRADE_GUID) 0 257 OLDPRODUCTFOUND -$(MSIBUILD_UPGRADE_GUID) $(MSI_VERZIJA_INST) 2 NEWPRODUCTFOUND -<