revamp Rdb class

solenv/gbuild/RdbTarget.mk → solenv/gbuild/Rdb.mk

@@ -25,73 +25,62 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
-gb_RdbTarget__get_rdbs = \
-    $(foreach component,$(1),$(call gb_ComponentTarget_get_target,$(component))) \
-    $(foreach component,$(2),$(call gb_RdbTarget__get_old_component_target,$(component)))
+# Component paths created by the old build system does not contain any
+# directories.
+gb_Rdb__is_old_component_target = $(if $(findstring /,$(1)),$(false),$(true))
 
-$(call gb_RdbTarget_get_target,%) :
+gb_Rdb__get_old_component_target = $(OUTDIR)/xml/$(1).component
+
+define gb_Rdb__get_component_target
+$(strip $(if $(call gb_Rdb__is_old_component_target,$(component))\
+	,$(call gb_Rdb__get_old_component_target,$(component))\
+	,$(call gb_ComponentTarget_get_outdir_target,$(component))))
+endef
+
+define gb_Rdb__command
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $@) && \
+	(\
+		echo '<list>' && \
+		$(foreach component,$(COMPONENTS),echo "<filename>$(call gb_Rdb__get_component_target,$(component))</filename>" &&) \
+		echo '</list>' \
+	) > $(1).input && \
+	$(gb_XSLTPROC) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \
+	rm $(1).input)
+endef
+
+$(call gb_Rdb_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),RDB,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		$(if $(strip $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS))),, \
-			$(error no components to register, check RdbTarget is included in gb_Module_add_check_targets - no rdb files)) \
-		echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \
-		$(gb_AWK) -- \
-			' BEGIN { RS=">"; } \
-			/^<\?xml version.*/ { next; } \
-			/.*[^\r\n\t\s].*/ { print $$0 ">"; }' \
-            $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
-			>> $@ && \
-		echo '</components>' >> $@)
+	$(call gb_Rdb__command,$@,$*,$?,$^)
 
-.PHONY : $(call gb_RdbTarget_get_clean_target,%)
-$(call gb_RdbTarget_get_clean_target,%) :
+.PHONY : $(call gb_Rdb_get_clean_target,%)
+$(call gb_Rdb_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),RDB,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_RdbTarget_get_outdir_target,$*) $(call gb_RdbTarget_get_target,$*))
+		rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
 
-$(call gb_RdbTarget_get_outdir_target,%) :
+$(call gb_Rdb_get_outdir_target,%) :
 	$(call gb_Deliver_deliver,$<,$@)
 
-define gb_RdbTarget_RdbTarget
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS :=
-ifeq ($(2),$(true))
-$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
-endif
-# depend on the last sourced makefile, which should contain the declaration of this target
-# thus, when you change the RdbTarget_*.mk, the target will get rebuild
-$(call gb_RdbTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
-
-$$(eval $$(call gb_Module_register_target,$(call gb_RdbTarget_get_target,$(1)),$(call gb_RdbTarget_get_clean_target,$(1))))
-endef
-
-define gb_RdbTarget_add_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
-
-endef
-
-define gb_RdbTarget_add_components
-$(foreach component,$(2),$(call gb_RdbTarget_add_component,$(1),$(component)))
+define gb_Rdb_Rdb
+$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
+$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS :=
+$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
 
+$$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
 endef
 
-define gb_RdbTarget_add_old_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call gb_RdbTarget__get_old_component_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
+define gb_Rdb_add_component
+$(call gb_Rdb_get_target,$(1)) : $(call gb_Rdb__get_component_target,$(2))
+$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
+$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2)
 
 endef
 
-define gb_RdbTarget_add_old_components
-$(foreach component,$(2),$(call gb_RdbTarget_add_old_component,$(1),$(component)))
+define gb_Rdb_add_components
+$(foreach component,$(2),$(call gb_Rdb_add_component,$(1),$(component)))
 
 endef
 
-# vim: set noet sw=4:
+# vim: set noet sw=4 ts=4:

solenv/gbuild/TargetLocations.mk

@@ -41,7 +41,7 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/lib \
 
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
-gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
+gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
 gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
@@ -106,7 +106,7 @@ gb_Package_get_target = $(WORKDIR)/Package/$(1)
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
 gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
 gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
-gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
+gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
 gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
@@ -164,7 +164,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	PackagePart \
 	Package \
 	Pyuno \
-	RdbTarget \
+	Rdb \
 	ResTarget \
 	SdiTarget \
 	SrsTarget \

solenv/gbuild/gbuild.mk

@@ -283,7 +283,7 @@ include $(foreach class, \
 	CustomTarget \
 	ExternalLib \
 	Pyuno \
-	RdbTarget \
+	Rdb \
 	CppunitTest \
 	Jar \
 	JavaClassSet \