Amebis/MSICALib
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:57:02 +02:00
parent 8f264447dd
commit 37479173a2
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MSIBuild/Makefile
View File

@ -37,7 +37,7 @@ i2 L0
Error Error Error Error
<<NOKEEP <<NOKEEP
"En.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "en_US.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Error Message Error Message
@ -68,11 +68,11 @@ i2 L0
2576 Error [5] setting profile "[3]" on WLAN interface [2] (WLAN reason is [4]). Please, contact your support personnel. 2576 Error [5] setting profile "[3]" on WLAN interface [2] (WLAN reason is [4]). Please, contact your support personnel.
<<NOKEEP <<NOKEEP
!IF "$(LANG)" == "En" !IF "$(LANG)" == "en_US"
"En.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "en_US.$(PLAT).$(CFG).Error-2.idt" : "en_US.$(PLAT).$(CFG).Error-2.idtx"
copy /y $** $@ > NUL copy /y $** $@ > NUL
!ELSE !ELSE
"$(LANG).$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" "$(LANG).$(PLAT).$(CFG).Error-2.idt" : "en_US.$(PLAT).$(CFG).Error-2.idtx" "..\locale\$(LANG).po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
!ENDIF !ENDIF

12
MSIBuild/build_all.bat
View File

@ -1,9 +1,5 @@
@echo off @echo off
nmake.exe /ls All LANG=En CFG=Debug PLAT=Win32 nmake.exe /ls All LANG=en_US CFG=Debug PLAT=Win32
nmake.exe /ls All LANG=Sl CFG=Debug PLAT=Win32 nmake.exe /ls All LANG=en_US CFG=Debug PLAT=x64
nmake.exe /ls All LANG=En CFG=Debug PLAT=x64 nmake.exe /ls All LANG=en_US CFG=Release PLAT=Win32
nmake.exe /ls All LANG=Sl CFG=Debug PLAT=x64 nmake.exe /ls All LANG=en_US CFG=Release PLAT=x64
nmake.exe /ls All LANG=En CFG=Release PLAT=Win32
nmake.exe /ls All LANG=Sl CFG=Release PLAT=Win32
nmake.exe /ls All LANG=En CFG=Release PLAT=x64
nmake.exe /ls All LANG=Sl CFG=Release PLAT=x64

12
MSIBuild/clean_all.bat
View File

@ -1,9 +1,5 @@
@echo off @echo off
nmake.exe /ls Clean LANG=En CFG=Debug PLAT=Win32 nmake.exe /ls Clean LANG=en_US CFG=Debug PLAT=Win32
nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=Win32 nmake.exe /ls Clean LANG=en_US CFG=Debug PLAT=x64
nmake.exe /ls Clean LANG=En CFG=Debug PLAT=x64 nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=Win32
nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=x64 nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=x64
nmake.exe /ls Clean LANG=En CFG=Release PLAT=Win32
nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=Win32
nmake.exe /ls Clean LANG=En CFG=Release PLAT=x64
nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=x64