Updated custom build.xml.
diff --git a/ant/org.eclipse.ant.core/build.xml b/ant/org.eclipse.ant.core/build.xml
index c583e52..c693042 100644
--- a/ant/org.eclipse.ant.core/build.xml
+++ b/ant/org.eclipse.ant.core/build.xml
@@ -1,140 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.core" default="plugin.zip" basedir=".">
- <target name="initTemplate" unless="template">
- <initTemplate/>
- </target>
- <target name="init" depends="initTemplate">
- <property name="plugin" value="org.eclipse.ant.core"/>
- <property name="version" value="2.2.1"/>
- <property name="stamp" value=""/>
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- <property name="nl" value="en_US"/>
- <property name="arch" value="x86"/>
- </target>
+<project name="org.eclipse.ant.core" default="build.jars" basedir=".">
- <target name="src.zip" depends="init">
- <property name="base" value="${basedir}/src.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="src">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.src.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="initTemplate" unless="template">
+ <initTemplate/>
+ </target>
- <target name="plugin.zip" depends="bin.zip"/>
- <target name="bin.zip" depends="init">
- <property name="base" value="${basedir}/bin.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="jar">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <antcall target="bin">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <delete>
- <fileset dir="${base}" includes="**/*.bin.log"/>
- </delete>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="init" depends="initTemplate, properties">
+ </target>
- <target name="log.zip" depends="init">
- <property name="base" value="${basedir}/log.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="log">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.log.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="build.update.jar" depends="init">
+ <property name="base" value="${basedir}/bin.zip.pdetemp"/>
+ <delete dir="${base}"/>
+ <mkdir dir="${base}"/>
+ <antcall target="build.jars"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination" value="${base}/"/>
+ </antcall>
+ <delete>
+ <fileset dir="${base}" includes="**/*.bin.log"/>
+ </delete>
+ <zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}_${version}"/>
+ <delete dir="${base}"/>
+ </target>
- <target name="antsupport.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="mapping" value="src/"/>
- <property name="includes" value="src/"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${basedir}/antsupport.jar"/>
- <property name="compilePath" value="../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;../org.apache.xerces/bin;../org.apache.xerces/xerces.jar;../org.apache.ant/bin;../org.apache.ant/ant.jar;../org.apache.ant/jakarta-ant-1.4.1-optional.jar"/>
- </ant>
- </target>
+ <target name="gather.bin.parts" depends="init" if="destination">
+ <ant antfile="${template}" target="includesExcludesCopy">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="dest" value="${destination}/plugins/${plugin}_${version}"/>
+ <property name="excludes" value="${bin.excludes}"/>
+ <property name="includes" value="${bin.includes}"/>
+ </ant>
+ </target>
- <target name="lib/antsupportlib.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="mapping" value="src_ant/"/>
- <property name="includes" value="src_ant/"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${basedir}/lib/antsupportlib.jar"/>
- <property name="compilePath" value="../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;antsupport.jar;bin/;../org.apache.xerces/bin;../org.apache.xerces/xerces.jar;../org.apache.ant/bin;../org.apache.ant/ant.jar;../org.apache.ant/jakarta-ant-1.4.1-optional.jar"/>
- </ant>
- </target>
+ <target name="antsupport.jar" depends="init">
+ <ant antfile="${template}" target="jar">
+ <property name="dest" value="${basedir}/antsupport.jar"/>
+ <property name="srcdir" value="${basedir}"/>
+ <property name="includes" value="src/"/>
+ <property name="excludes" value=""/>
+ <property name="mapping" value="src/"/>
+ <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar"/>
+ </ant>
+ </target>
- <target name="jar" depends="init,antsupport.jar,lib/antsupportlib.jar">
- </target>
+ <target name="lib/antsupportlib.jar" depends="init">
+ <ant antfile="${template}" target="jar">
+ <property name="dest" value="${basedir}/lib/antsupportlib.jar"/>
+ <property name="srcdir" value="${basedir}"/>
+ <property name="includes" value="src_ant/"/>
+ <property name="excludes" value=""/>
+ <property name="mapping" value="src_ant/"/>
+ <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.apache.ant}/ant.jar"/>
+ </ant>
+ </target>
- <target name="antsupportsrc.zip" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="src">
- <property name="mapping" value="src/"/>
- <property name="includes" value="src/**/*.java"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${destroot}/antsupportsrc.zip"/>
- </ant>
- </target>
+ <target name="build.jars" depends="init,antsupport.jar,lib/antsupportlib.jar">
+ </target>
- <target name="lib/antsupportlibsrc.zip" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="src">
- <property name="mapping" value="src_ant/"/>
- <property name="includes" value="src_ant/**/*.java"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${destroot}/lib/antsupportlibsrc.zip"/>
- </ant>
- </target>
+ <target name="build.zips" depends="init">
+ </target>
- <target name="src" depends="init,antsupportsrc.zip,lib/antsupportlibsrc.zip">
- </target>
+ <target name="gather.sources" depends="init" if="destination">
+ <mkdir dir="${destination}/plugins/${plugin}_${version}"/>
+ <copy file="${basedir}/antsupportsrc.zip" todir="${destination}/plugins/${plugin}_${version}"/>
+ <mkdir dir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <copy file="${basedir}/lib/antsupportlibsrc.zip" todir="${destination}/plugins/${plugin}_${version}/lib"/>
+ </target>
- <target name="bin" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="bin">
- <property name="includes" value="plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
- <property name="excludes" value="src/,src_ant/"/>
- <property name="dest" value="${destroot}"/>
- </ant>
- </target>
+ <target name="antsupportsrc.zip" depends="init">
+ <ant antfile="${template}" target="src">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="mapping" value="src/"/>
+ <property name="dest" value="${basedir}/antsupportsrc.zip"/>
+ <property name="excludes" value=""/>
+ <property name="includes" value="src/**/*.java"/>
+ </ant>
+ </target>
- <target name="log" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="log">
- <property name="dest" value="${destroot}"/>
- </ant>
- </target>
+ <target name="lib/antsupportlibsrc.zip" depends="init">
+ <ant antfile="${template}" target="src">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="mapping" value="src_ant/"/>
+ <property name="dest" value="${basedir}/lib/antsupportlibsrc.zip"/>
+ <property name="excludes" value=""/>
+ <property name="includes" value="src_ant/**/*.java"/>
+ </ant>
+ </target>
- <target name="clean" depends="init">
- <ant antfile="${template}" target="clean">
- <property name="jar" value="antsupport.jar,lib/antsupportlib.jar"/>
- <property name="srczips" value="antsupportsrc.zip,lib/antsupportlibsrc.zip"/>
- </ant>
- <delete>
- <fileset dir="." includes="**/*.pdetemp"/>
- </delete>
- <delete file="${plugin}_${version}.zip"/>
- <delete file="${plugin}_${version}.src.zip"/>
- <delete file="${plugin}_${version}.doc.zip"/>
- <delete file="${plugin}_${version}.log.zip"/>
- </target>
-</project>
+ <target name="build.sources" depends="init,antsupportsrc.zip,lib/antsupportlibsrc.zip">
+ </target>
+
+ <target name="gather.logs" depends="init">
+ <mkdir dir="${destination}/plugins/${plugin}_${version}"/>
+ <copy file="${basedir}/antsupport.jar.bin.log" todir="${destination}/plugins/${plugin}_${version}"/>
+ <mkdir dir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <copy file="${basedir}/lib/antsupportlib.jar.bin.log" todir="${destination}/plugins/${plugin}_${version}/lib"/>
+ </target>
+
+ <target name="clean" depends="init">
+ <delete>
+ <fileset dir="${basedir}" includes="*.bin"/>
+ <fileset dir="${basedir}" includes="**/*.log"/>
+ <fileset dir="${basedir}" includes="antsupport.jar,lib/antsupportlib.jar"/>
+ <fileset dir="${basedir}" includes="antsupportsrc.zip,lib/antsupportlibsrc.zip"/>
+ <fileset dir="${basedir}" includes="**/*.pdetemp"/>
+ </delete>
+ <delete file="${plugin}_${version}.jar"/>
+ <delete file="${plugin}_${version}.src.zip"/>
+ <delete file="${plugin}_${version}.log.zip"/>
+ </target>
+
+ <target name="properties">
+ <property name="plugin" value="org.eclipse.ant.core"/>
+ <property name="version" value="1.9.0"/>
+ <pluginLocation plugin="org.eclipse.core.boot" property="location.org.eclipse.core.boot"/>
+ <pluginLocation plugin="org.eclipse.core.runtime" property="location.org.eclipse.core.runtime"/>
+ <pluginLocation plugin="org.apache.xerces" property="location.org.apache.xerces"/>
+ <pluginLocation plugin="org.apache.ant" property="location.org.apache.ant"/>
+ <pluginLocation plugin="org.eclipse.ant.core" property="location.org.eclipse.ant.core"/>
+ <property name="bin.includes" value="plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
+ <property name="bin.excludes" value="src/,src_ant/"/>
+ </target>
+
+</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/newpde_build.xml b/ant/org.eclipse.ant.core/newpde_build.xml
deleted file mode 100644
index b3faa09..0000000
--- a/ant/org.eclipse.ant.core/newpde_build.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.core" default="build.jars" basedir=".">
-
- <target name="initTemplate" unless="template">
- <initTemplate/>
- </target>
-
- <target name="init" depends="initTemplate, properties">
- </target>
-
- <target name="build.update.jar" depends="init">
- <property name="base" value="${basedir}/bin.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination" value="${base}/"/>
- </antcall>
- <delete>
- <fileset dir="${base}" includes="**/*.bin.log"/>
- </delete>
- <zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}"/>
- <delete dir="${base}"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination">
- <ant antfile="${template}" target="includesExcludesCopy">
- <property name="srcdir" value="${basedir}"/>
- <property name="dest" value="${destination}/plugins/${plugin}"/>
- <property name="excludes" value="${bin.excludes}"/>
- <property name="includes" value="${bin.includes}"/>
- </ant>
- </target>
-
- <target name="antsupport.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="dest" value="${basedir}/antsupport.jar"/>
- <property name="srcdir" value="${basedir}"/>
- <property name="includes" value="src/"/>
- <property name="excludes" value=""/>
- <property name="mapping" value="src/"/>
- <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar"/>
- </ant>
- </target>
-
- <target name="lib/antsupportlib.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="dest" value="${basedir}/lib/antsupportlib.jar"/>
- <property name="srcdir" value="${basedir}"/>
- <property name="includes" value="src_ant/"/>
- <property name="excludes" value=""/>
- <property name="mapping" value="src_ant/"/>
- <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.apache.ant}/ant.jar"/>
- </ant>
- </target>
-
- <target name="build.jars" depends="init,antsupport.jar,lib/antsupportlib.jar">
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination">
- <mkdir dir="${destination}/plugins/${plugin}"/>
- <copy file="${basedir}/antsupportsrc.zip" todir="${destination}/plugins/${plugin}"/>
- <mkdir dir="${destination}/plugins/${plugin}/lib"/>
- <copy file="${basedir}/lib/antsupportlibsrc.zip" todir="${destination}/plugins/${plugin}/lib"/>
- </target>
-
- <target name="antsupportsrc.zip" depends="init">
- <ant antfile="${template}" target="src">
- <property name="srcdir" value="${basedir}"/>
- <property name="mapping" value="src/"/>
- <property name="dest" value="${basedir}/antsupportsrc.zip"/>
- <property name="excludes" value=""/>
- <property name="includes" value="src/**/*.java"/>
- </ant>
- </target>
-
- <target name="lib/antsupportlibsrc.zip" depends="init">
- <ant antfile="${template}" target="src">
- <property name="srcdir" value="${basedir}"/>
- <property name="mapping" value="src_ant/"/>
- <property name="dest" value="${basedir}/lib/antsupportlibsrc.zip"/>
- <property name="excludes" value=""/>
- <property name="includes" value="src_ant/**/*.java"/>
- </ant>
- </target>
-
- <target name="build.sources" depends="init,antsupportsrc.zip,lib/antsupportlibsrc.zip">
- </target>
-
- <target name="gather.logs" depends="init">
- <mkdir dir="${destination}/plugins/${plugin}"/>
- <copy file="${basedir}/antsupport.jar.bin.log" todir="${destination}/plugins/${plugin}"/>
- <mkdir dir="${destination}/plugins/${plugin}/lib"/>
- <copy file="${basedir}/lib/antsupportlib.jar.bin.log" todir="${destination}/plugins/${plugin}/lib"/>
- </target>
-
- <target name="clean" depends="init">
- <delete>
- <fileset dir="${basedir}" includes="*.bin"/>
- <fileset dir="${basedir}" includes="**/*.log"/>
- <fileset dir="${basedir}" includes="antsupport.jar,lib/antsupportlib.jar"/>
- <fileset dir="${basedir}" includes="antsupportsrc.zip,lib/antsupportlibsrc.zip"/>
- <fileset dir="${basedir}" includes="**/*.pdetemp"/>
- </delete>
- <delete file="${plugin}_${version}.jar"/>
- <delete file="${plugin}_${version}.src.zip"/>
- <delete file="${plugin}_${version}.log.zip"/>
- </target>
-
- <target name="properties">
- <property name="plugin" value="org.eclipse.ant.core"/>
- <property name="version" value="2.2.1"/>
- <pluginLocation plugin="org.eclipse.core.boot" property="location.org.eclipse.core.boot"/>
- <pluginLocation plugin="org.eclipse.core.runtime" property="location.org.eclipse.core.runtime"/>
- <pluginLocation plugin="org.apache.xerces" property="location.org.apache.xerces"/>
- <pluginLocation plugin="org.apache.ant" property="location.org.apache.ant"/>
- <pluginLocation plugin="org.eclipse.ant.core" property="location.org.eclipse.ant.core"/>
- <property name="bin.includes" value="plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
- <property name="bin.excludes" value="src/,src_ant/"/>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/build.xml b/ant/org.eclipse.ant.ui/build.xml
index b9f7ec6..1f0c98d 100644
--- a/ant/org.eclipse.ant.ui/build.xml
+++ b/ant/org.eclipse.ant.ui/build.xml
@@ -1,140 +1,131 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.ui" default="plugin.zip" basedir=".">
- <target name="initTemplate" unless="template">
- <initTemplate/>
- </target>
- <target name="init" depends="initTemplate">
- <property name="plugin" value="org.eclipse.ant.ui"/>
- <property name="version" value="2.0.2"/>
- <property name="stamp" value=""/>
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- <property name="nl" value="en_US"/>
- <property name="arch" value="x86"/>
- </target>
+<project name="org.eclipse.ant.ui" default="build.jars" basedir=".">
- <target name="src.zip" depends="init">
- <property name="base" value="${basedir}/src.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="src">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.src.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="initTemplate" unless="template">
+ <initTemplate/>
+ </target>
- <target name="plugin.zip" depends="bin.zip"/>
- <target name="bin.zip" depends="init">
- <property name="base" value="${basedir}/bin.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="jar">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <antcall target="bin">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <delete>
- <fileset dir="${base}" includes="**/*.bin.log"/>
- </delete>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="init" depends="initTemplate, properties">
+ </target>
- <target name="log.zip" depends="init">
- <property name="base" value="${basedir}/log.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="log">
- <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
- </antcall>
- <ant antfile="${template}" target="runZip">
- <property name="resultingFile" value="${basedir}/${plugin}_${version}.log.zip"/>
- <property name="targetDir" value="${base}"/>
- </ant>
- <delete dir="${base}"/>
- </target>
+ <target name="build.update.jar" depends="init">
+ <property name="base" value="${basedir}/bin.zip.pdetemp"/>
+ <delete dir="${base}"/>
+ <mkdir dir="${base}"/>
+ <antcall target="build.jars"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination" value="${base}/"/>
+ </antcall>
+ <delete>
+ <fileset dir="${base}" includes="**/*.bin.log"/>
+ </delete>
+ <zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}_${version}"/>
+ <delete dir="${base}"/>
+ </target>
- <target name="antui.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="mapping" value="src/"/>
- <property name="includes" value="src/"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${basedir}/antui.jar"/>
- <property name="compilePath" value="../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;../org.apache.ant/bin;../org.apache.ant/ant.jar;../org.apache.ant/jakarta-ant-1.4.1-optional.jar;../org.apache.xerces/bin;../org.apache.xerces/xerces.jar;../org.eclipse.ant.core/bin;../org.eclipse.ant.core/antsupport.jar;../org.eclipse.core.resources/bin;../org.eclipse.core.resources/resources.jar;../org.eclipse.ui/bin;../org.eclipse.ui/workbench.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.apache.lucene/bin;../org.apache.lucene/lucene-1.2-rc2.jar;../org.apache.lucene/lucenedemo.zip;../org.eclipse.swt/bin;../org.eclipse.swt/ws/${ws}/swt-pi.jar;../org.eclipse.swt/ws/${ws}/swt.jar"/>
- </ant>
- </target>
+ <target name="gather.bin.parts" depends="init" if="destination">
+ <ant antfile="${template}" target="includesExcludesCopy">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="dest" value="${destination}/plugins/${plugin}_${version}"/>
+ <property name="excludes" value="${bin.excludes}"/>
+ <property name="includes" value="${bin.includes}"/>
+ </ant>
+ </target>
- <target name="lib/antuilib.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="mapping" value="src_ant/"/>
- <property name="includes" value="src_ant/"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${basedir}/lib/antuilib.jar"/>
- <property name="compilePath" value="../org.eclipse.core.runtime/bin;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.boot/bin;../org.eclipse.core.boot/boot.jar;antui.jar;bin/;../org.apache.ant/bin;../org.apache.ant/ant.jar;../org.apache.ant/jakarta-ant-1.4.1-optional.jar;../org.apache.xerces/bin;../org.apache.xerces/xerces.jar;../org.eclipse.ant.core/bin;../org.eclipse.ant.core/antsupport.jar;../org.eclipse.core.resources/bin;../org.eclipse.core.resources/resources.jar;../org.eclipse.ui/bin;../org.eclipse.ui/workbench.jar;../org.eclipse.help/bin;../org.eclipse.help/help.jar;../org.apache.lucene/bin;../org.apache.lucene/lucene-1.2-rc2.jar;../org.apache.lucene/lucenedemo.zip;../org.eclipse.swt/bin;../org.eclipse.swt/ws/${ws}/swt-pi.jar;../org.eclipse.swt/ws/${ws}/swt.jar"/>
- </ant>
- </target>
+ <target name="lib/antuilib.jar" depends="init">
+ <ant antfile="${template}" target="jar">
+ <property name="dest" value="${basedir}/lib/antuilib.jar"/>
+ <property name="srcdir" value="${basedir}"/>
+ <property name="includes" value="src_ant/"/>
+ <property name="excludes" value=""/>
+ <property name="mapping" value="src_ant/"/>
+ <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.ui}/bin;${location.org.eclipse.ant.ui}/antui.jar;${location.org.apache.ant}/bin;${location.org.apache.ant}/ant.jar;${location.org.apache.ant}/jakarta-ant-1.4.1-optional.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.eclipse.core.resources}/bin;${location.org.eclipse.core.resources}/resources.jar;${location.org.eclipse.ui}/bin;${location.org.eclipse.ui}/workbench.jar;${location.org.eclipse.help}/bin;${location.org.eclipse.help}/help.jar;${location.org.apache.lucene}/bin;${location.org.apache.lucene}/lucene-1.2-rc2.jar;${location.org.apache.lucene}/lucenedemo.zip;${location.org.eclipse.swt}/bin;${location.org.eclipse.swt}/ws/${ws}/swt-pi.jar;${location.org.eclipse.swt}/ws/${ws}/swt.jar"/>
+ </ant>
+ </target>
- <target name="jar" depends="init,antui.jar,lib/antuilib.jar">
- </target>
+ <target name="antui.jar" depends="init">
+ <ant antfile="${template}" target="jar">
+ <property name="dest" value="${basedir}/antui.jar"/>
+ <property name="srcdir" value="${basedir}"/>
+ <property name="includes" value="src/"/>
+ <property name="excludes" value=""/>
+ <property name="mapping" value="src/"/>
+ <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.ui}/bin;${location.org.eclipse.ant.ui}/antui.jar;${location.org.apache.ant}/bin;${location.org.apache.ant}/ant.jar;${location.org.apache.ant}/jakarta-ant-1.4.1-optional.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.eclipse.core.resources}/bin;${location.org.eclipse.core.resources}/resources.jar;${location.org.eclipse.ui}/bin;${location.org.eclipse.ui}/workbench.jar;${location.org.eclipse.help}/bin;${location.org.eclipse.help}/help.jar;${location.org.apache.lucene}/bin;${location.org.apache.lucene}/lucene-1.2-rc2.jar;${location.org.apache.lucene}/lucenedemo.zip;${location.org.eclipse.swt}/bin;${location.org.eclipse.swt}/ws/${ws}/swt-pi.jar;${location.org.eclipse.swt}/ws/${ws}/swt.jar"/>
+ </ant>
+ </target>
- <target name="antuisrc.zip" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="src">
- <property name="mapping" value="src/"/>
- <property name="includes" value="src/**/*.java"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${destroot}/antuisrc.zip"/>
- </ant>
- </target>
+ <target name="build.jars" depends="init,antui.jar,lib/antuilib.jar">
+ </target>
- <target name="lib/antuilibsrc.zip" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="src">
- <property name="mapping" value="src_ant/"/>
- <property name="includes" value="src_ant/**/*.java"/>
- <property name="excludes" value=""/>
- <property name="dest" value="${destroot}/lib/antuilibsrc.zip"/>
- </ant>
- </target>
+ <target name="build.zips" depends="init">
+ </target>
- <target name="src" depends="init,antuisrc.zip,lib/antuilibsrc.zip">
- </target>
+ <target name="gather.sources" depends="init" if="destination">
+ <mkdir dir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <copy file="${basedir}/lib/antuilibsrc.zip" todir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <mkdir dir="${destination}/plugins/${plugin}_${version}"/>
+ <copy file="${basedir}/antuisrc.zip" todir="${destination}/plugins/${plugin}_${version}"/>
+ </target>
- <target name="bin" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="bin">
- <property name="includes" value="icons/,plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
- <property name="excludes" value="src/,src_ant/"/>
- <property name="dest" value="${destroot}"/>
- </ant>
- </target>
+ <target name="lib/antuilibsrc.zip" depends="init">
+ <ant antfile="${template}" target="src">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="mapping" value="src_ant/"/>
+ <property name="dest" value="${basedir}/lib/antuilibsrc.zip"/>
+ <property name="excludes" value=""/>
+ <property name="includes" value="src_ant/**/*.java"/>
+ </ant>
+ </target>
- <target name="log" depends="init">
- <property name="destroot" value="${basedir}"/>
- <ant antfile="${template}" target="log">
- <property name="dest" value="${destroot}"/>
- </ant>
- </target>
+ <target name="antuisrc.zip" depends="init">
+ <ant antfile="${template}" target="src">
+ <property name="srcdir" value="${basedir}"/>
+ <property name="mapping" value="src/"/>
+ <property name="dest" value="${basedir}/antuisrc.zip"/>
+ <property name="excludes" value=""/>
+ <property name="includes" value="src/**/*.java"/>
+ </ant>
+ </target>
- <target name="clean" depends="init">
- <ant antfile="${template}" target="clean">
- <property name="jar" value="antui.jar,lib/antuilib.jar"/>
- <property name="srczips" value="antuisrc.zip,lib/antuilibsrc.zip"/>
- </ant>
- <delete>
- <fileset dir="." includes="**/*.pdetemp"/>
- </delete>
- <delete file="${plugin}_${version}.zip"/>
- <delete file="${plugin}_${version}.src.zip"/>
- <delete file="${plugin}_${version}.doc.zip"/>
- <delete file="${plugin}_${version}.log.zip"/>
- </target>
-</project>
+ <target name="build.sources" depends="init,lib/antuilibsrc.zip,antuisrc.zip">
+ </target>
+
+ <target name="gather.logs" depends="init">
+ <mkdir dir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <copy file="${basedir}/lib/antuilib.jar.bin.log" todir="${destination}/plugins/${plugin}_${version}/lib"/>
+ <mkdir dir="${destination}/plugins/${plugin}_${version}"/>
+ <copy file="${basedir}/antui.jar.bin.log" todir="${destination}/plugins/${plugin}_${version}"/>
+ </target>
+
+ <target name="clean" depends="init">
+ <delete>
+ <fileset dir="${basedir}" includes="*.bin"/>
+ <fileset dir="${basedir}" includes="**/*.log"/>
+ <fileset dir="${basedir}" includes="lib/antuilib.jar,antui.jar"/>
+ <fileset dir="${basedir}" includes="lib/antuilibsrc.zip,antuisrc.zip"/>
+ <fileset dir="${basedir}" includes="**/*.pdetemp"/>
+ </delete>
+ <delete file="${plugin}_${version}.jar"/>
+ <delete file="${plugin}_${version}.src.zip"/>
+ <delete file="${plugin}_${version}.log.zip"/>
+ </target>
+
+ <target name="properties">
+ <property name="plugin" value="org.eclipse.ant.ui"/>
+ <property name="version" value="1.9.0"/>
+ <pluginLocation plugin="org.eclipse.swt" property="location.org.eclipse.swt"/>
+ <pluginLocation plugin="org.apache.ant" property="location.org.apache.ant"/>
+ <pluginLocation plugin="org.eclipse.ant.core" property="location.org.eclipse.ant.core"/>
+ <pluginLocation plugin="org.eclipse.ant.ui" property="location.org.eclipse.ant.ui"/>
+ <pluginLocation plugin="org.eclipse.ui" property="location.org.eclipse.ui"/>
+ <pluginLocation plugin="org.eclipse.help" property="location.org.eclipse.help"/>
+ <pluginLocation plugin="org.eclipse.core.boot" property="location.org.eclipse.core.boot"/>
+ <pluginLocation plugin="org.apache.lucene" property="location.org.apache.lucene"/>
+ <pluginLocation plugin="org.eclipse.core.runtime" property="location.org.eclipse.core.runtime"/>
+ <pluginLocation plugin="org.apache.xerces" property="location.org.apache.xerces"/>
+ <pluginLocation plugin="org.eclipse.core.resources" property="location.org.eclipse.core.resources"/>
+ <property name="bin.includes" value="icons/,plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
+ <property name="bin.excludes" value="src/,src_ant/"/>
+ </target>
+
+</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/newpde_build.xml b/ant/org.eclipse.ant.ui/newpde_build.xml
deleted file mode 100644
index 9e33740..0000000
--- a/ant/org.eclipse.ant.ui/newpde_build.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.ui" default="build.jars" basedir=".">
-
- <target name="initTemplate" unless="template">
- <initTemplate/>
- </target>
-
- <target name="init" depends="initTemplate, properties">
- </target>
-
- <target name="build.update.jar" depends="init">
- <property name="base" value="${basedir}/bin.zip.pdetemp"/>
- <delete dir="${base}"/>
- <mkdir dir="${base}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination" value="${base}/"/>
- </antcall>
- <delete>
- <fileset dir="${base}" includes="**/*.bin.log"/>
- </delete>
- <zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}"/>
- <delete dir="${base}"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination">
- <ant antfile="${template}" target="includesExcludesCopy">
- <property name="srcdir" value="${basedir}"/>
- <property name="dest" value="${destination}/plugins/${plugin}"/>
- <property name="excludes" value="${bin.excludes}"/>
- <property name="includes" value="${bin.includes}"/>
- </ant>
- </target>
-
- <target name="lib/antuilib.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="dest" value="${basedir}/lib/antuilib.jar"/>
- <property name="srcdir" value="${basedir}"/>
- <property name="includes" value="src_ant/"/>
- <property name="excludes" value=""/>
- <property name="mapping" value="src_ant/"/>
- <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.ui}/bin;${location.org.eclipse.ant.ui}/antui.jar;${location.org.apache.ant}/bin;${location.org.apache.ant}/ant.jar;${location.org.apache.ant}/jakarta-ant-1.4.1-optional.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.eclipse.core.resources}/bin;${location.org.eclipse.core.resources}/resources.jar;${location.org.eclipse.ui}/bin;${location.org.eclipse.ui}/workbench.jar;${location.org.eclipse.help}/bin;${location.org.eclipse.help}/help.jar;${location.org.apache.lucene}/bin;${location.org.apache.lucene}/lucene-1.2-rc2.jar;${location.org.apache.lucene}/lucenedemo.zip;${location.org.eclipse.swt}/bin;${location.org.eclipse.swt}/ws/${ws}/swt-pi.jar;${location.org.eclipse.swt}/ws/${ws}/swt.jar"/>
- </ant>
- </target>
-
- <target name="antui.jar" depends="init">
- <ant antfile="${template}" target="jar">
- <property name="dest" value="${basedir}/antui.jar"/>
- <property name="srcdir" value="${basedir}"/>
- <property name="includes" value="src/"/>
- <property name="excludes" value=""/>
- <property name="mapping" value="src/"/>
- <property name="compilePath" value="${location.org.eclipse.core.runtime}/bin;${location.org.eclipse.core.runtime}/runtime.jar;${location.org.eclipse.core.boot}/bin;${location.org.eclipse.core.boot}/boot.jar;${location.org.eclipse.ant.ui}/bin;${location.org.eclipse.ant.ui}/antui.jar;${location.org.apache.ant}/bin;${location.org.apache.ant}/ant.jar;${location.org.apache.ant}/jakarta-ant-1.4.1-optional.jar;${location.org.apache.xerces}/bin;${location.org.apache.xerces}/xerces.jar;${location.org.eclipse.ant.core}/bin;${location.org.eclipse.ant.core}/antsupport.jar;${location.org.eclipse.core.resources}/bin;${location.org.eclipse.core.resources}/resources.jar;${location.org.eclipse.ui}/bin;${location.org.eclipse.ui}/workbench.jar;${location.org.eclipse.help}/bin;${location.org.eclipse.help}/help.jar;${location.org.apache.lucene}/bin;${location.org.apache.lucene}/lucene-1.2-rc2.jar;${location.org.apache.lucene}/lucenedemo.zip;${location.org.eclipse.swt}/bin;${location.org.eclipse.swt}/ws/${ws}/swt-pi.jar;${location.org.eclipse.swt}/ws/${ws}/swt.jar"/>
- </ant>
- </target>
-
- <target name="build.jars" depends="init,antui.jar,lib/antuilib.jar">
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination">
- <mkdir dir="${destination}/plugins/${plugin}/lib"/>
- <copy file="${basedir}/lib/antuilibsrc.zip" todir="${destination}/plugins/${plugin}/lib"/>
- <mkdir dir="${destination}/plugins/${plugin}"/>
- <copy file="${basedir}/antuisrc.zip" todir="${destination}/plugins/${plugin}"/>
- </target>
-
- <target name="lib/antuilibsrc.zip" depends="init">
- <ant antfile="${template}" target="src">
- <property name="srcdir" value="${basedir}"/>
- <property name="mapping" value="src_ant/"/>
- <property name="dest" value="${basedir}/lib/antuilibsrc.zip"/>
- <property name="excludes" value=""/>
- <property name="includes" value="src_ant/**/*.java"/>
- </ant>
- </target>
-
- <target name="antuisrc.zip" depends="init">
- <ant antfile="${template}" target="src">
- <property name="srcdir" value="${basedir}"/>
- <property name="mapping" value="src/"/>
- <property name="dest" value="${basedir}/antuisrc.zip"/>
- <property name="excludes" value=""/>
- <property name="includes" value="src/**/*.java"/>
- </ant>
- </target>
-
- <target name="build.sources" depends="init,lib/antuilibsrc.zip,antuisrc.zip">
- </target>
-
- <target name="gather.logs" depends="init">
- <mkdir dir="${destination}/plugins/${plugin}/lib"/>
- <copy file="${basedir}/lib/antuilib.jar.bin.log" todir="${destination}/plugins/${plugin}/lib"/>
- <mkdir dir="${destination}/plugins/${plugin}"/>
- <copy file="${basedir}/antui.jar.bin.log" todir="${destination}/plugins/${plugin}"/>
- </target>
-
- <target name="clean" depends="init">
- <delete>
- <fileset dir="${basedir}" includes="*.bin"/>
- <fileset dir="${basedir}" includes="**/*.log"/>
- <fileset dir="${basedir}" includes="lib/antuilib.jar,antui.jar"/>
- <fileset dir="${basedir}" includes="lib/antuilibsrc.zip,antuisrc.zip"/>
- <fileset dir="${basedir}" includes="**/*.pdetemp"/>
- </delete>
- <delete file="${plugin}_${version}.jar"/>
- <delete file="${plugin}_${version}.src.zip"/>
- <delete file="${plugin}_${version}.log.zip"/>
- </target>
-
- <target name="properties">
- <property name="plugin" value="org.eclipse.ant.ui"/>
- <property name="version" value="2.0.2"/>
- <pluginLocation plugin="org.eclipse.swt" property="location.org.eclipse.swt"/>
- <pluginLocation plugin="org.apache.ant" property="location.org.apache.ant"/>
- <pluginLocation plugin="org.eclipse.ant.core" property="location.org.eclipse.ant.core"/>
- <pluginLocation plugin="org.eclipse.ant.ui" property="location.org.eclipse.ant.ui"/>
- <pluginLocation plugin="org.eclipse.ui" property="location.org.eclipse.ui"/>
- <pluginLocation plugin="org.eclipse.help" property="location.org.eclipse.help"/>
- <pluginLocation plugin="org.eclipse.core.boot" property="location.org.eclipse.core.boot"/>
- <pluginLocation plugin="org.apache.lucene" property="location.org.apache.lucene"/>
- <pluginLocation plugin="org.eclipse.core.runtime" property="location.org.eclipse.core.runtime"/>
- <pluginLocation plugin="org.apache.xerces" property="location.org.apache.xerces"/>
- <pluginLocation plugin="org.eclipse.core.resources" property="location.org.eclipse.core.resources"/>
- <property name="bin.includes" value="icons/,plugin.xml,*.jar,plugin.properties,about.html,lib/"/>
- <property name="bin.excludes" value="src/,src_ant/"/>
- </target>
-
-</project>
\ No newline at end of file
