wizards/Jar_report.mk | 2 ++ wizards/com/sun/star/wizards/report/MANIFEST.MF | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 80a7b52ba4903d4112ea8edef57f082756221d56 Author: Stephan Bergmann <[email protected]> Date: Mon Jun 10 11:10:47 2013 +0200 fdo#65168: Fix previous fix, Class-Path is built up in solenv/gbuild/Jar.mk ...and must not be hard-coded in the manifest input (else report.jar was missing the link to commonwizards.jar, so at least --disable-report-builder builds failed with java.lang.NoClassDefFoundError). Change-Id: I81cdadb599c7bf9a4a4503924dab4fbf9d60b44f (cherry picked from commit 5d4c41587dde658c9bfcb1638e0373608163bec2) diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk index 010c990..50e9615 100644 --- a/wizards/Jar_report.mk +++ b/wizards/Jar_report.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Jar_use_jars,report,\ $(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF)) +$(eval $(call gb_Jar_add_manifest_classpath,report,reportbuilderwizard.jar)) + $(eval $(call gb_Jar_set_packageroot,report,com)) $(eval $(call gb_Jar_add_sourcefiles,report,\ diff --git a/wizards/com/sun/star/wizards/report/MANIFEST.MF b/wizards/com/sun/star/wizards/report/MANIFEST.MF index 2dda41a..1a4f8da 100644 --- a/wizards/com/sun/star/wizards/report/MANIFEST.MF +++ b/wizards/com/sun/star/wizards/report/MANIFEST.MF @@ -1,3 +1,2 @@ -Class-Path: reportbuilderwizard.jar RegistrationClassName: com.sun.star.wizards.report.CallReportWizard UNO-Type-Path: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
