From: Marcelo V. <va...@us...> - 2006-01-31 05:54:50
|
Update of /cvsroot/jedit/plugins/build-support In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14397/build-support Modified Files: build.properties.sample plugin-build.xml users-guide.xsl Log Message: - fix properties in the sample file - fix path to docbook-wrapper.xsl and add the directory where it is created in the command line of xsltproc. - integrate changes to how to find the style sheet to use as suggested by plugin packagers Index: users-guide.xsl =================================================================== RCS file: /cvsroot/jedit/plugins/build-support/users-guide.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- users-guide.xsl 12 Dec 2005 04:32:10 -0000 1.1 +++ users-guide.xsl 31 Jan 2006 05:54:38 -0000 1.2 @@ -6,6 +6,9 @@ your DocBook-XSL "html/docbook.xsl" file in the <xsl:import> statement below. If you want each chapter to have its own file, specify the path to your "html/xtchunk.xsl". + + This stylesheet assumes the user's guide XML source is in a + subdirectory of the plugin's main dir (e.g., "docs/userguide.xml"). --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -13,7 +16,7 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" exclude-result-prefixes="#default"> -<xsl:import href="../docbook-wrapper.xsl"/> +<xsl:import href="docbook-wrapper.xsl"/> <!-- Swing HTML control doesn't support “ and ” --> <xsl:template match="quote">"<xsl:apply-templates/>"</xsl:template> Index: build.properties.sample =================================================================== RCS file: /cvsroot/jedit/plugins/build-support/build.properties.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- build.properties.sample 20 Nov 2005 00:19:06 -0000 1.1 +++ build.properties.sample 31 Jan 2006 05:54:38 -0000 1.2 @@ -6,49 +6,118 @@ # - Your home directory (with or without a leading dot) # jEdit & plugins directory settings -#jedit.install.dir=../../jEdit # jEdit install directory -#jedit.user.home=${user.home}/.jedit # User settings directory -#plugins.srcdir=.. # Top-level of the plugins source tree -#install.dir=.. # Where to place the built jar files + +# jEdit install directory +#jedit.install.dir=../../jEdit + +# User settings directory +#jedit.user.home=${user.home}/.jedit + +# Top-level of the plugins source tree +#plugins.srcdir=.. + +# Where to place the built jar files +#install.dir=.. # Generic plugin build options -#build.dir=build # Where to put temporary build files -#build.classes=${build.dir}/classes # Where to put compiled classes -#build.docs=${build.dir}/docs # Where to put generated documentation -#build.javadoc=${build.docs}/javadoc # Where to put generated javadoc -#build.extras=${build.dir}/extras # Where to put other files + +# Where to put temporary build files +#build.dir=build + +# Where to put compiled classes +#build.classes=${build.dir}/classes + +# Where to put generated documentation +#build.docs=${build.dir}/docs + +# Where to put generated javadoc +#build.javadoc=${build.docs}/javadoc + +# Where to put other files +#build.extras=${build.dir}/extras # Default compiler flags -#compiler.debug=off # Generate debugging code -#compiler.optimize=off # Gererate optimized code -#compiler.deprecation=off # Deprecation warnings. -#compiler.verbose=off # Verbose compiler messages -#compiler.nowarn=off # Disable compiler warnings -#compiler.target=1.3 # Target JVM version -#compiler.source=1.3 # Java version of the source files -#compiler.listfiles=no # List files being compiler -#compiler.fork=no # Fork the javac compiler + +# Generate debugging code +#compiler.debug=off + +# Gererate optimized code +#compiler.optimize=off + +# Deprecation warnings. +#compiler.deprecation=off + +# Verbose compiler messages +#compiler.verbose=off + +# Disable compiler warnings +#compiler.nowarn=off + +# Target JVM version +#compiler.target=1.3 + +# Java version of the source files +#compiler.source=1.3 + +# List files being compiled +#compiler.listfiles=no + +# Fork the javac compiler +#compiler.fork=no # Documentation build options -#docs-proc.target=xsltproc # What target to use for the docs -#docbookx.dtd=../XML/xml/dtds/docbookx.dtd # Location of the docbook DTD -#user-doc.xsl=docbook-wrapper.xsl # Stylesheet file to use -#user-doc.xml=docs/users-guide.xml # Documentation docbook source -#user-doc.out=${build.docs}/users-guide.html # Documentation output file -#javadoc.title=${ant.project.name} API # Title for javadoc documentation -#docbook.xsl=html/onechunk.xsl # Docbook stylesheet to use -#docbook.xsl.path/usr/share/xsl/docbook-xsl # Where to find the dockbook stylesheet + +# What target to use for the docs +#docs-proc.target=xsltproc + +# Location of the docbook DTD +#docbookx.dtd=../XML/xml/dtds/docbookx.dtd + +# Stylesheet file to use +#user-doc.xsl=docbook-wrapper.xsl + +# Documentation docbook source +#user-doc.xml=docs/users-guide.xml + +# Documentation output file +#user-doc.out=${build.docs}/index.html + +# Title for javadoc documentation +#javadoc.title=${ant.project.name} API + +# Where to find the dockbook stylesheet +#docbook.xsl=html/onechunk.xsl + +# Docbook stylesheet to use +#docbook.xsl.sheet=/usr/share/xsl/docbook-xsl + +# The path to the style sheet to use. +#docs.style.sheet=${docbook.xsl}/${docbook.xsl.sheet} # CVS options -#jedit.cvs.user=${user.name} # CVS user name -#cvs.rsh=ssh # CVS_RSH value -#cvs.root=:ext:${jedit.cvs.user}@cvs.sourceforge.net:/cvsroot/jedit # CVSROOT + +# CVS user name +#jedit.cvs.user=${user.name} + +# CVS_RSH value +#cvs.rsh=ssh + +# CVSROOT +#cvs.root=:ext:${jedit.cvs.user}@cvs.sourceforge.net:/cvsroot/jedit # JUnit options -#junit.jar=junit.jar # Where to find jUnit -#junit.printsummary=on # Whether to print a summary -#junit.haltonfailure=off # Whether to halt if an error occurs + +# Where to find jUnit +#junit.jar=junit.jar + +# Whether to print a summary +#junit.printsummary=on + +# Whether to halt if an error occurs +#junit.haltonfailure=off # Ant Contrib -#ant-contrib.jar=ant-contrib-1.0b1.jar # Where to find the ant-contrib jar. + +# Where to find the ant-contrib jar. +#ant-contrib.jar=ant-contrib-1.0b1.jar Index: plugin-build.xml =================================================================== RCS file: /cvsroot/jedit/plugins/build-support/plugin-build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- plugin-build.xml 12 Dec 2005 04:32:10 -0000 1.4 +++ plugin-build.xml 31 Jan 2006 05:54:38 -0000 1.5 @@ -7,7 +7,13 @@ :folding=explicit:collapseFolds=1: To use this file, use the "import" task from ant - on your plugin's build file. + on your plugin's build file, like this: + + <property name="build.support" value="../build-support" /> + <import file="${build.support}/plugin-build.xml" /> + + The use of the property is to ease the work of the plugin + packagers. General tips: - To override properties, either use the several @@ -75,11 +81,12 @@ <!-- default documentation options --> <property name="docs-proc.target" value="xsltproc" /> <property name="docbookx.dtd" value="../XML/xml/dtds/docbookx.dtd" /> - <property name="user-doc.xsl" value="docbook-wrapper.xsl" /> + <property name="user-doc.xsl" value="${build.support}/users-guide.xsl" /> <property name="user-doc.xml" value="docs/users-guide.xml" /> <property name="user-doc.out" value="${build.docs}/users-guide.html" /> <property name="javadoc.title" value="${ant.project.name} API" /> - <property name="docbook.xsl" value="../build-support/users-guide.xsl" /> + <property name="docbook.xsl.sheet" value="html/onechunk.xsl" /> + <property name="docs.style.sheet" value="${docbook.xsl}/${docbook.xsl.sheet}" /> <!-- default cvs options --> <property name="jedit.cvs.user" value="${user.name}" /> @@ -362,7 +369,7 @@ message=" version='1.0'>" /> <echo file="docbook-wrapper.xsl" append="true" - message="<xsl:import href='${docbook.xsl}' />" /> + message="<xsl:import href='${docs.style.sheet}' />" /> <echo file="docbook-wrapper.xsl" append="true" message="</xsl:stylesheet>" /> @@ -416,6 +423,8 @@ <arg value="-o" /> <arg value="${user-doc.out}" /> <arg value="--catalogs" /> + <arg value="--path" /> + <arg value="${basedir}" /> <arg value="${user-doc.xsl}" /> <arg value="${user-doc.xml}" /> </exec> |