Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

MSI module Makefile simplified

Browse Source
This commit is contained in:
Simon Rozman 2016-10-11 11:03:41 +02:00
parent 916b466909
commit 15693f643f
5 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MSI/ZRCola/Main/Makefile
View File

@ -19,6 +19,10 @@
!INCLUDE "..\..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
!IFNDEF MSIBUILD_LANGID
!ERROR Parameter MSIBUILD_LANGID is undefined.
!ENDIF
MSIBUILD_IS_LOCALIZEABLE=1 MSIBUILD_IS_LOCALIZEABLE=1
@ -305,14 +309,8 @@ fileZRCola_Re.otf compZRCola_Re.otf ZRCOLA~1.OTF|ZRCola_Re.otf 0 0 1
fileZRCola_It.otf compZRCola_It.otf ZRCOLA~2.OTF|ZRCola_It.otf 0 0 1 fileZRCola_It.otf compZRCola_It.otf ZRCOLA~2.OTF|ZRCola_It.otf 0 0 1
fileZRCola_Bd.otf compZRCola_Bd.otf ZRCOLA~3.OTF|ZRCola_Bd.otf 0 0 1 fileZRCola_Bd.otf compZRCola_Bd.otf ZRCOLA~3.OTF|ZRCola_Bd.otf 0 0 1
fileZRCola_BI.otf compZRCola_BI.otf ZRCOLA~4.OTF|ZRCola_BI.otf 0 0 1 fileZRCola_BI.otf compZRCola_BI.otf ZRCOLA~4.OTF|ZRCola_BI.otf 0 0 1
!IF "$(LANG)" == "ru_RU" filewxstd.mo.$(LANG) compwxstd.mo.$(LANG) wxstd.mo 0 $(MSIBUILD_LANGID) 0 1
filewxstd.mo.ru_RU compwxstd.mo.ru_RU wxstd.mo 0 1060 0 1 fileZRCola.zrcdb.mo.$(LANG) compZRCola.zrcdb.mo.$(LANG) ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 $(MSIBUILD_LANGID) 0 1
fileZRCola.zrcdb.mo.ru_RU compZRCola.zrcdb.mo.ru_RU ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 1060 0 1
!ENDIF
!IF "$(LANG)" == "sl_SI"
filewxstd.mo.sl_SI compwxstd.mo.sl_SI wxstd.mo 0 1060 0 1
fileZRCola.zrcdb.mo.sl_SI compZRCola.zrcdb.mo.sl_SI ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 1060 0 1
!ENDIF
<<NOKEEP <<NOKEEP

2
Updater

@ -1 +1 @@
Subproject commit 3cab0a45a928b5951a1bfabbf399a83ab87633a2 Subproject commit 940719d2d39ed5251292d8ccba759f562027bf2d

33
ZRCola/MSIBuild/Makefile
View File

@ -19,6 +19,10 @@
!INCLUDE "..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\include\MSIBuildCfg.mak"
!IFNDEF MSIBUILD_LANGID
!ERROR Parameter MSIBUILD_LANGID is undefined.
!ENDIF
MSIBUILD_IS_LOCALIZEABLE=1 MSIBUILD_IS_LOCALIZEABLE=1
@ -246,22 +250,12 @@ featZRCola compLanguage
featZRCola compDatabasePath featZRCola compDatabasePath
featZRCola compZRCola.zrcdb featZRCola compZRCola.zrcdb
featZRCola compZRCola_Re.otf featZRCola compZRCola_Re.otf
!IF "$(LANG)" == "ru_RU" featZRCola compZRCola.mo.$(LANG)
featZRCola compZRCola.mo.ru_RU featZRCola compZRCola.zrcdb.mo.$(LANG)
featZRCola compZRCola.zrcdb.mo.ru_RU featZRCola complibZRColaUI.mo.$(LANG)
featZRCola complibZRColaUI.mo.ru_RU featZRCola compwxExtend.mo.$(LANG)
featZRCola compwxExtend.mo.ru_RU featZRCola compUpdater.mo.$(LANG)
featZRCola compUpdater.mo.ru_RU featZRCola compwxstd.mo.$(LANG)
featZRCola compwxstd.mo.ru_RU
!ENDIF
!IF "$(LANG)" == "sl_SI"
featZRCola compZRCola.mo.sl_SI
featZRCola compZRCola.zrcdb.mo.sl_SI
featZRCola complibZRColaUI.mo.sl_SI
featZRCola compwxExtend.mo.sl_SI
featZRCola compUpdater.mo.sl_SI
featZRCola compwxstd.mo.sl_SI
!ENDIF
<<NOKEEP <<NOKEEP
@ -277,12 +271,7 @@ File Component_ FileName FileSize Version Language Attributes Sequence
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2
File File File File
fileZRCola.exe.$(PLAT) compZRCola.exe.$(PLAT) ZRCola.exe 0 0 1536 1 fileZRCola.exe.$(PLAT) compZRCola.exe.$(PLAT) ZRCola.exe 0 0 1536 1
!IF "$(LANG)" == "ru_RU" fileZRCola.mo.$(LANG) compZRCola.mo.$(LANG) ZRCola.mo 0 $(MSIBUILD_LANGID) 0 1
fileZRCola.mo.ru_RU compZRCola.mo.ru_RU ZRCola.mo 0 1060 0 1
!ENDIF
!IF "$(LANG)" == "sl_SI"
fileZRCola.mo.sl_SI compZRCola.mo.sl_SI ZRCola.mo 0 1060 0 1
!ENDIF
<<NOKEEP <<NOKEEP

11
lib/libZRColaUI/MSIBuild/Makefile
View File

@ -19,6 +19,10 @@
!INCLUDE "..\..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
!IFNDEF MSIBUILD_LANGID
!ERROR Parameter MSIBUILD_LANGID is undefined.
!ENDIF
###################################################################### ######################################################################
# AppSearch # AppSearch
@ -108,12 +112,7 @@ filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~6.DLL|libZRColaUI10u_vc10
filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll 0 0 1536 1 filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll 0 0 1536 1
!ENDIF !ENDIF
!ENDIF !ENDIF
!IF "$(LANG)" == "ru_RU" filelibZRColaUI.mo.$(LANG) complibZRColaUI.mo.$(LANG) LIBZRC~1.MO|libZRColaUI.mo 0 $(MSIBUILD_LANGID) 0 1
filelibZRColaUI.mo.ru_RU complibZRColaUI.mo.ru_RU LIBZRC~1.MO|libZRColaUI.mo 0 1060 0 1
!ENDIF
!IF "$(LANG)" == "sl_SI"
filelibZRColaUI.mo.sl_SI complibZRColaUI.mo.sl_SI LIBZRC~1.MO|libZRColaUI.mo 0 1060 0 1
!ENDIF
<<NOKEEP <<NOKEEP

2
lib/wxExtend

@ -1 +1 @@
Subproject commit 49aa002388e9e2b6431fbdc43202995c4a1fa355 Subproject commit edbf54f510a8d0a45e1e65bf12fb4a5c04cea50f