X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.debug.core/build.xml b/net.sourceforge.phpeclipse.debug.core/build.xml
index a686b93..1c20c6b 100644
--- a/net.sourceforge.phpeclipse.debug.core/build.xml
+++ b/net.sourceforge.phpeclipse.debug.core/build.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="net.sourceforge.phpeclipse.debug.core" default="build.jars" basedir=".">
 
-	<property name="bootclasspath" value=""/>
 	<property name="basews" value="${ws}"/>
 	<property name="baseos" value="${os}"/>
 	<property name="basearch" value="${arch}"/>
 	<property name="basenl" value="${nl}"/>
+
+	<!-- Compiler settings. -->
 	<property name="javacFailOnError" value="false"/>
 	<property name="javacDebugInfo" value="on"/>
 	<property name="javacVerbose" value="true"/>
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
 	<property name="compilerArg" value=""/>
+	<path id="path_bootclasspath">
+		<fileset dir="${java.home}/lib">
+			<include name="*.jar"/>
+		</fileset>
+	</path>
+	<property name="bootclasspath" refid="path_bootclasspath"/>
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
@@ -28,6 +35,7 @@
 
 	<target name="properties" if="eclipse.running">
 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+
 	</target>
 
 	<target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse.debug.core for an update site.">
@@ -37,93 +45,85 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.0.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.7.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
-	<target name="core.jar" depends="init" unless="core.jar" description="Create jar: core.jar.">
+	<target name="core.jar" depends="init" unless="core.jar" description="Create jar: net.sourceforge.phpeclipse.debug.core core.jar.">
 		<delete dir="${temp.folder}/core.jar.bin"/>
 		<mkdir dir="${temp.folder}/core.jar.bin"/>
 		<!-- compile the source code -->
 		<javac destdir="${temp.folder}/core.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"		>
 			<compilerarg line="${compilerArg}"/>
 			<classpath>
-				<pathelement path="../../plugins/org.eclipse.ui_3.0.0/ui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/core.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/console.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
-				<pathelement path="../../plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
-				<pathelement path="../../plugins/org.eclipse.help_3.0.0/help.jar"/>
-				<pathelement path="../../plugins/org.eclipse.swt_3.0.0/ws/${basews}/swt.jar"/>
-				<pathelement path="../../plugins/org.eclipse.swt.win32_3.0.0/ws/${basews}/swt.jar"/>
-				<pathelement path="../../plugins/org.eclipse.swt.win32_3.0.0"/>
-				<pathelement path="../../plugins/org.eclipse.jface_3.0.0/jface.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench_3.0.0/compatibility.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
-				<pathelement path="../../plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
-				<pathelement path="../../plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.variables_3.0.0/variables.jar"/>
-				<pathelement path="../net.sourceforge.phpeclipse/bin"/>
-				<pathelement path="../net.sourceforge.phpeclipse/phpeclipse.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
-				<pathelement path="../../plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
-				<pathelement path="../../plugins/org.eclipse.text_3.0.0/text.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
-				<pathelement path="../../plugins/org.eclipse.search_3.0.0/search.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.win32_3.0.0/ide.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.win32_3.0.0/workbenchwin32.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
-				<pathelement path="../../plugins/org.eclipse.update.core_3.0.0/updatecore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar"/>
-				<pathelement path="../../plugins/org.eclipse.update.ui_3.0.0/updateui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.help.base_3.0.0/helpbase.jar"/>
-				<pathelement path="../../plugins/org.apache.lucene_1.3.0/parser.jar"/>
-				<pathelement path="../../plugins/org.apache.lucene_1.3.0/lucene-1.3-final.jar"/>
-				<pathelement path="../../plugins/org.eclipse.help.appserver_3.0.0/appserver.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.forms_3.0.0/forms.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
-				<pathelement path="../../plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
-				<pathelement path="../../plugins/org.eclipse.compare_3.0.0/compare.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui.externaltools_3.0.0/externaltools.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/wdtui.jar"/>
-				<pathelement path="../net.sourceforge.phpeclipse.xml.ui/bin"/>
-				<pathelement path="../net.sourceforge.phpeclipse.xml.ui/xmlui.jar"/>
-				<pathelement path="../net.sourceforge.phpeclipse.xml.core/bin"/>
-				<pathelement path="../net.sourceforge.phpeclipse.xml.core/xmlcore.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.runtime_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.osgi_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.help_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.swt_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.swt.win32.win32.x86_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.jface_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.commands_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.workbench_3.1.0.jar"/>
+				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar"/>
+				<pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.1.0/@dot"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.expressions_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.resources_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.resources.compatibility_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.resources.win32_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.update.configurator_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ant.core_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.variables_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.debug.core_3.1.0.jar"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/bin/"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/phpeclipse.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.console_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.jface.text_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.text_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.search_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.ide_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.win32_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.views_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.update.core_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.update.core.win32_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.update.ui_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.forms_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.ui.editors_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.core.filebuffers_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.debug.ui_3.1.0.jar"/>
+				<pathelement path="..\..\plugins\org.eclipse.compare_3.1.0.jar"/>
+				<pathelement path="../org.eclipse.ui.externaltools/bin"/>
+				<pathelement path="../org.eclipse.ui.externaltools/@dot"/>
+				<pathelement path="..\..\plugins\org.eclipse.team.core_3.1.0.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.externaltools/bin/"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.externaltools/externaltools.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.core/bin/"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse.core/webcore.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>
 		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/core.jar.bin" failonerror="true">
