[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest_testComponent.mk testtools/Module_testtools.mk testtools/Rdb_uno_services.mk

[David Ostrovsky]

 testtools/CustomTarget_bridgetest_testComponent.mk |   42 ++++++++++++++++++++
 testtools/Module_testtools.mk                      |    4 +
 testtools/Rdb_uno_services.mk                      |   43 +++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

New commits:
commit 6480c305d00be9a9e0577b3409248b41d51ca1ae
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Thu May 17 19:11:07 2012 +0200

    uno_services.rdb are now created
    
    Because there is still no helper for javamaker and
    automagically xslt procession of components during
    jar building phase, manually steps are needed.
    CustomTarget_bridgetest_testComponent.mk takescare of this.
    
    Change-Id: I I6bf5bdc0b2bcd19e09fdd6b32e46a2c228f4e357

diff --git a/testtools/CustomTarget_bridgetest_testComponent.mk b/testtools/CustomTarget_bridgetest_testComponent.mk
new file mode 100644
index 0000000..49e6d1f
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest_testComponent.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_testComponent))
+
+testComponent_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_testComponent)
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest_testComponent) : $(testComponent_DIR)/done
+
+$(testComponent_DIR)/done : $(gb_XSLTPROCTARGET) \
+	$(SRCDIR)/testtools/source/bridgetest/testComponent.component | $(testComponent_DIR)/.dir 
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMP,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(gb_XSLTPROC) --nonet --stringparam uri \
+		'vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/testComponent.jar' \
+			-o $(OUTDIR)/xml/component/testtools/source/bridgetest/testComponent.component \
+			$(gb_ComponentTarget_XSLTCOMMANDFILE) $(SRCDIR)/testtools/source/bridgetest/testComponent.component && touch $@)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7ca07ef..7368d4c 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -32,13 +32,15 @@ $(eval $(call gb_Module_add_targets,testtools,\
 	Library_bridgetest \
 	Library_constructors \
 	StaticLibrary_bridgetest \
+	Rdb_uno_services \
 ))
 
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,testtools,\
-	CustomTarget_bridgetest_javamaker \
 	Jar_testComponent \
+	CustomTarget_bridgetest_javamaker \
+	CustomTarget_bridgetest_testComponent \
 ))
 endif
 
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
new file mode 100644
index 0000000..768463b
--- /dev/null
+++ b/testtools/Rdb_uno_services.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Rdb_Rdb,uno_services))
+
+$(eval $(call gb_Rdb_use_custom_headers,uno_services,testtools/bridgetest_testComponent))
+
+$(eval $(call gb_Rdb_add_components,uno_services,\
+    testtools/source/bridgetest/cppobj \
+    testtools/source/bridgetest/constructors \
+    testtools/source/bridgetest/bridgetest \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Rdb_add_components,uno_services,\
+    testtools/source/bridgetest/testComponent \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: