forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r522705 - in /forrest/trunk: main/build.xml site-author/content/xdocs/procedures/release/How_to_release.xml
Date Tue, 27 Mar 2007 01:55:44 GMT
Author: crossley
Date: Mon Mar 26 18:55:43 2007
New Revision: 522705

URL: http://svn.apache.org/viewvc?view=rev&rev=522705
Log:
Fix the "release-dist" build target to build both packages on the same system using Ant fixcrlf.
We used to build the *.tar.gz on a UNIX system and *.zip on a Windows system,
which relied on SVN to get the line-endings right. Nice but required two people to build the
release.

Modified:
    forrest/trunk/main/build.xml
    forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?view=diff&rev=522705&r1=522704&r2=522705
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Mon Mar 26 18:55:43 2007
@@ -126,13 +126,10 @@
   <target name="release-dist" depends="init, dist-clean, dist-shbat" 
     description="Makes release distributions">
     <property name="release-name-bin" value="${name}-${forrest.version}"/>
-    <zip
-      file="${dist.dir}/${release-name-bin}.zip" >
-      <zipfileset dir="${dist-shbat.dir}" prefix="${release-name-bin}"/>
-    </zip>
+    <!-- Prepare *.tar.gz for "lf" eol-style systems -->
+    <fixcrlf eol="lf" srcdir="${dist-shbat.dir}" excludes="*.bat"/>
     <tar longfile="gnu" compression="gzip"
       destfile="${dist.dir}/${release-name-bin}.tar.gz" >
-
       <tarfileset prefix="${release-name-bin}" dir="${dist-shbat.dir}"
         username="forrest" group="forrest">
         <exclude name="**/*.sh"/>
@@ -146,6 +143,12 @@
         <include name="**/forrest"/>
       </tarfileset>
     </tar>
+    <!-- Prepare *.zip for "crlf" eol-style systems -->
+    <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}"/>
+    <zip
+      file="${dist.dir}/${release-name-bin}.zip" >
+      <zipfileset dir="${dist-shbat.dir}" prefix="${release-name-bin}"/>
+    </zip>
   </target>
 
 
@@ -279,7 +282,7 @@
   |    unix: $FORREST_HOME/bin/forrest -projecthelp
   |    win: %FORREST_HOME%\bin\forrest -projecthelp
   | will list options for the 'forrest' command
-  | More help at http://forrest.apache.org/ and forrest-dev@xml.apache.org
+  | More help at http://forrest.apache.org/ and dev AT forrest.apache.org
   *-----------------------------------------------------------------
     </echo>
   </target>

Modified: forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml?view=diff&rev=522705&r1=522704&r2=522705
==============================================================================
--- forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml (original)
+++ forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml Mon Mar
26 18:55:43 2007
@@ -337,7 +337,7 @@
 
         <section id="BuildDist">
             <title>Building the distribution</title>
-            <p>In this phase you build the release candidate to be tested.</p>
+            <p>In this phase the Release Manager builds the release candidate to be
tested.</p>
             <note>You can practice the following steps (as far as creating the branch)
without committing anything even
                 before code-freeze. This ensures a good release candidate.</note>
             <ol>
@@ -357,7 +357,7 @@
                                 without errors.</p>
                         </li>
                         <li>
-                            <p>Change to the site-author-directory and run 'forrest'.
The docs should build without
+                            <p>Change to the site-author directory and run 'forrest'.
The docs should build without
                                 errors.</p>
                         </li>
 
@@ -440,21 +440,10 @@
                 </li>
                 <li>
                     <p>Now we will build the release candidates for Windows and Unix.</p>
-                    <note>The reason for creating two separate archives is the line-endings
dilemma between Windows and
-                        UNIX. SVN ensures correct line-endings on each operating system (as
long as committers have been
-                        diligent when adding/updating the repository).</note>
                     <ul>
                         <li>
-                            <p>On a UNIX machine:<br /> Change to directory main
and run <code>build release-dist</code>
-                                to generate the distributions on a UNIX machine.</p>
-                            <p> Two archives are created: apache-forrest-X.Y.tar.gz
apache-forrest-X.Y.zip. Ignore the
-                                *.zip archive.</p>
-                        </li>
-                        <li>
-                            <p>On a Windows machine:<br /> Change to directory
main and run <code>build
-                                release-dist</code> to generate the distributions on
a Windows machine.</p>
-                            <p> Two archives are created: apache-forrest-X.Y.tar.gz
apache-forrest-X.Y.zip. Ignore the
-                                *.tar.gz archive.</p>
+                          Change to directory $FORREST_HOME/main and run <code>'build
release-dist'</code>
+                          to generate the distributions.
                         </li>
                     </ul>
                 </li>
@@ -511,8 +500,7 @@
             <p>Get Forrest developers to test the actual distribution on various platforms.</p>
             <ol>
                 <li>
-                    <p>Upload the release candidates and signatures to a committer's
webspace. Use the .tar.gz from the
-                        UNIX machine and .zip from the Windows machine.</p>
+                  Upload the release candidates and signatures to your committer's webspace.
                 </li>
                 <li>
                     <p>Use template <a href="test_and_vote_on_rel_cand.txt">test_and_vote_on_rel_cand.txt</a>
for an
@@ -522,7 +510,7 @@
                       This is especially important if there has been more than one release
candidate.</p>
                 </li>
                 <li>
-                    <p>During this testing phase, then Release Manager should:</p>
+                    <p>During this testing phase, the Release Manager should:</p>
                     <ul>
                         <li>Make sure that people are reporting that the distributions
unpack on different systems without problems.</li>
                         <li>Make sure that people have followed the actual user instructions
in the Forrest



Mime
View raw message