[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1612] trunk/org.rubypeople.rdt.doc.user

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1612
          http://svn.sourceforge.net/rubyeclipse/?rev=1612&view=rev
Author:   mbarchfe
Date:     2006-09-11 13:02:13 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
changes to generate docbook with jdk 1.5

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.doc.user/build.xml
    trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml
    trunk/org.rubypeople.rdt.doc.user/customizationLayer.xsl

Added Paths:
-----------
    trunk/org.rubypeople.rdt.doc.user/docbook/
    trunk/org.rubypeople.rdt.doc.user/docbook/README
    trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xml-4.2.zip
    trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xsl-1.70.1.zip
    trunk/org.rubypeople.rdt.doc.user/lib/
    trunk/org.rubypeople.rdt.doc.user/lib/README
    trunk/org.rubypeople.rdt.doc.user/lib/saxon_6.6.5.jar

Modified: trunk/org.rubypeople.rdt.doc.user/build.xml
===================================================================

--- trunk/org.rubypeople.rdt.doc.user/build.xml	2006-09-10 01:11:13 UTC (rev 1611)
+++ trunk/org.rubypeople.rdt.doc.user/build.xml	2006-09-11 20:02:13 UTC (rev 1612)
@@ -15,9 +15,6 @@
 	<property name="featureVersion" value="0.6.0"/>
 	<!-- featureVersion might also be set from outside -->
 	<echo message="Using featureVersion=${featureVersion}"/>		
-	<property name="docbook.root" value="../../docbook"/>
-	<!-- docbook.root might also be set from outside -->
-	<echo message="Using docbook.root=${docbook.root}"/>	
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
@@ -74,9 +71,7 @@
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: org.rubypeople.rdt.doc.user of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/org.rubypeople.rdt.doc.user_${featureVersion}.jar"/>
-		<delete file="${plugin.destination}/org.rubypeople.rdt.doc.user_${featureVersion}.zip"/>
-		<delete dir="${temp.folder}"/>
+		<ant antfile="buildDocbook.xml" target="clean"/>	
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">

Modified: trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml	2006-09-10 01:11:13 UTC (rev 1611)
+++ trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml	2006-09-11 20:02:13 UTC (rev 1612)
@@ -5,17 +5,26 @@
 		<echo message="Please always call this script from build.xml"/>
 	</target>
 
-	<target name="init">
+    <property name="docbook.xsl.dir" value="docbook/docbook-xsl"/>
+    <property name="docbook.dtd.dir" value="docbook/dtd"/>	
+
+	<available type="dir" file="${docbook.xsl.dir}" property="is.docbook.unpacked"/>
+	
+	<target name="docbook.unpack" unless="is.docbook.unpacked">
+		<property name="docbook.xsl.version" value="1.70.1"/>
+		<unzip src="docbook/docbook-xsl-${docbook.xsl.version}.zip" dest="docbook"/>
+		<move file="docbook/docbook-xsl-${docbook.xsl.version}" tofile="${docbook.xsl.dir}" />
+		<mkdir dir="${docbook.dtd.dir}"/>
+		<unzip src="docbook/docbook-xml-4.2.zip" dest="${docbook.dtd.dir}"/>
+	</target>
+	
+	<target name="init" depends="docbook.unpack">
 		<fail unless="featureVersion" message="Property featureVersion must be set. Please always call this script from build.xml"/>
-		<fail unless="featureVersion" message="Property docbook.root must be set. Please always call this script from build.xml"/>
-        <property name="docbook.xsl.dir" value="${docbook.root}/docbook-xsl-1.64.1"/>
-        <property name="docbook.dtd.dir" value="${docbook.root}/dtd"/>	
-		<condition property="docbook.dir.exists">
-	      <available file="${docbook.root}"/>
-		</condition>	 	
+		<available type="dir" file="${docbook.xsl.dir}" property="did.unpack.work" />
+		<fail unless="did.unpack.work" message="Docbook xsl directory ${} was not created."/>
 	</target>
 
-	<target name="clean.docbook.generated">
+	<target name="clean.docbook.generated">		
 	    <delete file="toc.xml"/>
 	    <delete file="docbook.done"/>
 	    <delete>
@@ -28,7 +37,6 @@
 	   <copy file="customizationLayer.xsl" tofile="customizationLayerCopy.xsl"/>
 	   <replace file="customizationLayerCopy.xsl">	   
 	     <replacefilter token="@@VERSION@@" value="${featureVersion}"/>
