testtools/CustomTarget_bridgetest_climaker.mk | 2 -
testtools/CustomTarget_bridgetest_testComponent.mk | 42 ---------------------
testtools/CustomTarget_uno_test.mk | 1
testtools/InternalUnoApi_bridgetest.mk | 5 --
testtools/Jar_testComponent.mk | 2 +
testtools/Library_bridgetest.mk | 1
testtools/Library_constructors.mk | 1
testtools/Library_cppobj.mk | 1
testtools/Module_testtools.mk | 14 +++++--
testtools/StaticLibrary_bridgetest.mk | 1
10 files changed, 15 insertions(+), 55 deletions(-)
New commits:
commit 585f68a8d212d700cd6c21a4df104614a62bdb23
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 13:34:22 2012 +0200
do not run bridgetest on macosx/ppc
Change-Id: I6df6c061b09674370a99c2b5e69927500af8d1e5
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index f24ac0a..7f422f2 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -51,9 +51,13 @@ $(eval $(call gb_Module_add_targets,testtools,\
endif
ifneq ($(CROSS_COMPILING),YES)
+# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge.
+# (is it still relevant?)
+ifneq ($(COM)$(OS)$(CPU),GCCMACOSXP)
$(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
))
endif
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit e52fe01beaec472361690c9c105914feee372738
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 13:33:01 2012 +0200
do not run bridgetest on cross-compilation
Change-Id: I59addd16d4bd6720164c71dae3bd03e5d91afa40
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 948d79a..f24ac0a 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -50,8 +50,10 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
+ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
))
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 41a4a9a19117f75e73171b8a3d079ef6db609530
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 12:09:18 2012 +0200
use gb_Jar_set_componentfile
Change-Id: Ie2ee3387537d1ab968ca685d7b30aa59d28734db
diff --git a/testtools/CustomTarget_bridgetest_testComponent.mk
b/testtools/CustomTarget_bridgetest_testComponent.mk
deleted file mode 100644
index 49e6d1f..0000000
--- a/testtools/CustomTarget_bridgetest_testComponent.mk
+++ /dev/null
@@ -1,42 +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.ostrov...@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:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 6cba308..12dfe3f 100644
--- a/testtools/Jar_testComponent.mk
+++ b/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 \
))
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 3bf20e0..948d79a 100644
--- a/testtools/Module_testtools.mk
+++ b/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
commit d1b6e2625be6a20db16e73c28a0f44ae2ec6a1d3
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 11:23:57 2012 +0200
CustomTarget_uno_test is a test
Change-Id: I I547827f41986c54b98b5d9019f680378ca89c11d
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index e6968d5..3bf20e0 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -27,14 +27,13 @@
$(eval $(call gb_Module_Module,testtools))
$(eval $(call gb_Module_add_targets,testtools,\
+ CustomTarget_bridgetest \
InternalUnoApi_bridgetest \
StaticLibrary_bridgetest \
Library_cppobj \
Library_bridgetest \
Library_constructors \
Rdb_uno_services \
- CustomTarget_uno_test \
- CustomTarget_bridgetest \
))
ifneq ($(SOLAR_JAVA),)
@@ -52,4 +51,8 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
+$(eval $(call gb_Module_add_check_targets,testtools,\
+ CustomTarget_uno_test \
+))
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit f4227ecda4aa954240c258f5e7678b8528c9a892
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 11:18:30 2012 +0200
bridgetest does not need offapi
Change-Id: I I6ed4e2aa8f01a44939afa8d081dd2dc6a3a2a8a6
diff --git a/testtools/InternalUnoApi_bridgetest.mk
b/testtools/InternalUnoApi_bridgetest.mk
index 7d70832..643a8d9 100644
--- a/testtools/InternalUnoApi_bridgetest.mk
+++ b/testtools/InternalUnoApi_bridgetest.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_InternalUnoApi_InternalUnoApi,bridgetest))
$(eval $(call gb_InternalUnoApi_use_api,bridgetest,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_define_api_dependencies,bridgetest,offapi,\
udkapi \
))
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index 466fd03..b2765f6 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,bridgetest,\
))
$(eval $(call gb_Library_use_api,bridgetest,\
- offapi \
udkapi \
))
diff --git a/testtools/Library_constructors.mk
b/testtools/Library_constructors.mk
index fc6f776..abf273b 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,constructors,\
))
$(eval $(call gb_Library_use_api,constructors,\
- offapi \
udkapi \
))
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 538395e..649f71a 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,cppobj,\
))
$(eval $(call gb_Library_use_api,cppobj,\
- offapi \
udkapi \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk
b/testtools/StaticLibrary_bridgetest.mk
index 56fc5bf..c3bde3c 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -37,7 +37,6 @@ $(eval $(call
gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
))
$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
- offapi \
udkapi \
))
commit 435e643937d35ca9e14497d4ed2bd576f1f79693
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 11:14:18 2012 +0200
add missing dep on uno executable
Change-Id: Ib4747b78a90c70b4222900d9f9ac45f2cb07662e
diff --git a/testtools/CustomTarget_uno_test.mk
b/testtools/CustomTarget_uno_test.mk
index 15f8f89..0e76891 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -31,6 +31,7 @@ UNO_EXE := $(OUTDIR)/bin/uno
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call
gb_Rdb_get_target,uno_services) \
+ $(UNO_EXE) \
$(call gb_InternalUnoApi_get_target,bridgetest)
$(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
-ro $(OUTDIR)/xml/uno_services.rdb \
commit c4d0d6b46ad75e63ab7a485dc221a25bc1b5fcd6
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 19 11:02:55 2012 +0200
fix typo
Change-Id: I6c69daaa171786e605a58b23d8cd10cf43e5b139
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk
b/testtools/CustomTarget_bridgetest_climaker.mk
index f416674..a54281d 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -31,7 +31,7 @@ climaker_DIR := $(call
gb_CustomTarget_get_workdir,testtools/bridgetest_climaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(climaker_DIR)/cli_types_bridgetest.dll
-$(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
+$(climaker_DIR)/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) |
$(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
