use gb_Jar_set_componentfile

Change-Id: Ie2ee3387537d1ab968ca685d7b30aa59d28734db

testtools/CustomTarget_bridgetest_testComponent.mk

-# -*- 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_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:

testtools/Jar_testComponent.mk

@@ -44,6 +44,8 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
 
+$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
+
 $(eval $(call gb_Jar_add_packagedirs,testComponent,\
     $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
 ))

testtools/Module_testtools.mk

@@ -40,7 +40,6 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,testtools,\
 	Jar_testComponent \
 	CustomTarget_bridgetest_javamaker \
-	CustomTarget_bridgetest_testComponent \
 ))
 endif