summaryrefslogtreecommitdiffstats
path: root/swext
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2008-04-01 08:22:05 +0000
committerMikhail Voitenko <mav@openoffice.org>2008-04-01 08:22:05 +0000
commit41798186f1500636540cb3de0f95f691c857446a (patch)
tree84eb48b4e70c851986fbaa72fff0e1606c927c43 /swext
parent#i10000# we need readlicense_oo (diff)
downloadcore-41798186f1500636540cb3de0f95f691c857446a.tar.gz
core-41798186f1500636540cb3de0f95f691c857446a.zip
#i10000# let be built when WITH_LANG is not set
Diffstat (limited to 'swext')
-rw-r--r--swext/mediawiki/build.xml22
1 files changed, 18 insertions, 4 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 5ef3aea44c6f..f3b18ead409a 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -5,9 +5,9 @@
*
* $RCSfile: build.xml,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: mav $ $Date: 2008-03-27 12:18:14 $
+ * last change: $Author: mav $ $Date: 2008-04-01 09:22:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -90,6 +90,20 @@
</javac>
</target>
+ <target name="xcucheck" depends="init">
+ <condition property="no.merge.present">
+ <not>
+ <available file="${out}/misc/${target}/merge/org/openoffice/Office/Custom/WikiExtension.xcu" type="file"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="xcumerge" depends="xcucheck, init" if="no.merge.present">
+ <copy todir="${out}/misc/${target}/merge">
+ <fileset dir="${out}/misc/${target}/registry/data" includes="**/*.xcu" casesensitive="yes"/>
+ </copy>
+ </target>
+
<target name="jar" depends="compile, init">
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest>
@@ -100,7 +114,7 @@
</jar>
</target>
- <target name="tmpdir" depends="jar, init">
+ <target name="tmpdir" depends="xcumerge, jar, init">
<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"/>
@@ -124,7 +138,7 @@
</copy>
</target>
- <target name="uno-package" depends="tmpdir, jar, init">
+ <target name="uno-package" depends="tmpdir, xcumerge, jar, init">
<delete file="${dist}/${name}.${ext}"/>
<zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>