bloritsch 2003/02/07 08:38:19 Modified: fortress build.xml Added: . forrest.properties forrestbuild.xml Log: start integrating forrest Revision Changes Path 1.1 avalon-excalibur/forrest.properties Index: forrest.properties =================================================================== ############## # Properties used by forrest.build.xml for building the website ############## # Prints out a summary of Forrest settings for this project #forrest.echo=true # Project name (used to name .war file) #project.name=my-project # Specifies name of Forrest skin to use #project.skin=forrest-site project.skin=avalon-tigris #project.skin=krysalis-site project.site-dir=target/docs ############## # layout properties # Properties that must be set to override the default locations # # Parent properties must be set. This usually means uncommenting # project.content-dir if any other property using it is uncommented #project.status=status.xml project.content-dir=../../avalon/src/documentation #project.conf-dir=${project.content-dir}/conf #project.sitemap=${project.content-dir}/sitemap.xmap project.xdocs-dir=src/xdocs #project.stylesheets-dir=${project.content-dir}/resources/stylesheets #project.images-dir=${project.content-dir}/resources/images #project.schema-dir=${project.content-dir}/resources/schema #project.skins-dir=${project.content-dir}/skins #project.skinconf=${project.content-dir}/skinconf.xml #project.lib-dir=${project.content-dir}/lib #project.classes-dir=${project.content-dir}/classes ############## # Cocoon catalog entity resolver properties # A local catalog to supplement the default Forrest catalog #project.catalog=${project.schema-dir}/catalog # The verbosity level for the entity resolver (1..10) #forrest.catalog.verbosity=1 ############## # validation properties # These props determine if validation is performed at all # Values are inherited unless overridden. # Eg, if forrest.validate=false, then all others are false unless set to true. #forrest.validate=true #forrest.validate.xdocs=${forrest.validate} #forrest.validate.skinconf=${forrest.validate} #forrest.validate.sitemap=${forrest.validate} #forrest.validate.stylesheets=${forrest.validate} #forrest.validate.skins=${forrest.validate} #forrest.validate.skins.stylesheets=${forrest.validate.skins} # Key: # *.failonerror=(true|false) stop when an XML file is invalid # *.includes=(pattern) Comma-separated list of path patterns to validate # *.excludes=(pattern) Comma-separated list of path patterns to not validate #forrest.validate.failonerror=true #forrest.validate.includes=**/* #forrest.validate.excludes= # #forrest.validate.xdocs.failonerror=${forrest.validate.failonerror} # #forrest.validate.xdocs.includes=**/*.x* #forrest.validate.xdocs.excludes=site.xml # #forrest.validate.skinconf.includes=${skinconf-file} #forrest.validate.skinconf.excludes= #forrest.validate.skinconf.failonerror=${forrest.validate.failonerror} # #forrest.validate.sitemap.includes=${sitemap-file} #forrest.validate.sitemap.excludes= #forrest.validate.sitemap.failonerror=${forrest.validate.failonerror} # #forrest.validate.stylesheets.includes=**/*.xsl #forrest.validate.stylesheets.excludes= #forrest.validate.stylesheets.failonerror=${forrest.validate.failonerror} # #forrest.validate.skins.includes=**/* #forrest.validate.skins.excludes=**/*.xsl #forrest.validate.skins.failonerror=${forrest.validate.failonerror} # #forrest.validate.skins.stylesheets.includes=**/*.xsl #forrest.validate.skins.stylesheets.excludes= #forrest.validate.skins.stylesheets.failonerror=${forrest.validate.skins.failonerror} 1.1 avalon-excalibur/forrestbuild.xml Index: forrestbuild.xml =================================================================== <project default="site"> <!-- This build.xml snippet contains Forrest targets for Ant 1.5+. It checks that the user has set ${forrest.home}, either in one of: build.properties project.properties ant.properties .ant.properties or with the FORREST_HOME environment variable, and prints an informative error message if not found. --> <target name="site" depends="forrest.init" description="Generates static HTML documentation"> <property name="project.home" value="../"/> <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/> </target> <target name="webapp" depends="forrest.init" description="Generates an unpackaged webapp of the website"> <property name="project.home" value="../"/> <ant antfile="${forrest.home}/forrest.antproxy.xml" target="webapp"/> </target> <target name="war" depends="forrest.init" description="Generates a .war file containing the website"> <property name="project.home" value="../"/> <ant antfile="${forrest.home}/forrest.antproxy.xml" target="war"/> </target> <target name="validate" depends="forrest.init" description="Validates XML documentation files"> <property name="project.home" value="../"/> <ant antfile="${forrest.home}/forrest.antproxy.xml" target="validate"/> </target> <target name="forrest.init" depends="forrest.sethome, forrest.home.defined"/> <target name="forrest.sethome" depends="forrest.loadenv, forrest.checkenv, forrest.checkhome, forrest.check-build.properties, forrest.check-project.properties, forrest.check-ant.properties, forrest.check-.ant.properties"/> <target name="forrest.loadenv" unless="forrest.home.present"> <property environment="env"/> <echo level="verbose">Forrest: Got ${env.FORREST_HOME}</echo> </target> <target name="forrest.checkenv" if="env.FORREST_HOME"> <echo level="verbose">Found $FORREST_HOME..</echo> <property name="forrest.home" location="${env.FORREST_HOME}"/> <echo level="verbose">forrest.home set to ${forrest.home}</echo> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> </target> <target name="forrest.checkhome"> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> <available file="build.properties" type="file" property="build.properties.present"/> <available file="project.properties" type="file" property="project.properties.present"/> <available file="ant.properties" type="file" property="ant.properties.present"/> <available file=".ant.properties" type="file" property=".ant.properties.present"/> </target> <!-- No we can't extract the commonalities below into an antcall'ed target, because it wouldn't be able to set forrest.home --> <target name="forrest.check-build.properties" unless="forrest.home.present" if="build.properties.present"> <echo level="verbose">Forrest: Checking build.properties..</echo> <loadproperties srcfile="build.properties"> <filterchain> <linecontains> <contains value="forrest.home"/> </linecontains> </filterchain> </loadproperties> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> </target> <target name="forrest.check-project.properties" unless="forrest.home.present" if="project.properties.present"> <echo level="verbose">Forrest: Checking project.properties..</echo> <loadproperties srcfile="project.properties"> <filterchain> <linecontains> <contains value="forrest.home"/> </linecontains> </filterchain> </loadproperties> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> </target> <target name="forrest.check-ant.properties" unless="forrest.home.present" if="ant.properties.present"> <echo level="verbose">Forrest: Checking ant.properties..</echo> <loadproperties srcfile="ant.properties"> <filterchain> <linecontains> <contains value="forrest.home"/> </linecontains> </filterchain> </loadproperties> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> </target> <target name="forrest.check-.ant.properties" unless="forrest.home.present" if=".ant.properties.present"> <echo level="verbose">Forrest: Checking .ant.properties..</echo> <loadproperties srcfile=".ant.properties"> <filterchain> <linecontains> <contains value="forrest.home"/> </linecontains> </filterchain> </loadproperties> <available file="${forrest.home}" type="dir" property="forrest.home.present"/> </target> <target name="forrest.home.defined" depends="forrest.sethome" unless="forrest.home.present"> <property name="path" value="${user.home}/xml-forrest/build/dist/shbat"/> <pathconvert targetos="windows" property="winpath"> <path> <pathelement location="${path}"/> </path> </pathconvert> <pathconvert targetos="unix" property="unixpath"> <path> <pathelement location="${path}"/> </path> </pathconvert> <echo> ---------------------------------------------- To run this target, you need Forrest installed. Please do the following: export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic cvs checkout xml-forrest cd xml-forrest build (Windows) ./build.sh (Unix) Then either: - Set FORREST_HOME as the Forrest build instructions describe - Create a build.properties, with the forrest.home property pointing to the forrest shbat directory, eg: forrest.home=${winpath} (Windows) forrest.home=${unixpath} (Unix) (adjusting the path according to where your xml-forrest is) ---------------------------------------------- </echo> <fail message="Need to define $${forrest.home}"/> </target> </project> 1.72 +1 -1 avalon-excalibur/fortress/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- build.xml 4 Feb 2003 16:48:13 -0000 1.71 +++ build.xml 7 Feb 2003 16:38:19 -0000 1.72 @@ -483,7 +483,7 @@ <target name="html-docs" description="generates the xdocs-based documentation"> <mkdir dir="${docs.dir}"/> - <ant antfile="${basedir}/../cocoonbuild.xml"/> + <ant antfile="${basedir}/../forrestbuild.xml"/> <copy todir="${docs.dir}"> <fileset dir="${build.docs}">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]