Amebis/Updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adaptation to MSIBuild updates

Browse Source 
- Source file English "en_US" instead of generic "En" now
- MSIBUILD_LANG_PO merged to LANG
This commit is contained in:
Simon Rozman 2016-09-19 09:51:06 +02:00
parent 07c11ef392
commit 83298f96da
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UpdCheck/MSIBuild/Makefile
View File

@ -47,7 +47,7 @@ compUpdCheck.exe.x64 {9245E7EC-EDBD-41E1-858B-88810F3AFDD6} $(UPDATER_BIN_DIR) 2
All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt"
"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Feature Feature_Parent Title Description Display Level Directory_ Attributes Feature Feature_Parent Title Description Display Level Directory_ Attributes
@ -56,11 +56,11 @@ s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_
featUpdCheck $(UPDATER_FEATURE_ROOT) Automatic Updating Task for background product updating 1001 2 $(UPDATER_BIN_DIR) 8 featUpdCheck $(UPDATER_FEATURE_ROOT) Automatic Updating Task for background product updating 1001 2 $(UPDATER_BIN_DIR) 8
<<NOKEEP <<NOKEEP
!IF "$(LANG)" == "En" !IF "$(LANG)" == "en_US"
"En.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "en_US.$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx"
copy /y $** $@ > NUL copy /y $** $@ > NUL
!ELSE !ELSE
"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" "$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
!ENDIF !ENDIF
@ -102,7 +102,7 @@ fileUpdCheck.exe.$(PLAT) compUpdCheck.exe.$(PLAT) UPDCHECK.EXE|UpdCheck.exe 0 0
All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-2.idt" All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-2.idt"
"En.$(PLAT).$(CFG).ScheduledTask-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "en_US.$(PLAT).$(CFG).ScheduledTask-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_ Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_
@ -111,11 +111,11 @@ s$(MSIBUILD_LENGTH_ID) l255 s255 S255 s$(MSIBUILD_LENGTH_ID) i4 i4 S255 S255 L25
stUpdCheck.$(PLAT) [SimpleProductName] Update [#fileUpdCheck.exe.$(PLAT)] $(UPDATER_BIN_DIR) 0 32 [Manufacturer] Regularly checks for program updates, downloads, and installs them -1 compUpdCheck.exe.$(PLAT) stUpdCheck.$(PLAT) [SimpleProductName] Update [#fileUpdCheck.exe.$(PLAT)] $(UPDATER_BIN_DIR) 0 32 [Manufacturer] Regularly checks for program updates, downloads, and installs them -1 compUpdCheck.exe.$(PLAT)
<<NOKEEP <<NOKEEP
!IF "$(LANG)" == "En" !IF "$(LANG)" == "en_US"
"En.$(PLAT).$(CFG).ScheduledTask-2.idt" : "En.$(PLAT).$(CFG).ScheduledTask-2.idtx" "en_US.$(PLAT).$(CFG).ScheduledTask-2.idt" : "en_US.$(PLAT).$(CFG).ScheduledTask-2.idtx"
copy /y $** $@ > NUL copy /y $** $@ > NUL
!ELSE !ELSE
"$(LANG).$(PLAT).$(CFG).ScheduledTask-2.idt" : "En.$(PLAT).$(CFG).ScheduledTask-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" "$(LANG).$(PLAT).$(CFG).ScheduledTask-2.idt" : "en_US.$(PLAT).$(CFG).ScheduledTask-2.idtx" "..\locale\$(LANG).po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
!ENDIF !ENDIF

12
Updater/MSIBuild/Makefile
View File

@ -45,10 +45,10 @@ compUpdater.dll.Win32 {F4962976-71C3-4200-B736-BC841FEE29C2} $(UPDATER_BIN_DIR)
!IF "$(PLAT)" == "x64" !IF "$(PLAT)" == "x64"
compUpdater.dll.x64 {A968C387-EC14-4CAC-8406-F21C9779D3EF} $(UPDATER_BIN_DIR) 256 fileUpdater.dll.x64 compUpdater.dll.x64 {A968C387-EC14-4CAC-8406-F21C9779D3EF} $(UPDATER_BIN_DIR) 256 fileUpdater.dll.x64
!ENDIF !ENDIF
!IF "$(LANG)" == "Ru" !IF "$(LANG)" == "ru_RU"
compUpdater.mo.ru_RU {486A9DDF-A43B-4920-BEF9-2907DD8660AD} UPDATERLOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.ru_RU compUpdater.mo.ru_RU {486A9DDF-A43B-4920-BEF9-2907DD8660AD} UPDATERLOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.ru_RU
!ENDIF !ENDIF
!IF "$(LANG)" == "Sl" !IF "$(LANG)" == "sl_SI"
compUpdater.mo.sl_SI {2A56FA39-F4E6-492F-A863-AFE9E53FA988} UPDATERLOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.sl_SI compUpdater.mo.sl_SI {2A56FA39-F4E6-492F-A863-AFE9E53FA988} UPDATERLOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.sl_SI
!ENDIF !ENDIF
<<NOKEEP <<NOKEEP
@ -65,10 +65,10 @@ All :: "$(LANG).$(PLAT).$(CFG).Directory-1.idt"
Directory Directory_Parent DefaultDir Directory Directory_Parent DefaultDir
s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) l255 s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) l255
Directory Directory Directory Directory
!IF "$(LANG)" == "Ru" !IF "$(LANG)" == "ru_RU"
UPDATERLOCRURUDIR $(UPDATER_LOC_DIR) ru_RU UPDATERLOCRURUDIR $(UPDATER_LOC_DIR) ru_RU
!ENDIF !ENDIF
!IF "$(LANG)" == "Sl" !IF "$(LANG)" == "sl_SI"
UPDATERLOCSLSIDIR $(UPDATER_LOC_DIR) sl_SI UPDATERLOCSLSIDIR $(UPDATER_LOC_DIR) sl_SI
!ENDIF !ENDIF
<<NOKEEP <<NOKEEP
@ -101,10 +101,10 @@ fileUpdater.dll.x64 compUpdater.dll.x64 UPDATE~6.DLL|Updater10u_vc100_x64.dll 0
fileUpdater.dll.x64 compUpdater.dll.x64 UPDATE~8.DLL|Updater10ud_vc100_x64.dll 0 0 1536 1 fileUpdater.dll.x64 compUpdater.dll.x64 UPDATE~8.DLL|Updater10ud_vc100_x64.dll 0 0 1536 1
!ENDIF !ENDIF
!ENDIF !ENDIF
!IF "$(LANG)" == "Ru" !IF "$(LANG)" == "ru_RU"
fileUpdater.mo.ru_RU compUpdater.mo.ru_RU UPDATE~1.MO|Updater10.mo 0 1060 0 1 fileUpdater.mo.ru_RU compUpdater.mo.ru_RU UPDATE~1.MO|Updater10.mo 0 1060 0 1
!ENDIF !ENDIF
!IF "$(LANG)" == "Sl" !IF "$(LANG)" == "sl_SI"
fileUpdater.mo.sl_SI compUpdater.mo.sl_SI UPDATE~1.MO|Updater10.mo 0 1060 0 1 fileUpdater.mo.sl_SI compUpdater.mo.sl_SI UPDATE~1.MO|Updater10.mo 0 1060 0 1
!ENDIF !ENDIF
<<NOKEEP <<NOKEEP