misc changes

diff --git a/net.sourceforge.phpeclipse.debug.core/build.xml b/net.sourceforge.phpeclipse.debug.core/build.xml
new file mode 100644 (file)
index 0000000..f86588d
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.core/build.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="net.sourceforge.phpeclipse.debug.core" default="build.jars" basedir=".">
+
+       <property name="bootclasspath" value=""/>
+       <property name="ws" value="win32"/>
+       <property name="os" value="win32"/>
+       <property name="arch" value="x86"/>
+
+       <target name="init" depends="properties">
+               <property name="plugin" value="net.sourceforge.phpeclipse.debug.core"/>
+               <property name="version.suffix" value="_1.0.3"/>
+               <property name="full.name" value="${plugin}${version.suffix}"/>
+               <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">
+               <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+       </target>
+
+       <target name="build.update.jar" depends="init">
+               <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"/>
+               <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}/core.jar" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="core.jar" depends="init" unless="core.jar">
+               <property name="destdir" value="${temp.folder}/core.jar.bin"/>
+               <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="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.debug.ui_2.0.0/dtui.jar;../../plugins/org.eclipse.debug.core_2.0.0/dtcore.jar;../../plugins/org.junit_3.7.0/bin;../../plugins/org.eclipse.debug.ui_2.0.0/bin;../../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;../net.sourceforge.phpeclipse/bin;../../plugins/org.eclipse.debug.core_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.core.runtime_2.0.0/bin;../../plugins/org.junit_3.7.0/junit.jar">
+                       <src path="src/"/>
+               </javac>
+               <!-- copy necessary resources -->
+               <copy todir="${temp.folder}/core.jar.bin">
+                       <fileset dir="src/" excludes="**/*.java"/>
+               </copy>
+               <mkdir dir="${build.result.folder}"/>
+               <jar jarfile="${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">
+                       <fileset dir="src/" includes="**/*.java"/>
+               </zip>
+       </target>
+
+       <target name="build.jars" depends="init">
+               <available property="core.jar" file="${build.result.folder}/core.jar"/>
+               <antcall target="core.jar"/>
+       </target>
+
+       <target name="build.sources" depends="init">
+               <available property="coresrc.zip" file="${build.result.folder}/coresrc.zip"/>
+               <antcall target="coresrc.zip"/>
+       </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}/coresrc.zip" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="gather.logs" depends="init" if="destination.temp.folder">
+               <mkdir dir="${destination.temp.folder}/${full.name}"/>
+               <copy file="${temp.folder}/core.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="clean" depends="init">
+               <delete file="${build.result.folder}/core.jar"/>
+               <delete file="${build.result.folder}/coresrc.zip"/>
+               <delete file="${plugin.destination}/${full.name}.jar"/>
+               <delete file="${plugin.destination}/${full.name}.zip"/>
+               <delete dir="${temp.folder}"/>
+       </target>
+
+       <target name="refresh" depends="init" if="eclipse.running">
+               <eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
+       </target>
+
+       <target name="zip.plugin" depends="init">
+               <delete dir="${temp.folder}"/>
+               <mkdir dir="${temp.folder}"/>
+               <antcall target="build.jars"/>
+               <antcall target="build.sources"/>
+               <antcall target="gather.bin.parts">
+                       <param name="destination.temp.folder" value="${temp.folder}/"/>
+               </antcall>
+               <antcall target="gather.sources">
+                       <param name="destination.temp.folder" value="${temp.folder}/"/>
+               </antcall>
+               <delete>
+                       <fileset dir="${temp.folder}" includes="**/*.bin.log"/>
+               </delete>
+               <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
+               <delete dir="${temp.folder}"/>
+       </target>
+
+</project>

diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml
index 9e5ccc5..cb2e202 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml
@@ -7,7 +7,7 @@
    class="net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin">
 
    <runtime>
-      <library name="phpdtdebugcore.jar">
+      <library name="core.jar">
          <export name="*"/>
       </library>       
    </runtime>

diff --git a/net.sourceforge.phpeclipse.debug.ui/build.properties b/net.sourceforge.phpeclipse.debug.ui/build.properties
new file mode 100644 (file)
index 0000000..97cad4c
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.ui/build.properties
@@ -0,0 +1 @@
+source.debug.jar = src/

