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

diff --git a/net.sourceforge.phpeclipse/build.xml b/net.sourceforge.phpeclipse/build.xml
index 47b0264..d557270 100644
--- a/net.sourceforge.phpeclipse/build.xml
+++ b/net.sourceforge.phpeclipse/build.xml
@@ -2,20 +2,28 @@
 <project name="net.sourceforge.phpeclipse" default="build.jars" basedir=".">
 
 	<property name="bootclasspath" value=""/>
-	<property name="ws" value="win32"/>
-	<property name="os" value="win32"/>
-	<property name="arch" value="x86"/>
+	<property name="basews" value="${ws}"/>
+	<property name="baseos" value="${os}"/>
+	<property name="basearch" value="${arch}"/>
+	<property name="basenl" value="${nl}"/>
 	<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=""/>
 
 	<target name="init" depends="properties">
-		<property name="plugin" value="net.sourceforge.phpeclipse"/>
-		<property name="version.suffix" value="_1.0.6a"/>
-		<property name="full.name" value="${plugin}${version.suffix}"/>
+		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="pluginTemp" value="${basedir}"/>
+		<condition property="build.result.folder" value="${pluginTemp}/net.sourceforge.phpeclipse">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="build.result.folder" value="${basedir}"/>
 		<property name="temp.folder" value="${basedir}/temp.folder"/>
 		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
 	</target>
 
 	<target name="properties" if="eclipse.running">
@@ -29,43 +37,92 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" update="no"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse_1.1.0.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse_1.1.0" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${build.result.folder}/phpeclipse.jar" todir="${destination.temp.folder}/${full.name}"/>
-		<copy todir="${destination.temp.folder}/${full.name}/icons">
-			<fileset dir="${basedir}/icons"/>
-		</copy>
-		<copy file="${basedir}/TODO" todir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${basedir}/install.txt" todir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${basedir}/plugin.properties" todir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${basedir}/plugin.xml" todir="${destination.temp.folder}/${full.name}"/>
-	</target>
-
 	<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"/>
 		<!-- 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">
-			<src path="src/"/>
-		</javac>
-		<!-- copy necessary resources -->
-		<copy todir="${temp.folder}/phpeclipse.jar.bin">
-			<fileset dir="src/" excludes="**/*.java"/>
+		<javac destdir="${temp.folder}/phpeclipse.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.core.runtime.compatibility_3.0.0/compatibility.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.update.configurator_3.0.0/configurator.jar"/>
+				<pathelement path="../../plugins/org.eclipse.ui_3.0.0/ui.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.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.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.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.core_3.0.0/dtcore.jar"/>
+				<pathelement path="../../plugins/org.eclipse.core.variables_3.0.0/variables.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"/>
+			</classpath>
+			<src path="src/"			/>
+			</javac>
+		<!-- Copy necessary resources -->
+		<copy todir="${temp.folder}/phpeclipse.jar.bin" failonerror="true">
+			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
 		</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"/>
 	</target>
 
-	<target name="phpeclipsesrc.zip" depends="init" unless="phpeclipse.jar">
+	<target name="phpeclipsesrc.zip" depends="init" unless="phpeclipsesrc.zip">
 		<mkdir dir="${build.result.folder}"/>
-		<zip zipfile="${build.result.folder}/phpeclipsesrc.zip" filesonly="false" update="no">
-			<fileset dir="src/" includes="**/*.java"/>
+		<zip zipfile="${build.result.folder}/phpeclipsesrc.zip" filesonly="false" whenempty="skip" update="false">
+			<fileset dir="src/" includes="**/*.java"			/>
 		</zip>
 	</target>
 
@@ -79,29 +136,42 @@
 		<antcall target="phpeclipsesrc.zip"/>
 	</target>
 
-		<target name="build.zips" depends="init">
-		</target>
+	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0" failonerror="true">
+			<fileset dir="${build.result.folder}" includes="phpeclipse.jar"			/>
+		</copy>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0" failonerror="true">
+			<fileset dir="${basedir}" includes="phpeclipse.jar,bin/,.classpath,.project,.template,TODO,icons/,install.txt,plugin.properties,plugin.xml,cpl-v10.html"			/>
+		</copy>
+	</target>
+
+	<target name="build.zips" depends="init">
+	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${build.result.folder}/phpeclipsesrc.zip" todir="${destination.temp.folder}/${full.name}"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0"/>
+		<copy file="${build.result.folder}/phpeclipsesrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0" failonerror="false">
+			<fileset dir="${basedir}" includes="src/"			/>
+		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}"/>
-		<copy file="${temp.folder}/phpeclipse.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0"/>
+		<copy file="${temp.folder}/phpeclipse.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse_1.1.0" 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}/${full.name}.jar"/>
-		<delete file="${plugin.destination}/${full.name}.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.0.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse_1.1.0.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
-	<target name="refresh" depends="init" if="eclipse.running">
-		<eclipse.convertPath fileSystemPath="D:\eclipse_21\workspace\net.sourceforge.phpeclipse\" property="resourcePath"/>
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 	</target>
 
@@ -117,13 +187,10 @@
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
 		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"/>
+			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<antcall target="zip.folder"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse_1.1.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
-	<target name="zip.folder" depends="init">
-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" update="no" excludes="**/*.bin.log"/>
-	</target>
 
 </project>