diff options
| author | Rene Engelhard <rene@debian.org> | 2011-10-16 12:19:25 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-10-16 16:52:58 +0200 |
| commit | 8e970bc4e75caf40324f821123fdce36cb01918c (patch) | |
| tree | ba50a6972d90ff4fe96c23b0837ef515ab263ed7 /swext | |
| parent | 4a1d3a8cfef7ebcbb0fe311648237c42f40509f8 (diff) | |
fix swext build with SYSTEM_APACHE_COMMONS==YES
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 2 | ||||
| -rw-r--r-- | swext/Jar_mediawiki.mk | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 278b467d5a35..bdf0855660ec 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -31,10 +31,12 @@ WIKISRC := $(SRCDIR)/swext/mediawiki $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src)) +ifneq ($(SYSTEM_APACHE_COMMONS),YES) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) +endif $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) $(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)) diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index acafa8636587..2a1c7ef75fb0 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -33,12 +33,30 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com)) $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF)) +ifeq ($(SYSTEM_APACHE_COMMONS),YES) +# FIXME: use gb_Jar_use_externals? +# for the build +$(eval $(call gb_Jar_add_jars,mediawiki,\ + $(COMMONS_CODEC_JAR) \ + $(COMMONS_LANG_JAR) \ + $(COMMONS_HTTPCLIENT_JAR) \ + $(COMMONS_LOGGING_JAR) \ +)) +# Class-Path: in MANIFEST.MF +$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ + $(COMMONS_CODEC_JAR) \ + $(COMMONS_LANG_JAR) \ + $(COMMONS_HTTPCLIENT_JAR) \ + $(COMMONS_LOGGING_JAR) \ +)) +else $(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ commons-codec-1.3.jar \ commons-lang-2.3.jar \ commons-httpclient-3.1.jar \ commons-logging-1.1.1.jar \ )) +endif $(eval $(call gb_Jar_add_jars,mediawiki,\ $(OUTDIR)/bin/juh.jar \ |