Changed gather.bin target to include all resources

diff --git a/net.sourceforge.phpeclipse.phphelp/build.xml b/net.sourceforge.phpeclipse.phphelp/build.xml
index ee787e4..feaefb6 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/build.xml
+++ b/net.sourceforge.phpeclipse.phphelp/build.xml
@@ -5,10 +5,13 @@
        <property name="ws" value="win32"/>
        <property name="os" value="win32"/>
        <property name="arch" value="x86"/>
+       <property name="javacFailOnError" value="false"/>
+       <property name="javacDebugInfo" value="on"/>
+       <property name="javacVerbose" value="true"/>
 
        <target name="init" depends="properties">
                <property name="plugin" value="net.sourceforge.phpeclipse.phphelp"/>
-               <property name="version.suffix" value="_1.0.3"/>
+               <property name="version.suffix" value="_1.0.4"/>
                <property name="full.name" value="${plugin}${version.suffix}"/>
                <property name="temp.folder" value="${basedir}/temp.folder"/>
                <property name="plugin.destination" value="${basedir}"/>
@@ -19,28 +22,31 @@
                <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
        </target>
 
-       <target name="build.update.jar" depends="init">
+       <target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse.phphelp for an update site.">
                <delete dir="${temp.folder}"/>
                <mkdir dir="${temp.folder}"/>
                <antcall target="build.jars"/>
                <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"/>
+               <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" update="no"/>
                <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}/phphelp.jar" todir="${destination.temp.folder}/${full.name}"/>
+               <copy file="${basedir}/phphelp.xml" 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="phphelp.jar" depends="init" unless="phphelp.jar">
+       <target name="phphelp.jar" depends="init" unless="phphelp.jar" description="Create jar: phphelp.jar.">
                <property name="destdir" value="${temp.folder}/phphelp.jar.bin"/>
                <delete dir="${temp.folder}/phphelp.jar.bin"/>
                <mkdir dir="${temp.folder}/phphelp.jar.bin"/>
                <!-- compile the source code -->
-               <javac destdir="${temp.folder}/phphelp.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../../plugins/org.eclipse.core.resources.win32_2.0.0/resources.jar;../net.sourceforge.phpeclipse/phpeclipse.jar;../../plugins/org.eclipse.swt_2.0.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.core.boot_2.0.0/bin;../../plugins/org.eclipse.core.runtime_2.0.0/runtime.jar;../../plugins/org.eclipse.core.boot_2.0.0/boot.jar;../../plugins/org.eclipse.ui.win32_2.0.0/workbench.jar;../net.sourceforge.phpeclipse/bin;../../plugins/org.eclipse.swt_2.0.0/bin;../../plugins/org.eclipse.core.resources_2.0.0/bin;../../plugins/org.eclipse.core.resources_2.0.0/resources.jar;../../plugins/org.eclipse.swt.win32_2.0.0/ws/${ws}/swt.jar;../../plugins/org.eclipse.help_2.0.0/bin;../../plugins/org.eclipse.ui_2.0.0/workbench.jar;../../plugins/org.eclipse.core.runtime_2.0.0/bin;../../plugins/org.eclipse.help_2.0.0/help.jar;../../plugins/org.eclipse.ui_2.0.0/bin;../../plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar">
+               <javac destdir="${temp.folder}/phphelp.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;../net.sourceforge.phpeclipse/bin;../net.sourceforge.phpeclipse/phpeclipse.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 -->
@@ -52,14 +58,14 @@
                <delete dir="${temp.folder}/phphelp.jar.bin"/>
        </target>
 
-       <target name="phphelpsrc.zip" depends="init" unless="phphelpsrc.zip">
+       <target name="phphelpsrc.zip" depends="init" unless="phphelp.jar">
                <mkdir dir="${build.result.folder}"/>
-               <zip zipfile="${build.result.folder}/phphelpsrc.zip" filesonly="false">
+               <zip zipfile="${build.result.folder}/phphelpsrc.zip" filesonly="false" update="no">
                        <fileset dir="src/" includes="**/*.java"/>
                </zip>
        </target>
 
-       <target name="build.jars" depends="init">
+       <target name="build.jars" depends="init" description="Build all the jars for the plug-in: net.sourceforge.phpeclipse.phphelp.">
                <available property="phphelp.jar" file="${build.result.folder}/phphelp.jar"/>
                <antcall target="phphelp.jar"/>
        </target>
@@ -69,8 +75,8 @@
                <antcall target="phphelpsrc.zip"/>
        </target>
 
-       <target name="build.zips" depends="init">
-       </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}"/>
@@ -82,7 +88,7 @@
                <copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
        </target>
 
-       <target name="clean" depends="init">
+       <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}/${full.name}.jar"/>
@@ -91,10 +97,11 @@
        </target>
 
        <target name="refresh" depends="init" if="eclipse.running">
-               <eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
+               <eclipse.convertPath fileSystemPath="D:\eclipse_21\workspace\net.sourceforge.phpeclipse.phphelp\" property="resourcePath"/>
+               <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
        </target>
 
-       <target name="zip.plugin" depends="init">
+       <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: net.sourceforge.phpeclipse.phphelp.">
                <delete dir="${temp.folder}"/>
                <mkdir dir="${temp.folder}"/>
                <antcall target="build.jars"/>
@@ -108,8 +115,11 @@
                <delete>
                        <fileset dir="${temp.folder}" includes="**/*.bin.log"/>
                </delete>
-               <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
+               <antcall target="zip.folder"/>
                <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>