-			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
+		<copy todir="${temp.folder}/core.jar.bin" failonerror="true" overwrite="false">
+			<fileset dir="src/" excludes="**/*.java, **/package.htm*,null"			/>
 		</copy>
 		<mkdir dir="${build.result.folder}"/>
-		<jar jarfile="${build.result.folder}/core.jar" basedir="${temp.folder}/core.jar.bin"/>
+		<jar destfile="${build.result.folder}/core.jar" basedir="${temp.folder}/core.jar.bin"/>
 		<delete dir="${temp.folder}/core.jar.bin"/>
 	</target>
 
 	<target name="coresrc.zip" depends="init" unless="coresrc.zip">
 		<mkdir dir="${build.result.folder}"/>
-		<zip zipfile="${build.result.folder}/coresrc.zip" filesonly="false" whenempty="skip" update="false">
+		<zip destfile="${build.result.folder}/coresrc.zip" filesonly="false" whenempty="skip" update="false">
 			<fileset dir="src/" includes="**/*.java"			/>
 		</zip>
 	</target>
@@ -139,11 +139,11 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" failonerror="true">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" failonerror="true" overwrite="false">
 			<fileset dir="${build.result.folder}" includes="core.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" failonerror="true">
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="core.jar,.classpath,.project,.template,os/,plugin.properties,plugin.xml"			/>
 		</copy>
 	</target>
@@ -152,28 +152,28 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0"/>
-		<copy file="${build.result.folder}/coresrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" failonerror="false"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" failonerror="false">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7"/>
+		<copy file="${build.result.folder}/coresrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" failonerror="false" overwrite="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.debug.core_1.1.0"/>
-		<copy file="${temp.folder}/core.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.0" failonerror="false"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7"/>
+		<copy file="${temp.folder}/core.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.core_1.1.7" failonerror="false" overwrite="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.debug.core of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/core.jar"/>
 		<delete file="${build.result.folder}/coresrc.zip"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.0.jar"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.0.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.7.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.7.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse.debug.core" property="resourcePath"/>
+		<eclipse.convertPath fileSystemPath="C:/eclipse31/workspace/net.sourceforge.phpeclipse.debug.core" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 	</target>
 
@@ -191,7 +191,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.core_1.1.7.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>