testtools/CustomTarget_bridgetest_climaker.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e42eed90b5c8151f8b5520ca2728061b1ac8e41e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 25 10:34:52 2013 +0200
Fix generation of cli_types_bridgetest.dll after gbuild'ification
...the "double use of udkapi.rdb in climaker call in
testtools/CustomTarget_bridgetest_climaker.mk looked fishy" indeed.
Everything built in module testtools that is not used by the "native
inprocess"
test case (testtools/CustomTarget_uno_test.mk) is more-or-less faithfully
copied
over from pre-gbuild times, but the code to actually (manually) execute it
is
effectively lost: bridgetest_client against bridgetest_server and
bridgetest_javaserver; bridgetest_inprocess_java;
cli_bridgetest_inprocess.exe.
So this cli_types_bridgetest.dll is effectively dead code today, but at
least it
is a more faithful copy of the pre-gbuild version again.
Change-Id: If01a9d837dc6bf3837a17878d8a4bfaf87ab6d4d
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk
b/testtools/CustomTarget_bridgetest_climaker.mk
index 469e698..370a73c 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -32,6 +32,7 @@ $(call
gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll
$(testtools_CLIDIR)/cli_types_bridgetest.dll : \
+ $(call gb_UnoApiTarget_get_target,bridgetest) \
$(call gb_UnoApiTarget_get_target,udkapi) \
$(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_runtime_dependencies,climaker) \
@@ -41,6 +42,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \
- $(call gb_UnoApiTarget_get_target,udkapi).oldformat > /dev/null)
+ -X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \
+ $(call gb_UnoApiTarget_get_target,bridgetest).oldformat >
/dev/null)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
