3.x compatibility

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

diff --git a/net.sourceforge.phpeclipse/build.xml b/net.sourceforge.phpeclipse/build.xml
index 47b0264..1f62e26 100644 (file)
--- a/net.sourceforge.phpeclipse/build.xml
+++ b/net.sourceforge.phpeclipse/build.xml
@@ -47,19 +47,19 @@
 
        <target name="phpeclipse.jar" depends="init" unless="phpeclipse.jar" description="Create jar: phpeclipse.jar.">
                <property name="destdir" value="${temp.folder}/phpeclipse.jar.bin"/>
-               <delete dir="${temp.folder}/phpeclipse.jar.bin"/>
-               <mkdir dir="${temp.folder}/phpeclipse.jar.bin"/>
+               <delete dir="${destdir}"/>
+               <mkdir dir="${destdir}"/>
                <!-- compile the source code -->
-               <javac destdir="${temp.folder}/phpeclipse.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../../plugins/org.eclipse.core.boot_2.1.0/bin;../../plugins/org.eclipse.core.boot_2.1.0/boot.jar;../../plugins/org.eclipse.core.runtime_2.1.0/bin;../../plugins/org.eclipse.core.runtime_2.1.0/runtime.jar;../../plugins/org.apache.xerces_4.0.7/bin;../../plugins/org.apache.xerces_4.0.7/xmlParserAPIs.jar;../../plugins/org.apache.xerces_4.0.7/xercesImpl.jar;../../plugins/org.eclipse.core.resources_2.1.0/bin;../../plugins/org.eclipse.core.resources_2.1.0/resources.jar;../../plugins/org.eclipse.core.resources.win32_2.1.0/resources.jar;../../plugins/org.eclipse.ui_2.1.0/bin;../../plugins/org.eclipse.ui_2.1.0/ui.jar;../../plugins/org.eclipse.update.core_2.1.0/bin;../../plugins/org.eclipse.update.core_2.1.0/updatecore.jar;../../plugins/org.eclipse.update.core.win32_2.1.0/updatecore.jar;../../plugins/org.eclipse.help_2.1.0/bin;../../plugins/org.eclipse.help_2.1.0/help.jar;../../plugins/org.apache.lucene_1.2.1/bin;../../plugins/org.apache.lucene_1.2.1/parser.jar;../../plugins/org.apache.lucene_1.2.1/lucene-1.2.jar;../../plugins/org.eclipse.help.appserver_2.1.0/bin;../../plugins/org.eclipse.help.appserver_2.1.0/appserver.jar;../../plugins/org.eclipse.swt_2.1.0/bin;../../plugins/org.eclipse.swt_2.1.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.swt.win32_2.1.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.text_2.1.0/bin;../../plugins/org.eclipse.text_2.1.0/text.jar;../../plugins/org.eclipse.jface_2.1.0/bin;../../plugins/org.eclipse.jface_2.1.0/jface.jar;../../plugins/org.eclipse.jface.text_2.1.0/bin;../../plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar;../../plugins/org.eclipse.ui.views_2.1.0/bin;../../plugins/org.eclipse.ui.views_2.1.0/views.jar;../../plugins/org.eclipse.ui.workbench_2.1.0/bin;../../plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar;../../plugins/org.eclipse.ui.win32_2.1.0/workbench.jar;../../plugins/org.eclipse.ui.win32_2.1.0/bin;../../plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar;../../plugins/org.eclipse.ui.workbench.texteditor_2.1.0/bin;../../plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar;../../plugins/org.eclipse.ui.editors_2.1.0/bin;../../plugins/org.eclipse.ui.editors_2.1.0/editors.jar;../../plugins/org.eclipse.debug.ui_2.1.0/bin;../../plugins/org.eclipse.debug.ui_2.1.0/dtui.jar;../../plugins/org.eclipse.debug.core_2.1.0/bin;../../plugins/org.eclipse.debug.core_2.1.0/dtcore.jar;../../plugins/org.junit_3.8.1/bin;../../plugins/org.junit_3.8.1/junit.jar;../../plugins/org.eclipse.update.ui_2.1.0/bin;../../plugins/org.eclipse.update.ui_2.1.0/updateui.jar;../../plugins/org.eclipse.update.ui.win32_2.1.0/updateui.jar;../../plugins/org.eclipse.update.ui.win32_2.1.0/bin;../../plugins/org.eclipse.update.ui.win32_2.1.0/updateui32.jar;../../plugins/org.eclipse.update.ui.forms_2.1.0/bin;../../plugins/org.eclipse.update.ui.forms_2.1.0/forms.jar">
+               <javac destdir="${destdir}" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../../plugins/org.eclipse.core.boot_2.1.0/bin;../../plugins/org.eclipse.core.boot_2.1.0/boot.jar;../../plugins/org.eclipse.core.runtime_2.1.0/bin;../../plugins/org.eclipse.core.runtime_2.1.0/runtime.jar;../../plugins/org.apache.xerces_4.0.7/bin;../../plugins/org.apache.xerces_4.0.7/xmlParserAPIs.jar;../../plugins/org.apache.xerces_4.0.7/xercesImpl.jar;../../plugins/org.eclipse.core.resources_2.1.0/bin;../../plugins/org.eclipse.core.resources_2.1.0/resources.jar;../../plugins/org.eclipse.core.resources.win32_2.1.0/resources.jar;../../plugins/org.eclipse.ui_2.1.0/bin;../../plugins/org.eclipse.ui_2.1.0/ui.jar;../../plugins/org.eclipse.update.core_2.1.0/bin;../../plugins/org.eclipse.update.core_2.1.0/updatecore.jar;../../plugins/org.eclipse.update.core.win32_2.1.0/updatecore.jar;../../plugins/org.eclipse.help_2.1.0/bin;../../plugins/org.eclipse.help_2.1.0/help.jar;../../plugins/org.apache.lucene_1.2.1/bin;../../plugins/org.apache.lucene_1.2.1/parser.jar;../../plugins/org.apache.lucene_1.2.1/lucene-1.2.jar;../../plugins/org.eclipse.help.appserver_2.1.0/bin;../../plugins/org.eclipse.help.appserver_2.1.0/appserver.jar;../../plugins/org.eclipse.swt_2.1.0/bin;../../plugins/org.eclipse.swt_2.1.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.swt.win32_2.1.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.text_2.1.0/bin;../../plugins/org.eclipse.text_2.1.0/text.jar;../../plugins/org.eclipse.jface_2.1.0/bin;../../plugins/org.eclipse.jface_2.1.0/jface.jar;../../plugins/org.eclipse.jface.text_2.1.0/bin;../../plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar;../../plugins/org.eclipse.ui.views_2.1.0/bin;../../plugins/org.eclipse.ui.views_2.1.0/views.jar;../../plugins/org.eclipse.ui.workbench_2.1.0/bin;../../plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar;../../plugins/org.eclipse.ui.win32_2.1.0/workbench.jar;../../plugins/org.eclipse.ui.win32_2.1.0/bin;../../plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar;../../plugins/org.eclipse.ui.workbench.texteditor_2.1.0/bin;../../plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar;../../plugins/org.eclipse.ui.editors_2.1.0/bin;../../plugins/org.eclipse.ui.editors_2.1.0/editors.jar;../../plugins/org.eclipse.debug.ui_2.1.0/bin;../../plugins/org.eclipse.debug.ui_2.1.0/dtui.jar;../../plugins/org.eclipse.debug.core_2.1.0/bin;../../plugins/org.eclipse.debug.core_2.1.0/dtcore.jar;../../plugins/org.junit_3.8.1/bin;../../plugins/org.junit_3.8.1/junit.jar;../../plugins/org.eclipse.update.ui_2.1.0/bin;../../plugins/org.eclipse.update.ui_2.1.0/updateui.jar;../../plugins/org.eclipse.update.ui.win32_2.1.0/updateui.jar;../../plugins/org.eclipse.update.ui.win32_2.1.0/bin;../../plugins/org.eclipse.update.ui.win32_2.1.0/updateui32.jar;../../plugins/org.eclipse.update.ui.forms_2.1.0/bin;../../plugins/org.eclipse.update.ui.forms_2.1.0/forms.jar">
                        <src path="src/"/>
                </javac>
                <!-- copy necessary resources -->
-               <copy todir="${temp.folder}/phpeclipse.jar.bin">
+               <copy todir="${destdir}">
                        <fileset dir="src/" excludes="**/*.java"/>
                </copy>
                <mkdir dir="${build.result.folder}"/>
-               <jar jarfile="${build.result.folder}/phpeclipse.jar" basedir="${temp.folder}/phpeclipse.jar.bin"/>
-               <delete dir="${temp.folder}/phpeclipse.jar.bin"/>
+               <jar jarfile="${build.result.folder}/phpeclipse.jar" basedir="${destdir}"/>
+               <delete dir="${destdir}"/>
        </target>
 
        <target name="phpeclipsesrc.zip" depends="init" unless="phpeclipse.jar">