diff options
| author | David Tardon <dtardon@redhat.com> | 2012-07-13 11:11:32 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-07-13 11:23:01 +0200 |
| commit | d7aa34ee91a8b23ef6e2f544beeec1dca0d69af7 (patch) | |
| tree | cae7d04059b4c23a3a99bb2168de14c143d01204 /reportbuilder | |
| parent | 8ecf7e2259681b7a0d26766ea4500a7a6313f56d (diff) | |
fdo#51278 fix reportbuilder manifest
Change-Id: I34f229284611285e10a192f80b14b1e8b3fa618c
Diffstat (limited to 'reportbuilder')
| -rw-r--r-- | reportbuilder/Jar_reportbuilder.mk | 38 | ||||
| -rw-r--r-- | reportbuilder/util/manifest.mf | 2 |
2 files changed, 38 insertions, 2 deletions
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index c74397fc190c..1f7159de153c 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# TODO: fix manifest - $(eval $(call gb_Jar_Jar,sun-report-builder)) $(eval $(call gb_Jar_use_jars,sun-report-builder,\ @@ -52,6 +50,42 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\ sac \ )) +$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + $(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\ + commons-logging-1.1.1.jar \ + ) \ + $(if $(filter YES,$(SYSTEM_JFREEREPORT)),\ + $(foreach jar,\ + $(FLUTE_JAR) \ + $(JFREEREPORT_JAR) \ + $(LIBBASE_JAR) \ + $(LIBFONTS_JAR) \ + $(LIBFORMULA_JAR) \ + $(LIBLAYOUT_JAR) \ + $(LIBLOADER_JAR) \ + $(LIBREPOSITORY_JAR) \ + $(LIBSERIALIZER_JAR) \ + $(LIBXML_JAR) \ + $(SAC_JAR) \ + ,$(call gb_Helper_make_url,$(jar)) \ + ),\ + flow-engine-0.9.4.jar \ + flute-1.1.6.jar \ + libbase-1.1.6.jar \ + libfonts-1.1.6.jar \ + libformula-1.1.7.jar \ + liblayout-0.2.10.jar \ + libloader-1.1.6.jar \ + librepository-1.1.6.jar \ + libserializer-1.1.6.jar \ + libxml-1.1.7.jar \ + sac.jar \ + ) \ +)) + +$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf)) + $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com)) $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\ diff --git a/reportbuilder/util/manifest.mf b/reportbuilder/util/manifest.mf new file mode 100644 index 000000000000..fb497ae71494 --- /dev/null +++ b/reportbuilder/util/manifest.mf @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory +UNO-Type-Path: |