diff options
-rw-r--r-- | swext/mediawiki/makefile.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk index b5b9bed2a68d..0f7cca354a14 100644 --- a/swext/mediawiki/makefile.mk +++ b/swext/mediawiki/makefile.mk @@ -41,12 +41,21 @@ COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.j COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar +.ELSE +COMP=fix_system_commons .ENDIF ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR) # creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in further build process -ALLTAR: ANTBUILD +ALLTAR: $(COMP) ANTBUILD + +fix_system_commons: + @echo "Fix Java Class-Path entry for Apache Commons libraries from system." + @$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \ +file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml + @echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension." + @$(SED) '/file="..commons/d' -i build.xml .ELSE @all: |