diff --git a/net.sourceforge.phpeclipse.debug.ui/build.xml b/net.sourceforge.phpeclipse.debug.ui/build.xml
new file mode 100644 (file)
index 0000000..6ee95af
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.ui/build.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="net.sourceforge.phpeclipse.debug.ui" default="build.jars" basedir=".">
+
+       <property name="bootclasspath" value=""/>
+       <property name="ws" value="win32"/>
+       <property name="os" value="win32"/>
+       <property name="arch" value="x86"/>
+
+       <target name="init" depends="properties">
+               <property name="plugin" value="net.sourceforge.phpeclipse.debug.ui"/>
+               <property name="version.suffix" value="_1.0.3"/>
+               <property name="full.name" value="${plugin}${version.suffix}"/>
+               <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">
+               <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+       </target>
+
+       <target name="build.update.jar" depends="init">
+               <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"/>
+               <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}/debug.jar" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="debug.jar" depends="init" unless="debug.jar">
+               <property name="destdir" value="${temp.folder}/debug.jar.bin"/>
+               <delete dir="${temp.folder}/debug.jar.bin"/>
+               <mkdir dir="${temp.folder}/debug.jar.bin"/>
+               <!-- compile the source code -->
+               <javac destdir="${temp.folder}/debug.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../net.sourceforge.phpeclipse.launching/launch.jar;../../plugins/org.eclipse.core.resources.win32_2.0.0/resources.jar;../net.sourceforge.phpeclipse/phpeclipse.jar;../../plugins/org.eclipse.debug.ui_2.0.0/dtui.jar;../../plugins/org.eclipse.debug.core_2.0.0/dtcore.jar;../../plugins/org.eclipse.swt_2.0.0/ws/${ws}/swt.jar;../../plugins/org.junit_3.7.0/bin;../net.sourceforge.phpeclipse.launching/bin;../../plugins/org.eclipse.debug.ui_2.0.0/bin;../../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.debug.core_2.0.0/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.ui_2.0.0/workbench.jar;../../plugins/org.eclipse.core.runtime_2.0.0/bin;../../plugins/org.junit_3.7.0/junit.jar;../../plugins/org.eclipse.ui_2.0.0/bin;../../plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar">
+                       <src path="src/"/>
+               </javac>
+               <!-- copy necessary resources -->
+               <copy todir="${temp.folder}/debug.jar.bin">
+                       <fileset dir="src/" excludes="**/*.java"/>
+               </copy>
+               <mkdir dir="${build.result.folder}"/>
+               <jar jarfile="${build.result.folder}/debug.jar" basedir="${temp.folder}/debug.jar.bin"/>
+               <delete dir="${temp.folder}/debug.jar.bin"/>
+       </target>
+
+       <target name="debugsrc.zip" depends="init" unless="debugsrc.zip">
+               <mkdir dir="${build.result.folder}"/>
+               <zip zipfile="${build.result.folder}/debugsrc.zip" filesonly="false">
+                       <fileset dir="src/" includes="**/*.java"/>
+               </zip>
+       </target>
+
+       <target name="build.jars" depends="init">
+               <available property="debug.jar" file="${build.result.folder}/debug.jar"/>
+               <antcall target="debug.jar"/>
+       </target>
+
+       <target name="build.sources" depends="init">
+               <available property="debugsrc.zip" file="${build.result.folder}/debugsrc.zip"/>
+               <antcall target="debugsrc.zip"/>
+       </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}/debugsrc.zip" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="gather.logs" depends="init" if="destination.temp.folder">
+               <mkdir dir="${destination.temp.folder}/${full.name}"/>
+               <copy file="${temp.folder}/debug.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="clean" depends="init">
+               <delete file="${build.result.folder}/debug.jar"/>
+               <delete file="${build.result.folder}/debugsrc.zip"/>
+               <delete file="${plugin.destination}/${full.name}.jar"/>
+               <delete file="${plugin.destination}/${full.name}.zip"/>
+               <delete dir="${temp.folder}"/>
+       </target>
+
+       <target name="refresh" depends="init" if="eclipse.running">
+               <eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
+       </target>
+
+       <target name="zip.plugin" depends="init">
+               <delete dir="${temp.folder}"/>
+               <mkdir dir="${temp.folder}"/>
+               <antcall target="build.jars"/>
+               <antcall target="build.sources"/>
+               <antcall target="gather.bin.parts">
+                       <param name="destination.temp.folder" value="${temp.folder}/"/>
+               </antcall>
+               <antcall target="gather.sources">
+                       <param name="destination.temp.folder" value="${temp.folder}/"/>
+               </antcall>
+               <delete>
+                       <fileset dir="${temp.folder}" includes="**/*.bin.log"/>
+               </delete>
+               <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
+               <delete dir="${temp.folder}"/>
+       </target>
+
+</project>

diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index cbc9276..c23c6c6 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -7,7 +7,7 @@
    class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
 
    <runtime>
-      <library name="phpdtdebugui.jar">
+      <library name="debug.jar">
          <export name="*"/>
       </library>
    </runtime>

diff --git a/net.sourceforge.phpeclipse/.classpath b/net.sourceforge.phpeclipse/.classpath
index af9f5e2..8738220 100644 (file)
--- a/net.sourceforge.phpeclipse/.classpath
+++ b/net.sourceforge.phpeclipse/.classpath
@@ -21,5 +21,6 @@
     <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.0.0/boot.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.boot_2.0.0/bootsrc.zip"/>
     <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="lib" path="C:/eclipse/plugins/org.junit_3.7.0/junit.jar"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 0cf553c..ffa939f 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -137,7 +137,7 @@
          </filter>
       </page>
    </extension>
-   <extension
+<!--   <extension
          point="org.eclipse.ui.views">
       <view
             name="%viewPHPResources.name"
@@ -145,7 +145,7 @@
             class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView"
             id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources">
       </view>
-   </extension>
+   </extension> -->
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet