You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/07/13 01:12:38 UTC
svn commit: r216041 - in /myfaces/build/trunk: ./ bootstrap.properties
bootstrap.xml build.xml
Author: schof
Date: Tue Jul 12 16:12:37 2005
New Revision: 216041
URL: http://svn.apache.org/viewcvs?rev=216041&view=rev
Log:
moving closer towards automated build of website (including javadoc and tlddoc)
Modified:
myfaces/build/trunk/ (props changed)
myfaces/build/trunk/bootstrap.properties
myfaces/build/trunk/bootstrap.xml
myfaces/build/trunk/build.xml
Propchange: myfaces/build/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 12 16:12:37 2005
@@ -9,3 +9,4 @@
distdist
dist
classes
+bootstrap.properties.local
Modified: myfaces/build/trunk/bootstrap.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/bootstrap.properties?rev=216041&r1=216040&r2=216041&view=diff
==============================================================================
--- myfaces/build/trunk/bootstrap.properties (original)
+++ myfaces/build/trunk/bootstrap.properties Tue Jul 12 16:12:37 2005
@@ -1,5 +1,3 @@
code.project.name=myfaces/current
code.checkout.dir=myfaces-current
-site.project.name=myfaces/forrest
-site.checkout.dir=myfaces-forrest
svn.repository=https://svn.apache.org/repos/asf
Modified: myfaces/build/trunk/bootstrap.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/bootstrap.xml?rev=216041&r1=216040&r2=216041&view=diff
==============================================================================
--- myfaces/build/trunk/bootstrap.xml (original)
+++ myfaces/build/trunk/bootstrap.xml Tue Jul 12 16:12:37 2005
@@ -24,29 +24,27 @@
<fail unless="code.project.name">
The code.project.name property must be set. (ex. ant -buildfile bootstrap.xml -Dproject.name=myfaces/current)
</fail>
-
+ <fail unless="code.checkout.dir">
+ The code.checkout.dir property must be set. (ex. ant -buildfile bootstrap.xml -Dcode.checkout.dir=myfaces-current)
+ </fail>
+<!--
<fail unless="code.project.name">
The site.project.name property must be set. (ex. ant -buildfile bootstrap.xml -Dproject.name=myfaces/forrest)
</fail>
-
+-->
<!-- determine if the files have been checked out already -->
<available file="${code.checkout.dir}" type="dir" property="code.already.checked.out"/>
+<!--
<available file="${site.checkout.dir}" type="dir" property="site.already.checked.out"/>
-
- <!-- classpath for <javadoc> -->
-<!--
- <path id="doclet.classpath">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- <include name="*.JAR"/>
- </fileset>
- </path>
-->
</target>
<target name="clean" description="Remove everything generated from previous builds of the same project">
<delete dir="${code.checkout.dir}"/>
+<!--
<delete dir="${site.checkout.dir}"/>
+-->
+ <delete dir="${release.dir}"/>
</target>
<target name="svn-checkout-code" depends="prepare" unless="code.already.checked.out">
@@ -60,7 +58,7 @@
<update dir="${code.checkout.dir}"/>
</svn>
</target>
-
+<!--
<target name="svn-checkout-site" depends="prepare" unless="site.already.checked.out">
<svn>
<checkout url="${svn.repository}/${site.project.name}" destPath="${site.checkout.dir}"/>
@@ -72,7 +70,7 @@
<update dir="${site.checkout.dir}"/>
</svn>
</target>
-
+-->
<target name="nightly" depends="svn-checkout-code,svn-update-code">
<echo message="build.dir: ${build.dir}"/>
@@ -110,28 +108,38 @@
<property name="release.dir" value="${build.dir}/release"/>
- <delete dir="${release.dir}"/>
-
<echo message="build output directory: ${release.dir}"/>
<mkdir dir="${release.dir}"/>
<!-- execute the build file that was just checked out -->
- <ant dir="${build.dir}" target="clean" inheritRefs="true"/>
-
- <!-- copy files to local release dir -->
- <copy todir="${release.dir}">
- <fileset dir="${release.dir}"/>
- </copy>
+ <ant dir="${build.dir}" target="release" inheritRefs="true"/>
</target>
- <target name="site" depends="svn-checkout-site,svn-update-site"> <!--depends="svn-checkout-code,svn-update-code,-->
+ <target name="site" depends="svn-checkout-code,svn-update-code">
+
+ <ant dir="${code.checkout.dir}/forrest/build" target="release"/>
+
+ <ant dir="${code.checkout.dir}/build" target="download-dependencies"/>
+
+ <!-- create all jarfiles because they are needed in compiling certain subprojects -->
+ <ant dir="${code.checkout.dir}/build" target="jar-all"/>
- <ant dir="${site.checkout.dir}/build" target="release" inheritrefs="false"/>
- <!--
- <property name="build.dir" value="${site.checkout.dir}/build"/>
- <property name="release.dir" value="${site.checkout.dir}/build/release"/>
- </ant>-->
+ <!-- create tarball for javadoc -->
+ <ant dir="${code.checkout.dir}/build" target="javadoc-all"/>
+ <tar destfile="${release.dir}/javadoc.tar.gz" compression="gzip" >
+ <tarfileset prefix="javadoc/api" dir="../api/build/temp/javadoc"/>
+ <tarfileset prefix="javadoc/impl" dir="../impl/build/temp/javadoc"/>
+ <tarfileset prefix="javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="javadoc/sandbox" dir="../sandbox/build/temp/javadoc"/>
+ </tar>
+ <!-- create tarball for tlddoc -->
+ <ant dir="${code.checkout.dir}/build" target="tlddoc-all"/>
+ <tar destfile="${release.dir}/tlddoc.tar.gz" compression="gzip" >
+ <tarfileset prefix="tlddoc/core" dir="../impl/build/temp/tlddoc"/>
+ <tarfileset prefix="tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <tarfileset prefix="tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
+ </tar>
</target>
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=216041&r1=216040&r2=216041&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Tue Jul 12 16:12:37 2005
@@ -559,12 +559,6 @@
<arg line="-xslt ${tlddoc.xslt.dir}"/>
<fileset dir="${resolved-tlds.dir}" includes="*.tld"/>
</apply>
- <!--<java fork="true" jar="${tlddoc.jar}" failonerror="true">
- <arg line="-doctitle 'Tag library for Apache MyFaces'" />
- <arg line="-d ${tlddoc.dir}"/>
- <arg line="-xslt ${tlddoc.xslt.dir}"/>
- <arg value="${resolved-tlds.dir}/*.tld"/>
- </java>-->
</target>
<!--