cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r123476 - /cocoon/trunk/build.xml /cocoon/trunk/forrest.properties /cocoon/trunk/tools/targets/admin-build.xml /cocoon/trunk/tools/targets/docs-build.xml /cocoon/trunk/tools/targets/forrest-build.xml
Date Tue, 28 Dec 2004 06:59:48 GMT
Author: crossley
Date: Mon Dec 27 22:59:47 2004
New Revision: 123476

URL: http://svn.apache.org/viewcvs?view=rev&rev=123476
Log:
Tweak the build system to use forrest-0.6+

Modified:
   cocoon/trunk/build.xml
   cocoon/trunk/forrest.properties
   cocoon/trunk/tools/targets/admin-build.xml
   cocoon/trunk/tools/targets/docs-build.xml
   cocoon/trunk/tools/targets/forrest-build.xml

Modified: cocoon/trunk/build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/build.xml?view=diff&rev=123476&p1=cocoon/trunk/build.xml&r1=123475&p2=cocoon/trunk/build.xml&r2=123476
==============================================================================
--- cocoon/trunk/build.xml	(original)
+++ cocoon/trunk/build.xml	Mon Dec 27 22:59:47 2004
@@ -34,7 +34,7 @@
   <!-- =================================================================== -->
   <!-- Compile targets         -->
   <import file="tools/targets/compile-build.xml" />
-  <!-- =================================================================== -->  
+  <!-- =================================================================== -->
   <!-- Validation targets      -->
   <import file="tools/targets/validate-build.xml" />
   <!-- =================================================================== -->
@@ -64,17 +64,12 @@
   <!-- =================================================================== -->
   <!-- Upgrade targets -->
   <import file="tools/targets/upgrade-build.xml" />
-  <!-- =================================================================== -->  
+  <!-- =================================================================== -->
   <!-- Tools targets -->
   <import file="tools/targets/tools-build.xml" />
-  <!-- =================================================================== -->    
-
-  <!-- ==================  Apache Forrest targets  ======================= -->
-
   <!-- =================================================================== -->
-  <!-- Forrest targets         -->
+  <!-- Apache Forrest targets -->
   <import file="tools/targets/forrest-build.xml" />
   <!-- =================================================================== -->
 
 </project>
-

Modified: cocoon/trunk/forrest.properties
Url: http://svn.apache.org/viewcvs/cocoon/trunk/forrest.properties?view=diff&rev=123476&p1=cocoon/trunk/forrest.properties&r1=123475&p2=cocoon/trunk/forrest.properties&r2=123476
==============================================================================
--- cocoon/trunk/forrest.properties	(original)
+++ cocoon/trunk/forrest.properties	Mon Dec 27 22:59:47 2004
@@ -40,6 +40,7 @@
 project.content-dir=src/documentation
 #project.conf-dir=${project.content-dir}/conf
 #project.sitemap=${project.content-dir}/sitemap.xmap
+#project.xdocs-dir=${project.content-dir}/xdocs
 project.xdocs-dir=build/${project.name}/documentation/xdocs
 #project.stylesheets-dir=${project.content-dir}/resources/stylesheets
 project.images-dir=${project.content-dir}/images
@@ -53,6 +54,7 @@
 project.site-dir=${project.build-dir}/site
 
 project.webapp=build/webapp-site
+project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 
 ##############
 # Cocoon catalog entity resolver properties

Modified: cocoon/trunk/tools/targets/admin-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/admin-build.xml?view=diff&rev=123476&p1=cocoon/trunk/tools/targets/admin-build.xml&r1=123475&p2=cocoon/trunk/tools/targets/admin-build.xml&r2=123476
==============================================================================
--- cocoon/trunk/tools/targets/admin-build.xml	(original)
+++ cocoon/trunk/tools/targets/admin-build.xml	Mon Dec 27 22:59:47 2004
@@ -21,7 +21,7 @@
   </description>
   
   <!-- Creates the web site  -->
-  <target name="site" depends="forrest" description="[admin] Builds the site">
+  <target name="site-docs" depends="do-forrest" description="[admin] Builds the site">
     <mkdir dir="${site}"/>
     <copy todir="${site}" filtering="off">
       <fileset dir="${build.site}"/>

