Fix #1368081: First suggestion in #1368081 seems to be working better

[phpeclipse.git] / net.sourceforge.phpeclipse.phphelp / build.xml

diff --git a/net.sourceforge.phpeclipse.phphelp/build.xml b/net.sourceforge.phpeclipse.phphelp/build.xml
index 280176c..08cac08 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/build.xml
+++ b/net.sourceforge.phpeclipse.phphelp/build.xml
@@ -37,7 +37,7 @@
                <antcall target="gather.bin.parts">
                        <param name="destination.temp.folder" value="${temp.folder}/"/>
                </antcall>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" filesonly="false" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -57,7 +57,8 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.ide_3.0.1/ide.jar"/>
+                               <pathelement path="../org.eclipse.ui.ide/bin"/>
+                               <pathelement path="../org.eclipse.ui.ide/ide.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
@@ -69,8 +70,9 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1/ws/${basews}/swt.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/compatibility.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/workbench.jar"/>
+                               <pathelement path="../org.eclipse.ui.workbench/bin"/>
+                               <pathelement path="../org.eclipse.ui.workbench/compatibility.jar"/>
+                               <pathelement path="../org.eclipse.ui.workbench/workbench.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
@@ -90,7 +92,8 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
                                <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/bin"/>
                                <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/phpeclipse.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
+                               <pathelement path="../org.eclipse.ui.console/bin"/>
+                               <pathelement path="../org.eclipse.ui.console/console.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.search_3.0.1/search.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.debug.core_3.0.1/dtcore.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.variables_3.0.0/variables.jar"/>
@@ -139,11 +142,11 @@
        </target>
 
        <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="true">
                        <fileset dir="${build.result.folder}" includes="phphelp.jar"                    />
                </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="true">
                        <fileset dir="${basedir}" includes="phphelp.jar,phphelp.xml,plugin.properties,plugin.xml,.classpath,doc.zip,cpl-v10.html"                       />
                </copy>
        </target>
@@ -152,23 +155,23 @@
        </target>
 
        <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-               <copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+               <copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false">
                        <fileset dir="${basedir}" includes="src/,.cvsignore,.project,.template,.classpath,build.properties,build.xml,plugin.properties,plugin.xml"                      />
                </copy>
        </target>
 
        <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-               <copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+               <copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false"/>
        </target>
 
        <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.phphelp of all the zips, jars and logs created.">
                <delete file="${build.result.folder}/phphelp.jar"/>
                <delete file="${build.result.folder}/phphelpsrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.jar"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.zip"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -191,7 +194,7 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
                </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>