[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/prj

[Michael Meeks]

 i18npool/CppunitTest_i18npool_test_breakiterator.mk |    9 ++++++---
 i18npool/prj/build.lst                              |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 90a53962420ae84e2c0577683864626d6a67896a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Sep 28 15:16:16 2011 +0100

    disable use of test's unoexceptionprotector for now, to break dep loop

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index d0dca44..5a8b53d 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -59,9 +59,12 @@ $(eval $(call gb_CppunitTest_add_service_rdbs,i18npool_test_breakiterator,\
 	i18npool_test_breakiterator \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
+#
+# Disable for now - to break circular dependency ...
+#
+# $(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
+#    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+# ))
 
 $(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
 
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 63f8870..935e4c4 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,2 +1,2 @@
-inp  i18npool    :   bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt test udkapi ure NULL
+inp  i18npool    :   bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi ure NULL
 inp  i18npool\prj       nmake   -   all inp_prj NULL