Modified: cocoon/trunk/tools/targets/docs-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xml?view=diff&rev=123476&p1=cocoon/trunk/tools/targets/docs-build.xml&r1=123475&p2=cocoon/trunk/tools/targets/docs-build.xml&r2=123476
==============================================================================
--- cocoon/trunk/tools/targets/docs-build.xml	(original)
+++ cocoon/trunk/tools/targets/docs-build.xml	Mon Dec 27 22:59:47 2004
@@ -49,7 +49,7 @@
     <copy file="status.xml"
       tofile="${build.context}/xdocs/status.xml" filtering="on"/>
 
-	<!-- generate sitemap components docs -->
+	<!-- generate sitemap components docs using SitemapTask -->
     <sitemap-components docDir="${build.context}/xdocs/userdocs" source="${java}"/>
     <!-- -->
     
@@ -97,7 +97,7 @@
 
   <!-- Create docs -->
   <target name="docs"
-      depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs, forrest"
+      depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs, do-forrest"
       unless="docs.notrequired" description="Builds the documentation">
     <!-- The docs are created using forrest, so we simply copy them for now -->
     <mkdir dir="${build.docs}"/>

Modified: cocoon/trunk/tools/targets/forrest-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/forrest-build.xml?view=diff&rev=123476&p1=cocoon/trunk/tools/targets/forrest-build.xml&r1=123475&p2=cocoon/trunk/tools/targets/forrest-build.xml&r2=123476
==============================================================================
--- cocoon/trunk/tools/targets/forrest-build.xml	(original)
+++ cocoon/trunk/tools/targets/forrest-build.xml	Mon Dec 27 22:59:47 2004
@@ -14,20 +14,38 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project name="forrest">
+<project name="do-forrest">
 
   <description>
     Forrest Targets
   </description>
 
-  <target name="forrest" depends="prepare, prepare-docs, forrest.init, validate-jars,
javadocs" unless="exclude.documentation" description="Generates static HTML documentation">
-
-    <!-- Add some other documents -->
+  <!-- FIXME: This build system is in the process of being restructured
+  to use Forrest-0.6 rather than Forrest-0.5.1
+  Many of the existing ant targets below, such as forrest.init and
+  forrest.webapp have not yet been upgraded.
+  Much of the checking for various locations of FORREST_HOME
+  and loading of various properties files might not even be required now.
+  -->
+
+  <property environment="env"/>
+  <property name="forrest.home" value="${env.FORREST_HOME}"/>
+  <!-- forrest-0.6
+  -->
+  <import file="${env.FORREST_HOME}/forrest.build.xml"/>
+  <!-- forrest-0.7-dev
+  <import file="${env.FORREST_HOME}/main/forrest.build.xml"/>
+  -->
+
+  <target name="do-forrest" depends="site, prepare-extra-docs, prepare, prepare-docs,
validate-jars, javadocs" unless="exclude.documentation" description="Generates static HTML
documentation">
+  </target>
+
+  <!-- Add some other specific documents -->
+  <target name="prepare-extra-docs">
+    <echo message="Adding extra documents, e.g. jars.xml"/>
     <copy file="${build.temp}/jars.xml"
       tofile="${build.context}/xdocs/installing/jars.xml" filtering="off"
       overwrite="yes"/>
-
-    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
   </target>
 
   <!-- Generates an unpackaged webapp of the website -->
@@ -148,24 +166,8 @@
     <echo>
       ----------------------------------------------
       To run this target, you need Forrest installed.
-      Please do the following:
-
-      export CVSROOT=:pserver:anoncvs@cvs.apache.org:/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 project.properties, with the forrest.home property
-        pointing to the forrest shbat directory, e.g.
-
-        forrest.home=${winpath}  (Windows)
-        forrest.home=${unixpath}  (Unix)
-
-        (adjusting the path according to where your xml-forrest is)
+      Please use the "forrest_06_branch" from SVN.
+      http://forrest.apache.org/build.html
       ----------------------------------------------
     </echo>
     <fail message="Need to define $${forrest.home}"/>

Mime
View raw message