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/05/12 16:14:09 UTC
svn commit: r169825 - /myfaces/trunk/build/bootstrap.properties
/myfaces/trunk/build/bootstrap.xml /myfaces/trunk/build/build-site.xml
/myfaces/trunk/build/build.xml
Author: schof
Date: Thu May 12 07:14:08 2005
New Revision: 169825
URL: http://svn.apache.org/viewcvs?rev=169825&view=rev
Log:
Several fixes necessary for automatic site generation; Ant also now removes extra DOS LF char so CGI scripts can run (nice!)
Modified:
myfaces/trunk/build/bootstrap.properties
myfaces/trunk/build/bootstrap.xml
myfaces/trunk/build/build-site.xml
myfaces/trunk/build/build.xml
Modified: myfaces/trunk/build/bootstrap.properties
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/bootstrap.properties?rev=169825&r1=169824&r2=169825&view=diff
==============================================================================
--- myfaces/trunk/build/bootstrap.properties (original)
+++ myfaces/trunk/build/bootstrap.properties Thu May 12 07:14:08 2005
@@ -1,2 +1,6 @@
project.name=myfaces
+code.project.name=myfaces/trunk
+code.checkout.dir=myfaces-trunk
+site.project.name=myfaces/site
+site.checkout.dir=myfaces-site
svn.repository=https://svn.apache.org/repos/asf
Modified: myfaces/trunk/build/bootstrap.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/bootstrap.xml?rev=169825&r1=169824&r2=169825&view=diff
==============================================================================
--- myfaces/trunk/build/bootstrap.xml (original)
+++ myfaces/trunk/build/bootstrap.xml Thu May 12 07:14:08 2005
@@ -12,12 +12,13 @@
<taskdef name="sshexec" classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec"/>
<taskdef name="svn-checkout" classname="com.alternatecomputing.jsvn.ant.SvnCheckout"/>
<taskdef name="svn-update" classname="com.alternatecomputing.jsvn.ant.SvnUpdate"/>
+ <taskdef name="svn-commit" classname="com.alternatecomputing.jsvn.ant.SvnCommit"/>
+ <taskdef name="svn-add" classname="com.alternatecomputing.jsvn.ant.SvnAdd"/>
<!-- use properties file to determine cvs configuration info -->
<property file="bootstrap.properties"/>
<property file="bootstrap.properties.local"/>
- <property name="checkout.dir" value="${project.name}"/>
- <property name="build.dir" value="${basedir}/${project.name}/build"/>
+ <property name="build.dir" value="${basedir}/${code.checkout.dir}/build"/>
<property name="temp.dir" value="${build.dir}/temp"/>
<target name="prepare">
@@ -28,6 +29,7 @@
</fail>
<!-- use latest version if version is not specified -->
+ <!--
<condition property="svn.tag" value="trunk">
<and>
<not>
@@ -40,12 +42,11 @@
<isset property="build.version"/>
</and>
</condition>
-
- <echo message="build.version=${build.version}"/>
- <echo message="svn.tag=${svn.tag}"/>
-
+ -->
+
<!-- determine if the files have been checked out already -->
- <available file="${project.name}" type="dir" property="already.checked.out"/>
+ <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">
@@ -58,29 +59,28 @@
</target>
<target name="clean" description="Remove everything generated from previous builds of the same project">
- <delete dir="${checkout.dir}"/>
+ <delete dir="${code.checkout.dir}"/>
+ <delete dir="${site.checkout.dir}"/>
</target>
- <target name="svn-checkout" depends="prepare" unless="already.checked.out">
-
- <echo message="svn.repository = ${svn.repository}"/>
- <echo message="project.name = ${project.name}"/>
-
- <svn-checkout repositoryUrl="${svn.repository}/${project.name}/${svn.tag}" destination="${project.name}"/>
-
+ <target name="svn-checkout-code" depends="prepare" unless="code.already.checked.out">
+ <svn-checkout repositoryUrl="${svn.repository}/${code.project.name}" destination="${code.checkout.dir}"/>
</target>
- <target name="svn-update" depends="prepare" if="already.checked.out">
-
- <echo message="svn.repository = ${svn.repository}"/>
- <echo message="project.name = ${project.name}"/>
-
- <svn-update repositoryUrl="${svn.repository}/${project.name}/${svn.tag}" target="${project.name}"/>
+ <target name="svn-update-code" depends="prepare" if="code.already.checked.out">
+ <svn-update repositoryUrl="${svn.repository}/${code.project.name}" target="${code.checkout.dir}"/>
+ </target>
+ <target name="svn-checkout-site" depends="prepare" unless="site.already.checked.out">
+ <svn-checkout repositoryUrl="${svn.repository}/${site.project.name}" destination="${site.checkout.dir}"/>
</target>
- <target name="nightly" depends="svn-checkout,svn-update">
+ <target name="svn-update-site" depends="prepare" if="site.already.checked.out">
+ <svn-update repositoryUrl="${svn.repository}/${site.project.name}" target="${site.checkout.dir}"/>
+ </target>
+ <target name="nightly" depends="svn-checkout-code,svn-update-code">
+
<echo message="build.dir: ${build.dir}"/>
<echo message="building nigthly for ${project.name} ..." level="debug"/>
@@ -103,7 +103,7 @@
</target>
- <target name="release" depends="check,svn-checkout,svn-update">
+ <target name="release" depends="check,svn-checkout-code,svn-update-code">
<echo message="build.dir: ${build.dir}"/>
<echo message="building release for ${project.name} ..." level="debug"/>
@@ -120,6 +120,18 @@
<fileset dir="${release.dir}"/>
</copy>
+ </target>
+
+ <target name="publish-site"><!-- depends="svn-checkout-code,svn-update-code,svn-checkout-site,svn-update-site">-->
+
+ <property name="site.build.dir" value="${basedir}/${site.checkout.dir}"/>
+ <property name="project.home" value="${basedir}/${code.checkout.dir}"/>
+
+ <echo message="site.build.dir: ${site.build.dir}"/>
+
+ <!-- execute the build file that was just checked out -->
+ <ant dir="${build.dir}" target="site" inheritRefs="true"/>
+
</target>
<target name="check">
Modified: myfaces/trunk/build/build-site.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/build-site.xml?rev=169825&r1=169824&r2=169825&view=diff
==============================================================================
--- myfaces/trunk/build/build-site.xml (original)
+++ myfaces/trunk/build/build-site.xml Thu May 12 07:14:08 2005
@@ -11,9 +11,8 @@
<property name="forrest.home" value="${env.FORREST_HOME}"/>
- <import file="${env.FORREST_HOME}/forrest.build.xml"/>
-
- <!-- 'site' is a target imported from forrest.build.xml -->
- <target name="all" depends="site"/>
+ <target name="all">
+ <ant target="site" antfile="${env.FORREST_HOME}/forrest.build.xml" inheritall="true" dir="."/>
+ </target>
</project>
Modified: myfaces/trunk/build/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/build.xml?rev=169825&r1=169824&r2=169825&view=diff
==============================================================================
--- myfaces/trunk/build/build.xml (original)
+++ myfaces/trunk/build/build.xml Thu May 12 07:14:08 2005
@@ -5,6 +5,7 @@
<!-- Constants -->
<property name="project.dir" location="${basedir}/.."/>
+ <property name="project.home" location="${project.dir}"/>
<property name="build.dir" location="${project.dir}/build"/>
<property name="nightly.dir" location="${build.dir}/nightly"/>
<property name="dist.dir" location="${build.dir}/dist"/>
@@ -840,11 +841,14 @@
<!--
Preconditions for use of this target: see build-site.xml
-->
-
<!-- build forrest site -->
<ant antfile="build-site.xml" inheritall="false" target="all">
<property name="project.site-dir" value="${site.build.dir}"/>
+ <property name="project.home" value="${project.home}"/>
</ant>
+
+ <!-- fix line endings for cgi scripts (or they will bomb out once deployed -->
+ <fixcrlf srcdir="${site.build.dir}" eol="unix" eof="remove" includes="**/*.cgi"/>
<!-- add javadoc -->
<ant target="javadoc">