Adaptation to MSIBuild updates

- 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:50:41 +02:00
parent e740e29e3d
commit 2599029595
3 changed files with 12 additions and 20 deletions

View File

@ -91,7 +91,7 @@ WLANProfile Component_ N Component 1 Identifier Component the profile is part
All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt"
"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
"en_US.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
Action Description Template
@ -108,11 +108,11 @@ StartServicesExec Starting services Service: [1]
InstallScheduledTasksExec Installing scheduled tasks Scheduled task: [1]
<<NOKEEP
!IF "$(LANG)" == "En"
"En.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx"
!IF "$(LANG)" == "en_US"
"en_US.$(PLAT).$(CFG).ActionText-2.idt" : "en_US.$(PLAT).$(CFG).ActionText-2.idtx"
copy /y $** $@ > NUL
!ELSE
"$(LANG).$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po"
"$(LANG).$(PLAT).$(CFG).ActionText-2.idt" : "en_US.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\$(LANG).po"
rcxgettext.exe idtp $@ $**
!ENDIF

View File

@ -1,9 +1,5 @@
@echo off
nmake.exe /ls All LANG=En CFG=Debug PLAT=Win32
nmake.exe /ls All LANG=Sl CFG=Debug PLAT=Win32
nmake.exe /ls All LANG=En CFG=Debug PLAT=x64
nmake.exe /ls All LANG=Sl CFG=Debug 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
nmake.exe /ls All LANG=en_US CFG=Debug PLAT=Win32
nmake.exe /ls All LANG=en_US CFG=Debug PLAT=x64
nmake.exe /ls All LANG=en_US CFG=Release PLAT=Win32
nmake.exe /ls All LANG=en_US CFG=Release PLAT=x64

View File

@ -1,9 +1,5 @@
@echo off
nmake.exe /ls Clean LANG=En CFG=Debug PLAT=Win32
nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=Win32
nmake.exe /ls Clean LANG=En CFG=Debug PLAT=x64
nmake.exe /ls Clean LANG=Sl CFG=Debug 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
nmake.exe /ls Clean LANG=en_US CFG=Debug PLAT=Win32
nmake.exe /ls Clean LANG=en_US CFG=Debug PLAT=x64
nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=Win32
nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=x64