strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnumake2: simplify repository setup

Browse source
This commit is contained in:
Bjoern Michaelsen 2010-11-11 19:01:45 +01:00
parent 36cd76751c
commit 0127304341
2 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Repository.mk
View file

@ -38,7 +38,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
g2g \ g2g \
)) ))
gb_Library_OOOLIBS +=\ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
avmedia \ avmedia \
basegfx \ basegfx \
cui \ cui \
@ -74,51 +74,54 @@ gb_Library_OOOLIBS +=\
xo \ xo \
xof \ xof \
xcr \ xcr \
))
gb_Library_PLAINLIBS_URE +=\ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
xml2 \ xml2 \
))
gb_Library_PLAINLIBS_OOO +=\ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icuuc \ icuuc \
))
# => OOOLIB $(eval $(call gb_Helper_register_libraries,RTLIBS, \
gb_Library_RTLIBS +=\
comphelper \ comphelper \
i18nisolang1 \ i18nisolang1 \
i18nutil \ i18nutil \
ucbhelper \ ucbhelper \
vos3 \ vos3 \
))
# => URELIB $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
gb_Library_RTVERLIBS +=\
cppuhelper \ cppuhelper \
salhelper \ salhelper \
))
# => URELIB $(eval $(call gb_Helper_register_libraries,STLLIBS, \
gb_Library_STLLIBS +=\
stl \ stl \
))
gb_Library_UNOLIBS_URE +=\ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
gb_Library_UNOLIBS_OOO +=\
fsstorage \ fsstorage \
hatchwindowfactory \ hatchwindowfactory \
passwordcontainer \ passwordcontainer \
productregistration \ productregistration \
vbaswobj \ vbaswobj \
))
# => URELIB $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
gb_Library_UNOVERLIBS +=\
cppu \ cppu \
jvmfwk \ jvmfwk \
sal \ sal \
))
gb_StaticLibrary_PLAINLIBS +=\ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
jpeglib \ jpeglib \
ooopathutils \ ooopathutils \
salcpprt \ salcpprt \
zlib \ zlib \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

22
solenv/gbuild/Helper.mk
View file

@ -126,11 +126,12 @@ endef
define gb_Helper_add_repositories define gb_Helper_add_repositories
$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
endef endef
define gb_Helper_init_registries define gb_Helper_init_registries
gb_Executable_VALIDLAYERS := UREBIN SDK OOO BRAND NONE gb_Executable_VALIDLAYERS := UREBIN SDK OOO BRAND NONE
gb_Library_VALIDLAYERS := PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS gb_Library_VALIDLAYERS := OOOLIBS PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
gb_StaticLibrary_VALIDLAYERS := PLAINLIBS gb_StaticLibrary_VALIDLAYERS := PLAINLIBS
gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER
gb_StaticLibrary_NAMESCHEMES := PLAIN gb_StaticLibrary_NAMESCHEMES := PLAIN
@ -167,6 +168,25 @@ $$(error $(1) is not a valid layer for executables. Valid layers are: $$(gb_Exec
endif endif
gb_Executable_$(1) += $(2) gb_Executable_$(1) += $(2)
endef
define gb_Helper_register_libraries
ifeq ($$(filter $(1),$$(gb_Library_VALIDLAYERS)),)
$$(error $(1) is not a valid layer for layer. Valid layers are: $$(gb_Library_VALIDLAYERS))
endif
gb_Library_$(1) += $(2)
endef
define gb_Helper_register_static_libraries
ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDLAYERS)),)
$$(error $(1) is not a valid layer for layer. Valid layers are: $$(gb_StaticLibrary_VALIDLAYERS))
endif
gb_StaticLibrary_$(1) += $(2)
endef endef
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: