strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix swext build with SYSTEM_APACHE_COMMONS==YES

Browse source
This commit is contained in:
Rene Engelhard 2011-10-16 12:19:25 +00:00
parent 4a1d3a8cfe
commit 8e970bc4e7
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
swext/Extension_wiki-publisher.mk
View file

@ -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))

18
swext/Jar_mediawiki.mk
View file

@ -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 \