From d4ccca0d1dda69a3e3fd216cad2424eceebd362c Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Thu, 10 May 2012 09:10:23 +0200
Subject: bridgetest_javamaker target added

Change-Id: Ice0a284683d67168624aeb9d737ff219c9074251
---
 testtools/CustomTarget_bridgetest_javamaker.mk | 39 ++++++++++++++++++++++++++
 testtools/Module_testtools.mk                  | 12 ++++----
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 testtools/CustomTarget_bridgetest_javamaker.mk

(limited to 'testtools')

diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
new file mode 100644
index 000000000000..25709ee5f5c3
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -0,0 +1,39 @@
+# -*- 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@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_javamaker))
+
+TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done
+
+$(TTBJ)/done : $(OUTDIR)/rdb/bridgetest.rdb \
+	$(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(TTBJ)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 79ebf6937ab2..16da8e38f264 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -26,16 +26,16 @@
 
 $(eval $(call gb_Module_Module,testtools))
 
-#$(eval $(call gb_Module_add_targets,testtools,\
-#    Jar_testComponent \
-#))
-
-ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,testtools,\
 	InternalUnoApi_bridgetest \
+    CustomTarget_bridgetest_javamaker \
 ))
-endif
 
+#ifneq ($(SOLAR_JAVA),)
+#$(eval $(call gb_Module_add_targets,testtools,\
 #   Jar_testComponent \
+#))
+#endif
+
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
-- 
cgit