diff options
| -rw-r--r-- | swext/mediawiki/build.xml | 17 | ||||
| -rw-r--r-- | swext/mediawiki/makefile.mk | 7 | ||||
| -rw-r--r-- | swext/prj/build.lst | 6 |
3 files changed, 21 insertions, 9 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index c9e65269d64f..33e213545cfe 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -5,9 +5,9 @@ * * $RCSfile: build.xml,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rene $ $Date: 2008-02-04 09:02:13 $ + * last change: $Author: mav $ $Date: 2008-02-11 13:25:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,13 +35,14 @@ ************************************************************************ --> <project default="all"> <target name="init"> + <property environment="env"/> <property name="ext" value="oxt"/> <property name="officeroot" value="/export/home/mav/OFFICES/OOG680/m5_netbeans_pro"/> <property name="office.home" value="${officeroot}"/> <!-- fallbacks for locations, when solenv is not used --> - <condition property="prjname" value="wikiaddon"> - <not><isset property="prjname"/></not> + <condition property="target" value="wikiaddon"> + <not><isset property="target"/></not> </condition> <condition property="out" value="./build"> <not><isset property="out"/></not> @@ -103,7 +104,13 @@ <target name="uno-package" depends="jar, init"> <delete file="${dist}/${name}.${ext}"/> <zip destfile="${dist}/${name}.${ext}"> - <fileset dir="src" includes="**/*.xcu,**/*.xcs,**/*.xml" excludes="uno-extension-manifest.xml" casesensitive="yes"/> + <fileset dir="src" includes="description.xml" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="*.xcu" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}" includes="**/*.xhp" casesensitive="yes"/> <fileset dir="${dist}" includes="${name}.jar" casesensitive="yes"/> <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/> <file file="${commons-codec-jar}"/> diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk index ab5d5ee40e77..f13ba81b640a 100644 --- a/swext/mediawiki/makefile.mk +++ b/swext/mediawiki/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rene $ $Date: 2008-02-04 09:02:13 $ +# last change: $Author: mav $ $Date: 2008-02-11 13:25:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,6 @@ TARGET=mediawiki .IF "$(ENABLE_MEDIAWIKI)" == "YES" .INCLUDE : ant.mk -ALLTAR: ANTBUILD .IF "$(SYSTEM_APACHE_COMMONS)" != "YES" COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-codec-1.3.jar @@ -54,6 +53,8 @@ XML_APIS_JAR = $(SOLARVER)$/$(INPATH)$/lib/xml-apis.jar 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) +ALLTAR: ANTBUILD + .ELSE @all: @echo "MediaWiki Editor extension disabled." diff --git a/swext/prj/build.lst b/swext/prj/build.lst index 44176a3f7224..240de375075d 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,8 @@ swext swext : XALAN:xalan jut javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons NULL swext swext usr1 - all swext_mkout NULL -swext swext\mediawiki nmake - all swext_wiki NULL +swext swext\mediawiki\help\en-US\com.sun.sun-mediawiki nmake - all swext_mwhelp NULL +swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL +swext swext\mediawiki\src\registry\data\org\openoffice\Office\Custom nmake - all swext_mwcustomdata swext_mwschema NULL +swext swext\mediawiki\src\registry\data\org\openoffice\Office nmake - all swext_mwofficedata NULL +swext swext\mediawiki nmake - all swext_mw swext_mwhelp swext_mwschema swext_mwcustomdata swext_mwofficedata NULL |