javaunohelper: use InternalUnoApi

5 files changed, 3 insertions, 116 deletions

diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index 19297e7955ce..4783bd982a93 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -27,16 +27,7 @@
 
 $(eval $(call gb_Library_Library,juh))
 
-$(eval $(call gb_Library_use_package,juh,\
-    javaunohelper_cppumaker \
-))
-
-$(eval $(call gb_Library_set_include,juh,\
-    $$(INCLUDE) \
-    -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
-))
-
-$(eval $(call gb_Library_use_api,juh,\
+$(eval $(call gb_Library_use_internal_comprehensive_api,juh,\
     udkapi \
 ))
 
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
index f35ec61f949e..7f1f604e7f1b 100644
--- a/javaunohelper/Library_juhx.mk
+++ b/javaunohelper/Library_juhx.mk
@@ -27,13 +27,8 @@
 
 $(eval $(call gb_Library_Library,juhx))
 
-$(eval $(call gb_Library_use_package,juhx,\
-    javaunohelper_cppumaker \
-))
-
-$(eval $(call gb_Library_set_include,juhx,\
-    $$(INCLUDE) \
-    -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+$(eval $(call gb_Library_use_internal_comprehensive_api,juhx,\
+    udkapi \
 ))
 
 $(eval $(call gb_Library_use_libraries,juhx,\
diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
index 153f8b2a4e8e..27c53e484bd6 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,javaunohelper,\
     Library_juh \
     Library_juhx \
     Jar_juh \
-    Package_cppumaker \
     Zip_juh \
 ))
 endif
diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk
deleted file mode 100644
index b53301a4ac0b..000000000000
--- a/javaunohelper/Package_cppumaker.mk
+++ /dev/null
@@ -1,37 +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) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (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_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget/javaunohelper/cppumaker))
-
-$(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\
-	$(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) \
-	$(OUTDIR)/bin/udkapi.rdb \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
deleted file mode 100644
index 8ed1298c7f6c..000000000000
--- a/javaunohelper/cppumaker/Makefile
+++ /dev/null
@@ -1,61 +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) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (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.
-
-gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild_simple.mk
-
-done : $(gb_UnoApiTarget_CPPUMAKERTARGET) $(OUTDIR)/bin/udkapi.rdb
-	$(call gb_Helper_abbreviate_dirs_native, \
-	$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
-		-Tcom.sun.star.beans.NamedValue \
-		-Tcom.sun.star.beans.XPropertySet \
-		-Tcom.sun.star.container.XHierarchicalNameAccess \
-		-Tcom.sun.star.lang.DisposedException \
-		-Tcom.sun.star.lang.IllegalArgumentException \
-		-Tcom.sun.star.lang.XComponent \
-		-Tcom.sun.star.lang.XInitialization \
-		-Tcom.sun.star.lang.XMultiComponentFactory \
-		-Tcom.sun.star.lang.XMultiServiceFactory \
-		-Tcom.sun.star.lang.XServiceInfo \
-		-Tcom.sun.star.lang.XSingleComponentFactory \
-		-Tcom.sun.star.lang.XSingleServiceFactory \
-		-Tcom.sun.star.lang.XTypeProvider \
-		-Tcom.sun.star.loader.XImplementationLoader \
-		-Tcom.sun.star.registry.XRegistryKey \
-		-Tcom.sun.star.registry.XSimpleRegistry \
-		-Tcom.sun.star.uno.TypeClass \
-		-Tcom.sun.star.uno.XAggregation \
-		-Tcom.sun.star.uno.XComponentContext \
-		-Tcom.sun.star.uno.XWeak \
-		$(OUTDIR)/bin/udkapi.rdb) && \
-	touch $@)
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : done
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab: