reverted previous fix, it was bogus; applied similar changes at better location

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

diff --git a/net.sourceforge.phpeclipse.webbrowser/build.xml b/net.sourceforge.phpeclipse.webbrowser/build.xml
index 9f0a91c..da21309 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/build.xml
+++ b/net.sourceforge.phpeclipse.webbrowser/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.webbrowser_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" filesonly="false" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -60,12 +60,15 @@
                                <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_3.0.1/ui.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.jface.text_3.0.1/jfacetext.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.text_3.0.1/text.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.swt_3.0.1/ws/${basews}/swt.jar"/>
                                <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_3.0.1/ui.jar"/>
+                               <pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.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="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
@@ -84,9 +87,6 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.forms_3.0.0/forms.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.editors_3.0.1/editors.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.jface.text_3.0.1/jfacetext.jar"/>
-                               <pathelement path="../../../eclipse301/plugins/org.eclipse.text_3.0.1/text.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
                        </classpath>
                        <src path="src/"                        />
@@ -118,11 +118,11 @@
        </target>
 
        <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="true">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="true">
                        <fileset dir="${build.result.folder}" includes="webbrowser.jar"                 />
                </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="true">
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="true">
                        <fileset dir="${basedir}" includes="plugin.xml,*.jar,plugin.properties/,webbrowser.jar,icons/,home/,plugin.properties,defaultBrowsers.xml,.options"                     />
                </copy>
        </target>
@@ -131,23 +131,23 @@
        </target>
 
        <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy file="${build.result.folder}/webbrowsersrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy file="${build.result.folder}/webbrowsersrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false">
                        <fileset dir="${basedir}" includes="plugin.properties/,schema/,build.properties,src/,.classpath,.cvsignore,.project"                    />
                </copy>
        </target>
 
        <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1"/>
-               <copy file="${temp.folder}/webbrowser.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.1" failonerror="false"/>
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2"/>
+               <copy file="${temp.folder}/webbrowser.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.webbrowser_1.1.2" failonerror="false"/>
        </target>
 
        <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.webbrowser of all the zips, jars and logs created.">
                <delete file="${build.result.folder}/webbrowser.jar"/>
                <delete file="${build.result.folder}/webbrowsersrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.zip"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.jar"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.zip"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -170,7 +170,7 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
                </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.webbrowser_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>