[Libreoffice-commits] core.git: offapi/Module_offapi.mk offapi/UnoApiMerge_types.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk

[Stephan Bergmann]

 offapi/Module_offapi.mk                        |    1 
 offapi/UnoApiMerge_types.mk                    |   37 -------------------------
 testtools/CustomTarget_bridgetest_climaker.mk  |    5 ++-
 testtools/CustomTarget_bridgetest_javamaker.mk |    4 +-
 4 files changed, 5 insertions(+), 42 deletions(-)

New commits:
commit 4a0b39f592210b19e4dbf4b8c797969942269d80
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 24 00:33:36 2013 +0200

    Get rid of UnoApiMerge_types
    
    (The "statistic" target in offapi/UnoApiMerge_types.mk appears to have been
    dead code already for quite a while.)
    
    Change-Id: I0852ebf1f765ba881abb6ce4db496e949076fc64

diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk
index ac945b2..63d152e 100644
--- a/offapi/Module_offapi.mk
+++ b/offapi/Module_offapi.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Module_Module,offapi))
 
 $(eval $(call gb_Module_add_targets,offapi,\
 	UnoApi_offapi \
-	UnoApiMerge_types \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApiMerge_types.mk b/offapi/UnoApiMerge_types.mk
deleted file mode 100644
index 9bcc9ef..0000000
--- a/offapi/UnoApiMerge_types.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
-
-$(eval $(call gb_UnoApiMerge_use_api,types,\
-    udkapi \
-    offapi \
-))
-
-$(eval $(call gb_UnoApiMerge_set_reference_rdbfile,types,\
-    offapi/type_reference/types \
-))
-
-# ugly hack for now!
-statistic : $(gb_Helper_MISC)/api_statistic
-
-$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types)
-	$(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 16f606f..19086d2 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -32,7 +32,8 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
 	$(testtools_CLIDIR)/cli_types_bridgetest.dll
 
 $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
-		$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
+		$(call gb_UnoApiTarget_get_target,udkapi) \
+		$(OUTDIR)/bin/cli_uretypes.dll \
 		$(call gb_Executable_get_runtime_dependencies,climaker) \
 		| $(testtools_CLIDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
@@ -40,7 +41,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
 	$(call gb_Helper_execute,climaker) \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
 		--out $@ \
-		-X $(OUTDIR)/bin/types.rdb \
+		-X $(call gb_UnoApiTarget_get_target,udkapi) \
 		-r $(OUTDIR)/bin/cli_uretypes.dll \
 		$< > /dev/null)
 
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index cf20bc0..90d9956 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -32,12 +32,12 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_
 
 $(testtools_JAVADIR)/done : \
 		$(call gb_UnoApiTarget_get_target,bridgetest) \
-		$(OUTDIR)/bin/types.rdb \
+		$(call gb_UnoApiTarget_get_target,udkapi) \
 		$(call gb_Executable_get_runtime_dependencies,javamaker) \
 		| $(testtools_JAVADIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
 	rm -r $(testtools_JAVADIR) && \
-	$(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: