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

diff --git a/net.sourceforge.phpeclipse.phphelp/build.xml b/net.sourceforge.phpeclipse.phphelp/build.xml
index 7807fed..280176c 100644
--- a/net.sourceforge.phpeclipse.phphelp/build.xml
+++ b/net.sourceforge.phpeclipse.phphelp/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.phphelp_1.1.0.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.0" filesonly="false" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -48,62 +48,73 @@
 		<javac destdir="${temp.folder}/phphelp.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.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.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.help_3.0.0/help.jar"/>
-				<pathelement path="../../plugins/org.eclipse.ui_3.0.0/ui.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.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.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.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.ui.editors_3.0.0/editors.jar"/>
-				<pathelement path="../../plugins/org.eclipse.core.filebuffers_3.0.0/filebuffers.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.search_3.0.0/search.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="../../../eclipse301/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime_3.0.1/runtime.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/core.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/console.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/osgi.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/resolver.jar"/>
+				<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.ide_3.0.1/ide.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.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.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"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.core_3.0.1/updatecore.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.ui_3.0.1/updateui.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help.base_3.0.1/helpbase.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.apache.lucene_1.3.1/parser.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.apache.lucene_1.3.1/lucene-1.3-final.jar"/>
+				<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.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.ui.workbench.texteditor_3.0.1/texteditor.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.editors_3.0.1/editors.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/bin"/>
+				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/phpeclipse.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.search_3.0.1/search.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.debug.core_3.0.1/dtcore.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.variables_3.0.0/variables.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.debug.ui_3.0.1/dtui.jar"/>
+				<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="${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>
 		<!-- Copy necessary resources -->
 		<copy todir="${temp.folder}/phphelp.jar.bin" failonerror="true">
-			<fileset dir="src/" excludes="**/*.java"			/>
+			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
 		</copy>
 		<mkdir dir="${build.result.folder}"/>
 		<jar jarfile="${build.result.folder}/phphelp.jar" basedir="${temp.folder}/phphelp.jar.bin"/>
@@ -128,32 +139,41 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.0"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+			<fileset dir="${build.result.folder}" includes="phphelp.jar"			/>
+		</copy>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+			<fileset dir="${basedir}" includes="phphelp.jar,phphelp.xml,plugin.properties,plugin.xml,.classpath,doc.zip,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}/net.sourceforge.phpeclipse.phphelp_1.1.0"/>
-		<copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.0" failonerror="false"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
+		<copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false">
+			<fileset dir="${basedir}" includes="src/,.cvsignore,.project,.template,.classpath,build.properties,build.xml,plugin.properties,plugin.xml"			/>
+		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.0"/>
-		<copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.0" failonerror="false"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
+		<copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.phphelp of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/phphelp.jar"/>
 		<delete file="${build.result.folder}/phphelpsrc.zip"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.0.jar"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.0.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="C:/eclipse3m9/workspace/net.sourceforge.phpeclipse.phphelp" property="resourcePath"/>
+		<eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse.phphelp" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 	</target>
 
@@ -171,7 +191,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>