bridges/Module_bridges.mk | 1 + bridges/Package_jnilib_java_uno.mk | 16 ++++++++++++++++ bridges/source/jni_uno/jni_base.h | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-)
New commits: commit 4e8491a7e793a6b60a3ffdda8447f2c7000eed10 Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 16:13:23 2013 +0200 Get Mac OS X libjava_uno.jnilib -> libjava_uno.dylib symlink into instdir ...not exactly a nice way to do it, though. Plus, further missing instdir .jnilibs are LibreOffice.app/Contents/MacOS/libhsqldb.jnilib -> libhsqldb.dylib and LibreOffice.app/Contents/ure-link/lib/libjpipe.jnilib (which should not be a symlink but should replace the corresponding libjpipe.dylib completely). Change-Id: I5505704fc52da42e40c8b27185450d3fec8a864d diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index e5600a6..6c4e3bf 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ $(if $(ENABLE_JAVA),\ Jar_java_uno \ Library_java_uno \ + $(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \ ) \ $(if $(filter R,$(CPU)),\ $(if $(filter IOS,$(OS)),\ diff --git a/bridges/Package_jnilib_java_uno.mk b/bridges/Package_jnilib_java_uno.mk new file mode 100644 index 0000000..7dfe774 --- /dev/null +++ b/bridges/Package_jnilib_java_uno.mk @@ -0,0 +1,16 @@ +# -*- 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/. +# + +$(eval $(call gb_Package_Package,bridges_jnilib_java_uno,$(SRCDIR))) + +$(eval $(call gb_Package_set_outdir,bridges_jnilib_java_uno,$(gb_INSTROOT))) + +$(eval $(call gb_Package_add_symbolic_link,bridges_jnilib_java_uno,$(LIBO_URE_LIB_FOLDER)/$(basename $(notdir $(call gb_Library_get_target,java_uno))).jnilib,$(notdir $(call gb_Library_get_target,java_uno)))) + +# vim: set noet sw=4 ts=4: commit 6f0ddddff1b5e986a6b4879023600182fd32e82d Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 16:10:08 2013 +0200 Improve debug output Change-Id: Ic7fee2d0ca95279d9809161a7f39480727b070e3 diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 61fc284..3de1898 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -115,8 +115,11 @@ inline bool JNI_context::assert_no_exception() const { if (JNI_FALSE != m_env->ExceptionCheck()) { + SAL_WARN("bridges", "unexpected java exception occurred"); +#if OSL_DEBUG_LEVEL > 0 + m_env->ExceptionDescribe(); +#endif m_env->ExceptionClear(); - OSL_FAIL( "unexpected java exception occurred!" ); return false; } return true; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
