desktop/source/deployment/manager/dp_manager.cxx | 11 ++++------- offapi/type_reference/update-rdb.sh | 14 ++++++-------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/solaris.mk | 4 ++-- solenv/gbuild/platform/unxgcc.mk | 4 ++-- 6 files changed, 16 insertions(+), 21 deletions(-)
New commits: commit e1611532aca551c90c879ca3100a088aff988d75 Author: Stephan Bergmann <[email protected]> Date: Thu Oct 25 18:13:16 2012 +0200 config_host.mk can no longer be sourced ...with its ifneq ... endif sections, so require make cmd instead here. Change-Id: Ifab2117c5fb775c0c4ca7001f954716bd09a3844 diff --git a/offapi/type_reference/update-rdb.sh b/offapi/type_reference/update-rdb.sh index 4b15635..0f41721 100755 --- a/offapi/type_reference/update-rdb.sh +++ b/offapi/type_reference/update-rdb.sh @@ -7,23 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +set -e + # Basic argument checks if [ $# -lt 1 ] then echo "usage:" - echo " $0 <idl file list>" + echo " make cmd cmd='$0 <idl file list>'" echo "" echo "example:" - echo " $0 \\" - echo " offapi/com/sun/star/auth/SSOManagerFactory.idl \\" - echo " offapi/com/sun/star/auth/SSOPasswordCache.idl" + echo " make cmd cmd='$0" + echo " offapi/com/sun/star/auth/SSOManagerFactory.idl" + echo " offapi/com/sun/star/auth/SSOPasswordCache.idl'" exit 1 fi -# Load env vars -source "$(dirname "$0")"/../../config_host.mk 2>/dev/null - -set -e mkdir tmp for i in "$@"; do "${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out1.rdb /UCR \ commit ddb9c307e9bdd90f41ae524af52e698aa10211d5 Author: Stephan Bergmann <[email protected]> Date: Thu Oct 25 18:11:36 2012 +0200 Consistently use gb_Helper_make_url Change-Id: I6613cad010267afa551ddcab7cf92c7d930d409a diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index c8f9902..0075db0 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -615,7 +615,7 @@ define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice.exe}" \ -Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \ - -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) + -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index e122e25..59f6c56 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -362,7 +362,7 @@ define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice}" \ -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$$$${DYLD_LIBRARY_PATH+=$$$$DYLD_LIBRARY_PATH}" \ - -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ endef diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index fc6783d..31e8e05 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -347,7 +347,7 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ - -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh \ -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \ @@ -360,7 +360,7 @@ define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ printf ". $(DEVINSTALLDIR)/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \ printf "gdb --tui $(DEVINSTALLDIR)/opt/program/soffice.bin" >> $${OFFICESCRIPT} && \ -printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=file://$(DEVINSTALLDIR)/\"" >> $${OFFICESCRIPT} && \ +printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \ printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \ $(SHELL) $${OFFICESCRIPT} && \ rm $${OFFICESCRIPT} diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index f90963e..843ec18 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -345,7 +345,7 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ - -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh \ -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \ @@ -358,7 +358,7 @@ define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ printf 'if [ -e $(DEVINSTALLDIR)/opt/program/ooenv ]; then . $(DEVINSTALLDIR)/opt/program/ooenv; fi\n' > $${OFFICESCRIPT} && \ printf "gdb $(DEVINSTALLDIR)/opt/program/soffice.bin" >> $${OFFICESCRIPT} && \ -printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=file://$(DEVINSTALLDIR)/\"" >> $${OFFICESCRIPT} && \ +printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \ $(SHELL) $${OFFICESCRIPT} && \ rm $${OFFICESCRIPT} endef commit cdb05e22d1173f3e0232b237e811dc183a36fd07 Author: Stephan Bergmann <[email protected]> Date: Thu Oct 25 17:45:02 2012 +0200 Improve error message Change-Id: Icdbb60525f858a2a0002a5e6f599eb6a6954a9dd diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 894999e..bedc501 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -436,15 +436,12 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( catch (const RuntimeException &) { throw; } - catch (const Exception &) { + catch (const Exception & e) { Any exc( ::cppu::getCaughtException() ); - ::rtl::OUStringBuffer buf; - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[context=\"") ); - buf.append( context ); - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( - "\"] caught unexpected exception!") ); throw lang::WrappedTargetRuntimeException( - buf.makeStringAndClear(), Reference<XInterface>(), exc ); + ("[context=\"" + context + "\"] caught unexpected " + + exc.getValueType().getTypeName() + ": " + e.Message), + Reference<XInterface>(), exc ); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
