Colin Sampaleanu wrote:

> care to clarify the rationale for this? (I'm just curious, I've always set
> up my projects so anything under /src lives in source control)
>

Yes .. you're likely to see similar changes on other Jakarta subprojects as
well.  (Modifying files outside your source directory is highly offensive to
some developers, and I'm starting to see the light about why :-).

Consider the fact that we're about to release Struts 1.0, and happily start
working on Struts 1.1 (in a branch of the jakarta-struts repository).  Now, it
is quite likely that any post-release bug found in 1.0 will also affect 1.1, so
I'm going to want to keep both versions checked out.  No problem, I can do that,
by renaming my source directories "jakarta-struts-1.0" and "jakarta-struts-1.1".

But now, when I go do a build, the output from one version steps on the
"../build/struts" and "../dist/struts" directories of the other version :-(.

This could be fixed by maintaining version numbers in the build directory names
(by changing the "build.home" value to "../build/struts-1.1" for example), but
it just seems cleaner to keep everything localized.  The "build" and "dist"
directories will automatically be version-specific, with no chance for
corrupting each other.

NOTE:  Even though the "build" and "dist" directories will be wtihin the source
directory, they will *not* be checked in to CVS.  As soon as the server lets me
back in, I've got a ".cvsignore" file to add that will keep CVS from whining
about unregistered directories.

Craig


>
> > -----Original Message-----
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> > Sent: January 24, 2001 4:57 PM
> > To: [EMAIL PROTECTED]
> > Subject: cvs commit: jakarta-struts/src/doc installation.xml
> >
> >
> > craigmcc    01/01/24 13:57:27
> >
> >   Modified:    .        build.xml
> >                src/doc  installation.xml
> >   Log:
> >   Change the Struts build process to place the "build" and "dist"
> >   directories *inside* the source directory, rather than up and over
> >   ("../build/struts" and "../dist/struts") as they are now.  Tweak the
> >   installation documentation to reflect this.
> >
> >   Revision  Changes    Path
> >   1.33      +2 -2      jakarta-struts/build.xml
> >
> >   Index: build.xml
> >   ===================================================================
> >   RCS file: /home/cvs/jakarta-struts/build.xml,v
> >   retrieving revision 1.32
> >   retrieving revision 1.33
> >   diff -u -r1.32 -r1.33
> >   --- build.xml       2001/01/20 00:32:43     1.32
> >   +++ build.xml       2001/01/24 21:57:26     1.33
> >   @@ -2,11 +2,11 @@
> >
> >      <!-- Initialization properties -->
> >      <property name="app.name"       value="struts"/>
> >   -  <property name="build.home"     value="../build/${app.name}"/>
> >   +  <property name="build.home"     value="build"/>
> >      <property name="catalina.home"  value="../build/tomcat-4.0"/>
> >      <property name="debug"          value="true"/>
> >      <property name="deprecation"    value="false"/>
> >   -  <property name="dist.home"      value="../dist/${app.name}"/>
> >   +  <property name="dist.home"      value="dist"/>
> >      <property name="optimize"       value="true"/>
> >      <property name="project.name"   value="jakarta-struts"/>
> >      <property name="project.version" value="1.0-dev"/>
> >
> >
> >
> >   1.8       +5 -4      jakarta-struts/src/doc/installation.xml
> >
> >   Index: installation.xml
> >   ===================================================================
> >   RCS file: /home/cvs/jakarta-struts/src/doc/installation.xml,v
> >   retrieving revision 1.7
> >   retrieving revision 1.8
> >   diff -u -r1.7 -r1.8
> >   --- installation.xml        2001/01/12 05:24:58     1.7
> >   +++ installation.xml        2001/01/24 21:57:27     1.8
> >   @@ -101,9 +101,10 @@
> >        </pre>
> >
> >        <p>This command will create a binary distribution of
> > Struts, in a
> >   -    directory named <code>../dist/struts</code> (relative
> > to where you
> >   +    directory named <code>dist</code> (relative to where you
> >        are compiling from).  This directory contains an exact
> > replica of the
> >   -    files included in a binary distribution of Struts.</p>
> >   +    files included in a binary distribution of Struts, as described
> >   +    in the following section.</p>
> >
> >      </section>
> >
> >   @@ -138,13 +139,13 @@
> >            You can install this web application on any
> > servlet container
> >            compatible with the Servlet 2.2 (or later) and JSP
> > 1.1 (or later)
> >            specifications.</li>
> >   +    <li><strong>webapps/struts-template.war</strong> -
> > This web application
> >   +        both introduces and demonstrates the Struts
> > template tags.</li>
> >        <li><strong>webapps/struts-test.war</strong> - This
> > web application
> >            contains test pages for the various custom tags
> > supported by Struts.
> >            It is primarily of use to developers who are
> > enhancing the Struts
> >            custom tag libraries, but may also be useful as
> > simple examples of
> >            the usage of various Struts tags.</li>
> >   -    <li><strong>webapps/struts-template.war</strong> -
> > This web application
> >   -        both introduces and demonstrates the Struts
> > template tags.</li>
> >        <li><strong>webapps/struts-upload.war</strong> - This
> > web application
> >            is a quick example of uploading files using the
> > Struts framework.</li>
> >            </ul>
> >
> >
> >
> >

Reply via email to