diff options
-rw-r--r-- | swext/mediawiki/build.xml | 26 | ||||
-rw-r--r-- | swext/mediawiki/makefile.mk | 6 | ||||
-rw-r--r-- | swext/prj/d.lst | 2 |
3 files changed, 18 insertions, 16 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index 96bba1bbbd8b..901815a364d0 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -5,9 +5,9 @@ * * $RCSfile: build.xml,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mav $ $Date: 2008-03-27 10:23:31 $ + * last change: $Author: mav $ $Date: 2008-03-27 11:11:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,7 @@ </condition> <!-- locations used throughout the build --> - <property name="name" value="${target}"/> + <property name="name" value="wiki-publisher"/> <property name="dist" value="${out}/bin"/> <property name="classes" value="${out}/class"/> <property name="classes.test" value="${out}/class-test"/> @@ -91,7 +91,7 @@ </target> <target name="jar" depends="compile, init"> - <jar basedir="${classes}" compress="true" jarfile="${dist}/${name}.jar"> + <jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.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.1.jar commons-logging-1.1.1.jar"/> @@ -101,7 +101,7 @@ </target> <target name="tmpdir" depends="jar, init"> - <copy todir="${out}/misc/${target}/package_tmp" overwrite="true"> + <copy todir="${out}/misc/${target}/package_tmp"> <fileset dir="${out}/misc/${target}" 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" includes="ProtocolHandler.xcu" casesensitive="yes"/> @@ -110,13 +110,15 @@ <filterset> <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/> <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/> + <filter token="WIKIEXTENSIONFILENAME" value="${name}"/> </filterset> </copy> - <copy todir="${out}/misc/${target}/package_tmp/help" overwrite="true"> + <copy todir="${out}/misc/${target}/package_tmp/help"> <fileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes"/> <filterset> <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/> <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/> + <filter token="WIKIEXTENSIONFILENAME" value="${name}"/> </filterset> <mapper type="regexp" from="^(.*)/com.sun.sun-mediawiki/(.*)" to="\1/com.sun.wiki-publisher/\2"/> </copy> @@ -126,22 +128,22 @@ <delete file="${dist}/${name}.${ext}"/> <zip destfile="${dist}/${name}.${ext}"> <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/> - <fileset dir="${dist}" includes="${name}.jar" casesensitive="yes"/> + <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/> <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/> <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"/> + <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> </zip> </target> <target name="development-package" depends="jar, init"> - <delete file="${dist}/${name}_develop.zip"/> - <zip destfile="${dist}/${name}_develop.zip"> - <fileset dir="${dist}" includes="${name}.jar" casesensitive="yes"/> + <delete file="${dist}/${target}_develop.zip"/> + <zip destfile="${dist}/${target}_develop.zip"> + <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/> <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/> <fileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes"/> <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/> @@ -163,7 +165,7 @@ <delete dir="${classes}/com/sun/star/wiki"/> <delete dir="${out}/misc/${target}"/> <delete dir="${dist}/${target}.jar"/> - <delete dir="${dist}/${target}.${ext}"/> + <delete dir="${dist}/${name}.${ext}"/> <delete dir="${dist}/${target}_develop.zip"/> </target> diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk index 05ebf0950516..cd7679045a86 100644 --- a/swext/mediawiki/makefile.mk +++ b/swext/mediawiki/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: mav $ $Date: 2008-03-26 16:40:17 $ +# last change: $Author: mav $ $Date: 2008-03-27 11:11:09 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,7 @@ COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1 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 mediawiki.oxt and mediawiki_develop.zip, the second one might be used in further build process +# creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in further build process ALLTAR: ANTBUILD .ELSE diff --git a/swext/prj/d.lst b/swext/prj/d.lst index b9a39e93ba9b..108d9cd73b49 100644 --- a/swext/prj/d.lst +++ b/swext/prj/d.lst @@ -1,4 +1,4 @@ mkdir: %_DEST%\bin%_EXT%\swext -..\%__SRC%\bin\mediawiki.oxt %_DEST%\bin%_EXT%\swext\mediawiki.oxt +..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt ..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip |