#i85747# --enable-mediawiki and --with-system-apache-commons

2 files changed, 35 insertions, 10 deletions

diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 305b3b48bf9c..85cfc235c6ef 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: build.xml,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rene $ $Date: 2008-01-30 21:13:12 $
+ *  last change: $Author: rene $ $Date: 2008-02-01 10:21:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -69,12 +69,12 @@
             <pathelement location="${officeclasses}/jut.jar"/>
             <pathelement location="${officeclasses}/ridl.jar"/>
             <pathelement location="${officeclasses}/unoil.jar"/>
-            <pathelement location="${officeclasses}/xml-apis.jar"/>
+        <pathelement location="${officeclasses}/xml-apis.jar"/>
             <!-- 3rd party libs -->
-            <pathelement location="jars/commons-codec-1.3.jar"/>
-            <pathelement location="jars/commons-httpclient-3.0.1.jar"/>
-            <pathelement location="jars/commons-lang-2.0.jar"/>
-            <pathelement location="jars/commons-logging.jar"/>
+            <pathelement location="${commons-codec-jar}"/>
+            <pathelement location="${commons-httpclient-jar}"/>
+            <pathelement location="${commons-lang-jar}"/>
+            <pathelement location="${commons-logging-jar}"/>
         </path>
 
         <!-- create output directories -->
@@ -93,6 +93,7 @@
     <target name="jar" depends="compile, init">
         <jar basedir="${classes}" compress="true" jarfile="${dist}/${name}.jar">
             <manifest>
+        <!-- FIXME: Set Class-Path correctly for the system case !-->
                 <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.0.1.jar commons-logging-1.1.jar"/>
                 <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
             </manifest>
@@ -105,7 +106,11 @@
             <fileset dir="src" includes="**/*.xcu,**/*.xcs,**/*.xml" excludes="uno-extension-manifest.xml" casesensitive="yes"/>
             <fileset dir="${dist}" includes="${name}.jar" casesensitive="yes"/>
             <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
-            <fileset dir="jars" includes="**/*.jar" casesensitive="yes"/>
+        <file file="mediawiki.jar"/>
+        <file file="${commons-codec-jar}"/>
+        <file file="${commons-httpclient-jar}"/>
+        <file file="${commons-lang-jar}"/>
+        <file file="${commons-logging-jar}"/>
             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
             <zipfileset dir="src" includes="uno-extension-manifest.xml" fullpath="META-INF/manifest.xml"/>
         </zip>
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
index 9db2c3ccb98b..c2f7ebfe411d 100644
--- a/swext/mediawiki/makefile.mk
+++ b/swext/mediawiki/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rene $ $Date: 2008-01-30 21:14:31 $
+#   last change: $Author: rene $ $Date: 2008-02-01 10:21:44 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -37,5 +37,25 @@ PRJ=..
 PRJNAME=swext
 TARGET=mediawiki
 
+.IF "$(ENABLE_MEDIAWIKI)" == "YES"
 .INCLUDE : ant.mk
 ALLTAR: ANTBUILD
+
+.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
+COMMONS_CODEC_JAR=jars/commons-codec-1.3.jar 
+COMMONS_LANG_JAR=jars/commons-lang-2.3.jar
+COMMONS_HTTPCLIENT_JAR=jars/commons-httpclient-3.0.1.jar
+COMMONS_LOGGING_JAR=jars/commons-logging-1.1.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" != "YES"
+XML_APIS_JAR = $(SOLARVER)$/$(INPATH)$/lib/xml-apis.jar
+.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) -Dxml-apis-jar=$(XML_APIS_JAR)
+
+.ELSE
+@all:
+    @echo "MediaWiki Editor extension disabled."
+.ENDIF
+