diff options
author | DJ Houghton | 2009-01-17 01:30:37 +0000 |
---|---|---|
committer | DJ Houghton | 2009-01-17 01:30:37 +0000 |
commit | dbb26c2794bcaf57f191c9e40fb458a4b8cd4747 (patch) | |
tree | f504a052512beeae20e439d453ce19996fd9cb6f /bundles/org.eclipse.equinox.p2.director.app | |
parent | 1f771aa9a636dc5395773a27b1a08242ec9fb295 (diff) | |
download | rt.equinox.p2-dbb26c2794bcaf57f191c9e40fb458a4b8cd4747.tar.gz rt.equinox.p2-dbb26c2794bcaf57f191c9e40fb458a4b8cd4747.tar.xz rt.equinox.p2-dbb26c2794bcaf57f191c9e40fb458a4b8cd4747.zip |
Just zip up the .class files in the bin/ folder to create the Ant JARs for the workspace.
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.director.app')
3 files changed, 8 insertions, 49 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director.app/.classpath b/bundles/org.eclipse.equinox.p2.director.app/.classpath index 0304ec513..75116d75c 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/.classpath +++ b/bundles/org.eclipse.equinox.p2.director.app/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="src_ant"/> + <classpathentry kind="src" output="bin_ant" path="src_ant"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.equinox.p2.director.app/.externalToolBuilders/Build Director Ant Tasks.launch b/bundles/org.eclipse.equinox.p2.director.app/.externalToolBuilders/Build Director Ant Tasks.launch index bca099f7c..225deca2b 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/.externalToolBuilders/Build Director Ant Tasks.launch +++ b/bundles/org.eclipse.equinox.p2.director.app/.externalToolBuilders/Build Director Ant Tasks.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> @@ -14,7 +14,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.director.app"/> -<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.p2.director.app/scripts/buildExtraJAR.xml}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> diff --git a/bundles/org.eclipse.equinox.p2.director.app/scripts/buildExtraJAR.xml b/bundles/org.eclipse.equinox.p2.director.app/scripts/buildExtraJAR.xml index eddf1d9d2..1582323b9 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/scripts/buildExtraJAR.xml +++ b/bundles/org.eclipse.equinox.p2.director.app/scripts/buildExtraJAR.xml @@ -1,51 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.core.resources" default="main" basedir=".."> +<project name="org.eclipse.equinox.p2.director.app" default="default" basedir=".."> - <target name="main" depends="clean, ant_tasks/director-ant.jar"> + <target name="default" description="Jar up the binaries that were compiled by the jdt builder" > + <mkdir dir="${basedir}/ant_tasks" /> + <delete file="${basedir}/ant_tasks/director-ant.jar" failonerror="false"/> + <jar destfile="${basedir}/ant_tasks/director-ant.jar" basedir="${basedir}/bin_ant"/> </target> - <target name="init" depends="properties"> - <property name="plugin" value="org.eclipse.equinox.p2.director.app"/> - <property name="temp.folder" value="${basedir}/temp.folder"/> - <property name="plugin.destination" value="${basedir}"/> - <property name="build.result.folder" value="${basedir}/ant_tasks"/> - <property name="version.suffix" value="_3.1.0"/> - </target> - - <target name="properties" if="eclipse.running"> - <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/> - </target> - - <target name="ant_tasks/director-ant.jar" depends="init" unless="ant_tasks/director-ant.jar"> - <property name="destdir" value="${temp.folder}/ant_tasks/director-ant.jar.bin"/> - <delete dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/> - <mkdir dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/> - <!-- compile the source code --> - <javac destdir="${temp.folder}/ant_tasks/director-ant.jar.bin" failonerror="true" verbose="true" debug="on"> - <classpath> - <dirset dir="${basedir}/.."> - <include name="org.eclipse.equinox.p2.director.app/bin"/> - <include name="org.eclipse.osgi/bin"/> - </dirset> - <fileset dir="${eclipse.home}"> - <include name="plugins/org.eclipse.equinox.p2.director.app*.jar"/> - <include name="plugins/org.eclipse.osgi*.jar"/> - </fileset> - </classpath> - <src path="src_ant/"/> - </javac> - <!-- copy necessary resources --> - <copy todir="${temp.folder}/ant_tasks/director-ant.jar.bin"> - <fileset dir="src_ant/" excludes="**/*.java"/> - </copy> - <mkdir dir="${build.result.folder}"/> - <jar jarfile="${build.result.folder}/director-ant.jar" basedir="${temp.folder}/ant_tasks/director-ant.jar.bin"/> - <delete dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/> - <delete dir="${temp.folder}"/> - </target> - - <target name="clean" depends="init"> - <delete file="${build.result.folder}/director-ant.jar"/> - <delete dir="${temp.folder}"/> - </target> </project>
\ No newline at end of file |