-         <replacefilter token="@@DOCBOOKROOT@@" value="${docbook.root}"/>
       </replace>
 	</target>
 
@@ -38,9 +46,18 @@
       </replace>
 	</target>
 	
-	<target name="html" depends="init,clean.docbook.generated,replaceVarInCustomizationLayer" if="docbook.dir.exists">
-	 <!--${docbook.xsl.dir}/eclipse/eclipse.xsl -->
-      <style includes="docbook.xml" basedir="." destdir="."  extension=".done" style="customizationLayerCopy.xsl">
+	<target name="html" depends="init,clean.docbook.generated,replaceVarInCustomizationLayer">
+	 <!-- docbook recommends to use the saxon comiler. With jdk1.4 we could also use xalan (which ships with jdk1.4)
+	      but with the jdk1.5 built-in XSLTC we get errors related to chunks. 
+	      
+	      Please also note that the saxon_6.6.5.jar has been modified *not* to register the AElfred parser as XML parser
+	     -->
+      <style classpath="lib/saxon_6.6.5.jar"
+      		 includes="docbook.xml" 
+      		 basedir="." 
+      		 destdir="."  
+      	     extension=".done" 
+      	     style="customizationLayerCopy.xsl">
         <param name="base.dir" expression="html/"/>
         <param name="manifest.in.base.dir" expression="0"/>
         <param name="eclipse.plugin.id" expression="org.rubypeople.rdt.doc.user"/>
@@ -53,4 +70,10 @@
        <antcall target="replaceVersionInPluginXml"/>
      </target>
 
+	 <target name="clean">
+	 	<delete dir="${docbook.xsl.dir}"/>
+	    <delete dir="${docbook.dtd.dir}"/>		
+	 	<antcall target="clean.docbook.generated"/>
+	 </target>
+
 </project>

Modified: trunk/org.rubypeople.rdt.doc.user/customizationLayer.xsl
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/customizationLayer.xsl	2006-09-10 01:11:13 UTC (rev 1611)
+++ trunk/org.rubypeople.rdt.doc.user/customizationLayer.xsl	2006-09-11 20:02:13 UTC (rev 1612)
@@ -7,7 +7,7 @@
      an URIResolver. But thats probably more effort than replacing
      the token @@DOCBOOKROOT@@ with ant -->
 
-<xsl:import href="@@DOCBOOKROOT@@/docbook-xsl-1.64.1/eclipse/eclipse.xsl"/> 
+<xsl:import href="./docbook/docbook-xsl/eclipse/eclipse.xsl"/> 
 
 <xsl:param name="htmlhelp.title" >ABC</xsl:param>
 

Added: trunk/org.rubypeople.rdt.doc.user/docbook/README
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/docbook/README	                        (rev 0)
+++ trunk/org.rubypeople.rdt.doc.user/docbook/README	2006-09-11 20:02:13 UTC (rev 1612)
@@ -0,0 +1,7 @@
+Place the docbook dtd's and xsl scripts as zip file into this directory.
+The build process will unpack the xsl zip file into a folder docbook-xsl
+(by renaming the original directory entry which contains the version
+number). The dtds will be extracted into the folder dtd.
+
+Download the xsl files from http://sourceforge.net/projects/docbook/
+and the docbook dtds from http://www.docbook.org/xml.
\ No newline at end of file

Added: trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xml-4.2.zip
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xml-4.2.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xsl-1.70.1.zip
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.doc.user/docbook/docbook-xsl-1.70.1.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/org.rubypeople.rdt.doc.user/lib/README
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/lib/README	                        (rev 0)
+++ trunk/org.rubypeople.rdt.doc.user/lib/README	2006-09-11 20:02:13 UTC (rev 1612)
@@ -0,0 +1,13 @@
+The saxon lib was downloaded from http://saxon.sourceforge.net/.
+It has been modified not to prvide AElfred as XML parser by removing
+the jar file entry META-INF/services/javax.xml.parsers.SAXParserFactory.
+
+Aelfred seems to have a problem resolving the DTD mods. When  
+using an xmlcatalog for the docbook DTD, it produces the following  
+errormessage:
+
+java.net.MalformedURLException: no protocol: dbnotnx.mod
+
+: Fatal Error! 
+Failure reading file:///C:/workspaces/rdt-subversive-workspace/org.rubypeople.rdt.doc.user/docbook.xml 
+Cause: java.net.MalformedURLException: no protocol: dbnotnx.mod
\ No newline at end of file

Added: trunk/org.rubypeople.rdt.doc.user/lib/saxon_6.6.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.doc.user/lib/saxon_6.6.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


