misc changes

diff --git a/archive/net.sourceforge.phpeclipse.jtidy/build.xml b/archive/net.sourceforge.phpeclipse.jtidy/build.xml
new file mode 100644 (file)
index 0000000..f1eebbe
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.jtidy/build.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="net.sourceforge.phpeclipse.tidy" 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.tidy"/>
+               <property name="version.suffix" value="_1.0.2"/>
+               <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}/jtidy.jar" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="jtidy.jar" depends="init" unless="jtidy.jar">
+               <property name="destdir" value="${temp.folder}/jtidy.jar.bin"/>
+               <delete dir="${temp.folder}/jtidy.jar.bin"/>
+               <mkdir dir="${temp.folder}/jtidy.jar.bin"/>
+               <!-- compile the source code -->
+               <javac destdir="${temp.folder}/jtidy.jar.bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../../plugins/org.eclipse.core.resources.win32_2.0.0/resources.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;../../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;jtidy_plugin.jar;../../plugins/org.eclipse.ui_2.0.0/workbench.jar;../../plugins/org.eclipse.core.runtime_2.0.0/bin;../../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}/jtidy.jar.bin">
+                       <fileset dir="src/" excludes="**/*.java"/>
+               </copy>
+               <mkdir dir="${build.result.folder}"/>
+               <jar jarfile="${build.result.folder}/jtidy.jar" basedir="${temp.folder}/jtidy.jar.bin"/>
+               <delete dir="${temp.folder}/jtidy.jar.bin"/>
+       </target>
+
+       <target name="jtidysrc.zip" depends="init" unless="jtidysrc.zip">
+               <mkdir dir="${build.result.folder}"/>
+               <zip zipfile="${build.result.folder}/jtidysrc.zip" filesonly="false">
+                       <fileset dir="src/" includes="**/*.java"/>
+               </zip>
+       </target>
+
+       <target name="build.jars" depends="init">
+               <available property="jtidy.jar" file="${build.result.folder}/jtidy.jar"/>
+               <antcall target="jtidy.jar"/>
+       </target>
+
+       <target name="build.sources" depends="init">
+               <available property="jtidysrc.zip" file="${build.result.folder}/jtidysrc.zip"/>
+               <antcall target="jtidysrc.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}/jtidysrc.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}/jtidy.jar.bin.log" todir="${destination.temp.folder}/${full.name}"/>
+       </target>
+
+       <target name="clean" depends="init">
+               <delete file="${build.result.folder}/jtidy.jar"/>
+               <delete file="${build.result.folder}/jtidysrc.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/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml b/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
index 7efbd1d..d944e66 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
-   id="net.sourceforge.phpdt.tidy"
+   id="net.sourceforge.phpeclipse.tidy"
    name="%pluginName"
    version="1.0.2"
    provider-name="%providerName"
    class="net.sourceforge.phpdt.tidy.JtidyPlugin">
 
    <runtime>
-      <library name="jtidy_plugin.jar"/>
+      <library name="jtidy.jar"/>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources" export="true"/>
@@ -96,6 +96,33 @@
                id="net.sourceforge.phpdt.tidy.FormatAction">
          </action>
       </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php*"
+            id="net.sourceforge.phpdt.tidy.filepopups">
+         <menu
+               label="JTidy"
+               path="additions"
+               id="net.sourceforge.phpdt.tidy.menu1">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Check Markup"
+               class="net.sourceforge.phpdt.tidy.actions.ParseWithJTidyAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu1/group1"
+               enablesFor="+"
+               id="net.sourceforge.phpdt.tidy.ParseAction">
+         </action>
+         <action
+               label="Format"
+               class="net.sourceforge.phpdt.tidy.actions.FormatWithJTidyAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu1/group1"
+               enablesFor="+"
+               id="net.sourceforge.phpdt.tidy.FormatAction">
+         </action>
+      </objectContribution>
    </extension>
 
     <extension