Bug 36870 - Separate the Ant UI from the ExternalToolsUI

4 files changed, 148 insertions, 0 deletions

diff --git a/org.eclipse.ui.externaltools/buildfiles/buildSelfHostingJARs.xml b/org.eclipse.ui.externaltools/buildfiles/buildSelfHostingJARs.xml
new file mode 100644
index 000000000..4057dc544
--- /dev/null
+++ b/org.eclipse.ui.externaltools/buildfiles/buildSelfHostingJARs.xml
@@ -0,0 +1,14 @@
+<project name="Build Selfhosting JARs" default="Create extra JARs" basedir=".">
+	<target name="init">
+		<tstamp/>
+	</target>
+
+	<target name="Create extra JARs" depends="init">
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ant.core" target="clean"/>
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ant.core" target="lib/antsupportlib.jar"/>
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ant.core" target="refresh"/>
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ui.externaltools" target="clean"/>
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ui.externaltools" target="lib/antrunnerlib.jar"/>
+		<ant antfile="scripts/buildExtraJAR.xml" dir="../../org.eclipse.ui.externaltools" target="refresh"/>
+	</target>
+</project>
diff --git a/org.eclipse.ui.externaltools/buildfiles/exportplugin.xml b/org.eclipse.ui.externaltools/buildfiles/exportplugin.xml
new file mode 100644
index 000000000..948fc9a66
--- /dev/null
+++ b/org.eclipse.ui.externaltools/buildfiles/exportplugin.xml
@@ -0,0 +1,44 @@
+<!-- Export a jar of .class files for the org.eclipse.ui.externaltools Eclipse plug-in
+     along with other important plugin files to the "plugin-export" subdirectory
+     of the target Eclipse installation -->
+<project name="Export externaltools" default="export" basedir="..">
+
+	<!-- Set the timestamp and important properties -->
+	<target name="init">
+		<tstamp/>
+		<property name="destdir" value="../../plugin-export" />
+		<property name="dest"  value="${destdir}/org.eclipse.ui.externaltools_2.1.0" />
+	</target>
+
+	<!-- Create the jar of .class files, and copy other important files to export dir -->
+	<target name="export" depends="init">
+		<mkdir dir="${destdir}" />
+		<delete dir="${dest}" />
+		<mkdir dir="${dest}" />
+		<delete dir="${dest}/lib"/>
+		<mkdir dir="${dest}/lib"/>
+		<jar jarfile="${dest}/externaltools.jar">
+			<fileset dir="bin">
+				<exclude name="org/eclipse/ui/externaltools/internal/ant/inputhandler/*"/>
+				<exclude name="org/eclipse/ui/externaltools/internal/ant/logger/*"/>
+			</fileset>
+		</jar>
+		<!-- Create the source zip -->
+		<zip zipfile="${dest}/externaltoolssrc.zip">
+			<fileset dir="Ant Runner Support"/>
+			<fileset dir="Ant Tools Support"/>
+			<fileset dir="External Tools Base"/>
+			<fileset dir="Program Tools Support"/>
+			<fileset dir="Ant Editor"/>
+		</zip>
+		<copy file="plugin.xml" todir="${dest}"/>
+		<copy file="plugin.properties" todir="${dest}"/>
+		<copy file=".classpath" todir="${dest}"/>
+		<copy file=".options" todir="${dest}"/>
+		<copy file="lib/antrunner.jar" todir="${dest}/lib"/>
+		<copy todir="${dest}/icons">
+			<fileset dir="icons" />
+		</copy>		
+	</target>
+	
+</project>
diff --git a/org.eclipse.ui.externaltools/buildfiles/updateTarget.xml b/org.eclipse.ui.externaltools/buildfiles/updateTarget.xml
new file mode 100644
index 000000000..22c0307b6
--- /dev/null
+++ b/org.eclipse.ui.externaltools/buildfiles/updateTarget.xml
@@ -0,0 +1,78 @@
+<!-- 
+
+	For use in development of the External tools plugin 
+	This script can be used to update a target for testing/debugging
+	Export a jar of .class files for the org.eclipse.ant.core Eclipse plugin
+    along with other important plugin files to the "plugin-export" subdirectory
+    of the target Eclipse installation
+	As well the export of the plugin is copied to a target installation.
+ -->
+<project name="Update target" default="export" basedir="..">
+
+	<!-- Set the timestamp and important properties -->
+	<target name="init">
+		<tstamp/>
+		<property name="bootclasspath" value=""/>
+		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+		<property name="destdir" value="../../plugin-export" />
+		<property name="pluginName" value= "org.eclipse.ui.externaltools_2.1.0"/>
+		<property name="destBin"  value="${destdir}/${pluginName}" />
+		<property name="destSrc"  value="${destdir}/org.eclipse.platform.source/src/org.eclipse.ui.externaltools_2.1.0" />
+		<property name="temp.folder" value="${destdir}/temp.folder"/>
+		<property name="swt.jar" value="${basedir}/../org.eclipse.swt.win32/ws/win32/swt.jar"/>
+
+		<property name="currentBuild" value="../../Debugger/Ant/eclipse"/>
+		<property name="currentBuildPlugins" value="${currentBuild}/plugins/${pluginName}"/>
+	</target>
+
+	<!-- Create the jar of .class files, and copy other important files to export dir -->
+	<target name="export" depends="init">
+		<mkdir dir="${destdir}" />
+		<delete dir="${destBin}" />
+		<mkdir dir="${destBin}" />
+		<delete dir="${destSrc}" />
+		<mkdir dir="${destSrc}" />
+		<delete dir="${destBin}/lib" />
+		<jar 
+			jarfile="${destBin}/externaltools.jar"
+			basedir="bin"
+			excludes="bin/org/eclipse/ui/externaltools/internal/ui/ant"
+		/>
+		<!-- Create the source zip -->
+		<zip zipfile="${destSrc}/externaltoolssrc.zip">
+			<fileset dir="External Tools Base"/>
+			<fileset dir="Program Tools Support"/>
+			<fileset dir="Ant Tools Support"/>
+		</zip>
+		<copy file="plugin.xml" todir="${destBin}"/>
+		<copy file="plugin.properties" todir="${destBin}"/>
+		<copy file="about.html" todir="${destBin}"/>
+		<copy file=".classpath" todir="${destBin}"/>
+		<copy file=".options" todir="${destBin}"/>
+		<copy todir="${destBin}/icons">
+			<fileset dir="icons" />
+		</copy>	
+		
+		<delete dir="${temp.folder}/lib/antrunner.jar.bin"/>
+		<mkdir dir="${temp.folder}/lib/antrunner.jar.bin"/>
+		<!-- compile the source code -->
+		<javac target="1.3" source="1.3" destdir="${temp.folder}/lib/antrunner.jar.bin" failonerror="false" verbose="false" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="${basedir}/../org.eclipse.core.runtime/runtime.jar;${basedir}/../org.apache.ant/ant.jar;${basedir}/../org.apache.xerces/xercesImpl.jar;${basedir}/../org.apache.xerces/xmlParserAPIs.jar;${basedir}/bin;${basedir}/../org.eclipse.core.boot/boot.jar;${swt.jar};${basedir}/../org.eclipse.ant.core/bin">
+			<src path="Ant Runner Support/"/>
+		</javac>
+		<!-- copy any necessary resources -->
+		<copy todir="${temp.folder}/lib/antrunner.jar.bin">
+			<fileset dir="Ant Runner Support/" excludes="**/*.java"/>
+		</copy>
+		<mkdir dir="${destBin}/lib"/>
+		<jar jarfile="${destBin}/lib/antrunner.jar" basedir="${temp.folder}/lib/antrunner.jar.bin"/>
+		<delete dir="${temp.folder}"/>
+		
+	</target>
+	
+	<target name="copy" depends="init">
+		<delete dir="${currentBuildPlugins}/${pluginName}" />
+		<copy todir="${currentBuildPlugins}">
+			<fileset dir="${destBin}"/>
+		</copy>
+	</target>
+</project>
diff --git a/org.eclipse.ui.externaltools/buildfiles/updateTargets.xml b/org.eclipse.ui.externaltools/buildfiles/updateTargets.xml
new file mode 100644
index 000000000..23289c85a
--- /dev/null
+++ b/org.eclipse.ui.externaltools/buildfiles/updateTargets.xml
@@ -0,0 +1,12 @@
+<project name="Update targets" default="export to remote targets" basedir=".">
+	<target name="init">
+		<tstamp/>
+	</target>
+
+	<target name="export to remote targets" depends="init">
+		<ant antfile="scripts/updateTarget.xml" dir="../../org.eclipse.ant.core" target="export"/>
+		<ant antfile="scripts/updateTarget.xml" dir="../../org.eclipse.ant.core" target="copy"/>
+		<ant antfile="scripts/updateTarget.xml" dir="../../org.eclipse.ui.externaltools" target="export"/>
+		<ant antfile="scripts/updateTarget.xml" dir="../../org.eclipse.ui.externaltools" target="copy"/>
+	</target>
+</project>