diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-11 15:36:05 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-11 15:36:05 +0100 |
| commit | 21ee80adaf704b3c09a17a33888a3904ff2cec35 (patch) | |
| tree | 71db8e3c7ad5c1b1084abb34c259d73a4fd03b96 /solenv | |
| parent | gnumake2: error out on local builds when those where explicitly disabled (diff) | |
| download | core-21ee80adaf704b3c09a17a33888a3904ff2cec35.tar.gz core-21ee80adaf704b3c09a17a33888a3904ff2cec35.zip | |
gnumake2: simpified repository setup
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 60 | ||||
| -rwxr-xr-x | solenv/gbuild/gbuild.mk | 32 |
2 files changed, 59 insertions, 33 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 9e9561975436..c35bf864df1e 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -109,13 +109,63 @@ define gb_Helper_deliver $(call gb_Helper__deliverprefix,$(2)) cp -f $(1) $(2) && touch -r $(1) $(2) endef -define gb_Helper_add_repo -gb_REPOSITORYDIRNAME := +define gb_Helper_register_repository +gb_Helper_CURRENTREPOSITORY := $(1) + +endef + +define gb_Helper_add_repository +gb_Helper_CURRENTREPOSITORY := include $(1)/Repository.mk -ifeq ($$(gb_REPOSITORYDIRNAME),) -$$(error no gb_REPOSITORYDIRNAME set for repository $(1)) +ifeq ($$(gb_Helper_CURRENTREPOSITORY),) +$$(error no gb_Helper_register_repository in Repository.mk for repository $(1)) endif -$$(gb_REPOSITORYDIRNAME) := $(1) +$$(gb_Helper_CURRENTREPOSITORY) := $(1) + +endef + +define gb_Helper_add_repositories +$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) +endef + +define gb_Helper_init_registries +gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER +gb_StaticLibrary_NAMESCHEMES := PLAIN + +gb_Executable_UREBIN := +gb_Executable_SDK := +gb_Executable_OOO := +gb_Executable_BRAND := +gb_Executable_NONE := +gb_Library_OOOLIBS := +gb_Library_PLAINLIBS_URE := +gb_Library_PLAINLIBS_OOO := +gb_Library_RTLIBS := +gb_Library_RTVERLIBS := +gb_Library_STLLIBS := +gb_Library_UNOLIBS_URE := +gb_Library_UNOLIBS_OOO := +gb_Library_UNOVERLIBS := +gb_StaticLibrary_PLAINLIBS := +endef + +define gb_Helper_collect_libtargets +gb_Library_PLAINLIBS := \ + $$(gb_Library_PLAINLIBS_URE) \ + $$(gb_Library_PLAINLIBS_OOO) \ + +gb_Library_UNOLIBS := \ + $$(gb_Library_UNOLIBS_URE) \ + $$(gb_Library_UNOLIBS_OOO) \ + +gb_Library_TARGETS := $$(foreach namescheme,$$(gb_Library_NAMESCHEMES),$$(gb_Library_$$(namescheme)LIBS)) +gb_StaticLibrary_TARGETS := $$(foreach namescheme,$$(gb_StaticLibrary_NAMESCHEMES),$$(gb_StaticLibrary_$$(namescheme)LIBS)) + +endef + +define gb_Helper_collect_knownlibs +gb_Library_KNOWNLIBS := $$(foreach namescheme,$$(gb_Library_NAMESCHEMES),$$(gb_Library_$$(namescheme)LIBS)) +gb_StaticLibrary_KNOWNLIBS := $$(foreach namescheme,$$(gb_StaticLibrary_NAMESCHEMES),$$(gb_StaticLibrary_$$(namescheme)LIBS)) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 1da6d8dd08af..e53d5ba54514 100755 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -88,21 +88,10 @@ gb_FULLDEPS := $(true) endif include $(GBUILDDIR)/Helper.mk -gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER -gb_StaticLibrary_NAMESCHEMES := PLAIN -$(foreach repo,$(gb_REPOS),$(eval $(call gb_Helper_add_repo,$(repo)))) - -gb_Library_PLAINLIBS := \ - $(gb_Library_PLAINLIBS_URE) \ - $(gb_Library_PLAINLIBS_OOO) \ - -gb_Library_UNOLIBS := \ - $(gb_Library_UNOLIBS_URE) \ - $(gb_Library_UNOLIBS_OOO) \ - -gb_Library_TARGETS := $(foreach namescheme,$(gb_Library_NAMESCHEMES),$(gb_Library_$(namescheme)LIBS)) -gb_StaticLibrary_TARGETS := $(foreach namescheme,$(gb_StaticLibrary_NAMESCHEMES),$(gb_StaticLibrary_$(namescheme)LIBS)) +$(eval $(call gb_Helper_init_registries)) +$(eval $(call gb_Helper_add_repositories,$(gb_REPOS))) +$(eval $(call gb_Helper_collect_libtargets)) ifeq ($(OS),LINUX) include $(GBUILDDIR)/platform/linux.mk @@ -124,20 +113,7 @@ endif include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk) -gb_Library_KNOWNLIBS := $(foreach namescheme,$(gb_Library_NAMESCHEMES),$(gb_Library_$(namescheme)LIBS)) -gb_StaticLibrary_KNOWNLIBS := $(foreach namescheme,$(gb_StaticLibrary_NAMESCHEMES),$(gb_StaticLibrary_$(namescheme)LIBS)) - -ifeq ($(USE_SYSTEM_STL),YES) -gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) -endif - -ifeq ($(SYSTEM_LIBXML),YES) -gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS)) -endif - -ifeq ($(SYSTEM_ICU),YES) -gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS)) -endif +$(eval $(call gb_Helper_collect_knownlibs)) gb_GLOBALDEFS := \ -D__DMAKE \ |