testComponent is now building correctly

Change-Id: I I58cabe71ffa6ba05652ba98b61c71d8919456323

6 files changed, 22 insertions, 124 deletions

diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 2796b7579535..f416674e6bf6 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -26,14 +26,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_climaker))
 
-TTBC := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
+climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
 
 $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
-	$(TTBC)/cli_types_bridgetest.dll
+	$(climaker_DIR)/cli_types_bridgetest.dll
 
 $(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
 		$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
-		$(call gb_Executable_get_target_for_build,climaker) | $(TTBC)/.dir
+		$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,climaker \
@@ -43,23 +43,4 @@ $(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
 		-r $(OUTDIR)/bin/cli_uretypes.dll \
 		$< > /dev/null)
 
-#
-# shamelessly stolen in unoil module
-# do we need this here?
-# 
-#$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
-#		$(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
-#	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
-#	$(call gb_Helper_abbreviate_dirs_native, \
-#	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
-#
-#$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
-#		$(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
-#	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
-#	$(call gb_Helper_abbreviate_dirs_native, \
-#	al -out:$@ \
-#		-version:$(CLI_OOOTYPES_POLICY_VERSION) \
-#		-keyfile:$(OUTDIR)/bin/cliuno.snk \
-#		-link:$<)
-
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 86eeddec38b5..5e4110f67dd2 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -26,14 +26,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker))
 
-TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
+javamaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
 
-$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done
+$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(javamaker_DIR)/done
 
-$(TTBJ)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
-	$(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir
+$(javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
+	$(call gb_Executable_get_target_for_build,javamaker) | $(javamaker_DIR)/.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 $@)
+	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_uno_services.mk b/testtools/CustomTarget_uno_services.mk
deleted file mode 100644
index 570cc14293de..000000000000
--- a/testtools/CustomTarget_uno_services.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- 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/uno_services))
-
-TTUS := $(call gb_CustomTarget_get_workdir,testtools/uno_services)
-
-$(call gb_CustomTarget_get_target,testtools/uno_services) : $(TTUS)/uno_services.rdb
-
-#$(call gb_CustomTarget_get_target,i18npool/localedata) : \
-#	$(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
-#		$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
-
-#$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
-#		$(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
-#	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
-#	$(call gb_Helper_abbreviate_dirs_native, \
-#		$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
-#			$(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \
-#			$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \
-#			-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-#			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
-#		sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
-#		rm $@.tmp)
-
-$(TTUS)/uno_services.rdb : $(TTUS)/uno_services.input \
-		$(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
-	$(call gb_Helper_abbreviate_dirs_native, \
-		$(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
-			-o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
-
-$(TTUS)/uno_services.input :| $(TTUS)/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	echo '<list>$(my_components:^"<filename>":+".component</filename>")</list>' > $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 1bfd5c3e00dc..6cba30873faf 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -32,9 +32,21 @@ $(eval $(call gb_Jar_use_jars,testComponent,\
     $(OUTDIR)/bin/juh.jar \
 ))
 
+$(eval $(call gb_Jar_use_customtargets,testComponent,\
+    testtools/bridgetest_javamaker \
+))
+
+$(eval $(call gb_Jar_use_jars,testComponent,\
+    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class \
+))
+
 $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
-$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/Manifest.mf))
+$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
+
+$(eval $(call gb_Jar_add_packagedirs,testComponent,\
+    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
+))
 
 $(eval $(call gb_Jar_add_sourcefiles,testComponent,\
 	testtools/com/sun/star/comp/bridge/TestComponent \
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 5c1480322f25..7ca07efe97a4 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -32,18 +32,16 @@ $(eval $(call gb_Module_add_targets,testtools,\
 	Library_bridgetest \
 	Library_constructors \
 	StaticLibrary_bridgetest \
-	CustomTarget_uno_services \
-	Rdb_cppobj \
 ))
 
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,testtools,\
 	CustomTarget_bridgetest_javamaker \
+	Jar_testComponent \
 ))
 endif
 
-#	Jar_testComponent \
 
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,testtools,\
diff --git a/testtools/Rdb_cppobj.mk b/testtools/Rdb_cppobj.mk
deleted file mode 100644
index 0f35627daedd..000000000000
--- a/testtools/Rdb_cppobj.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- 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_Rdb_Rdb,cppobj))
-
-$(eval $(call gb_Rdb_add_components,cppobj,\
-    testtools/source/bridgetest/cppobj \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: