fixed invalid class path entries; are now resolved from plugin dependencies

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

diff --git a/net.sourceforge.phpeclipse/build.xml b/net.sourceforge.phpeclipse/build.xml
index fd4254e..981ed8e 100644 (file)
--- a/net.sourceforge.phpeclipse/build.xml
+++ b/net.sourceforge.phpeclipse/build.xml
@@ -27,7 +27,7 @@
        </target>
 
        <target name="properties" if="eclipse.running">
-               <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+               <property name="build.compiler" value="net.sourceforge.phpdt.core.JDTCompilerAdapter"/>
        </target>
 
        <target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse for an update site.">
@@ -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_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse_1.1.2" filesonly="false" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse_1.1.3.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse_1.1.3" filesonly="false" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -96,18 +96,18 @@
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.compare_3.0.0/compare.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.ui.externaltools_3.0.1/externaltools.jar"/>
                                <pathelement path="../../../eclipse301/plugins/org.eclipse.team.core_3.0.0/team.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.quantum.sql/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.quantum.sql/quantum.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.core/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.core/webcore.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.ui/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.ui/ui.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.core/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.core/xmlcore.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.ui/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.ui/xmlui.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.quantum.sql/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.quantum.sql/quantum.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.core/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.core/webcore.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.ui/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.ui/ui.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.xml.core/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.xml.core/xmlcore.jar"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.xml.ui/bin"/>
+                               <pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.xml.ui/xmlui.jar"/>
                        </classpath>
                        <src path="src/"                        />
                        </javac>
@@ -138,11 +138,11 @@
        </target>
 
        <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2" failonerror="true">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3" failonerror="true">
                        <fileset dir="${build.result.folder}" includes="phpeclipse.jar"                 />
                </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2" failonerror="true">
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3" failonerror="true">
                        <fileset dir="${basedir}" includes="phpeclipse.jar,icons/,install.txt,plugin.properties,plugin.xml,cpl-v10.html,templates/"                     />
                </copy>
        </target>
@@ -151,23 +151,23 @@
        </target>
 
        <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2"/>
-               <copy file="${build.result.folder}/phpeclipsesrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2" failonerror="false">
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3"/>
+               <copy file="${build.result.folder}/phpeclipsesrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3" failonerror="false"/>
+               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3" failonerror="false">
                        <fileset dir="${basedir}" includes="src/"                       />
                </copy>
        </target>
 
        <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2"/>
-               <copy file="${temp.folder}/phpeclipse.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.2" failonerror="false"/>
+               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3"/>
+               <copy file="${temp.folder}/phpeclipse.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.3" failonerror="false"/>
        </target>
 
        <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse of all the zips, jars and logs created.">
                <delete file="${build.result.folder}/phpeclipse.jar"/>
                <delete file="${build.result.folder}/phpeclipsesrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.2.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.2.zip"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.3.jar"/>
+               <delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.3.zip"/>
                <delete dir="${temp.folder}"/>
        </target>
 
@@ -190,7 +190,7 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
                </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse_1.1.3.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
                <delete dir="${temp.folder}"/>
        </target>