[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/RdbTarget.mk |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8412974348794d6ab1419baecbaae51c2e15d5c7
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 5 02:52:45 2011 +0200

    split records for awks little brain (also improve readability)

diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 5ced7ed..fa9ab78 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -34,8 +34,13 @@ $(call gb_RdbTarget_get_target,%) :
 		mkdir -p $(dir $@) && \
 		echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \
 		$(gb_AWK) -- \
-			'/^<\?xml version.*/ { next; } \
-			{ gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
+			' BEGIN { RS=">"; } \
+			/^<\?xml version.*/ { next; } \
+			/.*[^\r\n\t\s].*/ { \
+				gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); \
+				gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \
+				print $$0 ">"; \
+			}' \
 			$(foreach component,$(COMPONENTS),$(call gb_ComponentTarget_get_target,$(component))) \
 			$(foreach component,$(OLD_COMPONENTS),$(call gb_RdbTarget__get_old_component_target,$(component))) \
 			>> $@ && \