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/12 00:56:18 UTC
svn commit: r215894 - in /myfaces/build/trunk: bootstrap.properties
bootstrap.properties.local.sample bootstrap.xml
Author: schof
Date: Mon Jul 11 15:56:17 2005
New Revision: 215894
URL: http://svn.apache.org/viewcvs?rev=215894&view=rev
Log:
fixed nightly builds
Modified:
myfaces/build/trunk/bootstrap.properties
myfaces/build/trunk/bootstrap.properties.local.sample
myfaces/build/trunk/bootstrap.xml
Modified: myfaces/build/trunk/bootstrap.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/bootstrap.properties?rev=215894&r1=215893&r2=215894&view=diff
==============================================================================
--- myfaces/build/trunk/bootstrap.properties (original)
+++ myfaces/build/trunk/bootstrap.properties Mon Jul 11 15:56:17 2005
@@ -1,6 +1,5 @@
-project.name=myfaces
-code.project.name=myfaces/trunk
-code.checkout.dir=myfaces-trunk
-site.project.name=myfaces/site
-site.checkout.dir=myfaces-site
+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.properties.local.sample
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/bootstrap.properties.local.sample?rev=215894&r1=215893&r2=215894&view=diff
==============================================================================
--- myfaces/build/trunk/bootstrap.properties.local.sample (original)
+++ myfaces/build/trunk/bootstrap.properties.local.sample Mon Jul 11 15:56:17 2005
@@ -1,7 +1,8 @@
apache.username=foo
apache.password=bar
+apache.key=identity.private
release.dir=c:\\foo
MailLogger.mailhost=foo.com
-MailLogger.from=foo@apache.org
-MailLogger.failure.to=pmc@myfaces.apache.org,foo@apache.org
+MailLogger.from=bootstrap@myface.apache.org
+MailLogger.failure.to=dev@myfaces.apache.org
MailLogger.success.notify=false
Modified: myfaces/build/trunk/bootstrap.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/bootstrap.xml?rev=215894&r1=215893&r2=215894&view=diff
==============================================================================
--- myfaces/build/trunk/bootstrap.xml (original)
+++ myfaces/build/trunk/bootstrap.xml Mon Jul 11 15:56:17 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
-This is a basic ant build file that can perform a so-called "bootstrap" build of any project.
+This is a basic ant build file that can perform a so-called "bootstrap" build of the various MyFaces projects.
The only requirement is that the project be checked in SVN and have its own build file. Basically this will check out
the project (by specific version if desired) and run the appropriate build script. The SVN client must also be available
through the system path.
@@ -11,12 +11,7 @@
<taskdef name="scp" classname="org.apache.tools.ant.taskdefs.optional.ssh.Scp"/>
<taskdef name="sshexec" classname="org.apache.tools.ant.taskdefs.optional.ssh.SSHExec"/>
<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask"/>
-<!--
- <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"/>
@@ -26,38 +21,27 @@
<target name="prepare">
<!-- make sure project.name property was set (externally) -->
- <fail unless="project.name">
- The project.name property must be set. (ex. ant -buildfile bootstrap.xml -Dproject.name=cdrh-commons)
+ <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.project.name">
+ The site.project.name property must be set. (ex. ant -buildfile bootstrap.xml -Dproject.name=myfaces/forrest)
</fail>
- <!-- use latest version if version is not specified -->
- <!--
- <condition property="svn.tag" value="trunk">
- <and>
- <not>
- <isset property="build.version"/>
- </not>
- </and>
- </condition>
- <condition property="svn.tag" value="tags/rel_${build.version}">
- <and>
- <isset property="build.version"/>
- </and>
- </condition>
- -->
-
<!-- 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">
@@ -110,7 +94,10 @@
<ant dir="${build.dir}" target="release" inheritRefs="true"/>
<!-- publish the nightly bundles -->
- <scp todir="${apache.username}:${apache.password}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/nightly" trust="yes">
+ <scp todir="${apache.username}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/nightly"
+ trust="yes"
+ keyfile="${apache.key}"
+ passphrase="${apache.password}">
<fileset dir="${release.dir}" excludes="**/*.sh"/>
</scp>
@@ -139,35 +126,6 @@
</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}"/>
-
- <delete>
- <fileset dir="${site.checkout.dir}">
- <include name="*.html"/>
- <include name="*.cgi"/>
- <include name="*.txt"/>
- </fileset>
- </delete>
-
- <!-- execute the build file that was just checked out -->
- <ant dir="${build.dir}" target="site" inheritRefs="true"/>
-
- <!-- commit the new site back to svn (add any new files first) -->
- <svn username="${apache.username}" password="${apache.password}">
- <add>
- <fileset dir="${site.checkout.dir}">
- <include name="**/*.html"/>
- <include name="*.cgi"/>
- <include name="*.txt"/>
- </fileset>
- </add>
- <add dir="${site.checkout.dir}/javadoc"/>
- <add dir="${site.checkout.dir}/tlddoc"/>
-
- <commit dir="${site.checkout.dir}" message="automated ant commit"/>
- </svn>
</target>