You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/04/18 19:49:42 UTC

cvs commit: httpd-2.0/build fastgen.sh

jerenkrantz    02/04/18 10:49:42

  Modified:    build    fastgen.sh
  Log:
  The pedant in me wishes to see all extraneous trailing / go away.
  So, if we are in the top-level makefile, don't add an extra trailing
  slash to srcdir, builddir, or VPATH.  It's annoying.
  
  Revision  Changes    Path
  1.18      +12 -4     httpd-2.0/build/fastgen.sh
  
  Index: fastgen.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/fastgen.sh,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- fastgen.sh	13 Mar 2002 20:47:40 -0000	1.17
  +++ fastgen.sh	18 Apr 2002 17:49:41 -0000	1.18
  @@ -97,16 +97,24 @@
       echo "creating $makefile"
       dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
       $mkdir_p "$dir/"
  -
  -    cat - $top_srcdir/$makefile.in <<EOF >$makefile
  +    if test -z "$dir"; then
  +        cat - $top_srcdir/$makefile.in <<EOF >$makefile
  +top_srcdir   = $top_srcdir
  +top_builddir = $top_builddir
  +srcdir       = $top_srcdir
  +builddir     = $top_builddir
  +VPATH        = $top_srcdir
  +EOF
  +        dir="."
  +    else
  +        cat - $top_srcdir/$makefile.in <<EOF >$makefile
   top_srcdir   = $top_srcdir
   top_builddir = $top_builddir
   srcdir       = $top_srcdir/$dir
   builddir     = $top_builddir/$dir
   VPATH        = $top_srcdir/$dir
   EOF
  -  
  -    test -z "$dir" && dir="."
  +    fi 
       touch $dir/.deps
     done
   fi
  
  
  

Re: cvs commit: httpd-2.0/build fastgen.sh

Posted by Justin Erenkrantz <je...@apache.org>.
On Thu, Apr 18, 2002 at 10:56:36AM -0700, Ryan Bloom wrote:
> > jerenkrantz    02/04/18 10:49:42
> > 
> >   Modified:    build    fastgen.sh
> >   Log:
> >   The pedant in me wishes to see all extraneous trailing / go away.
> >   So, if we are in the top-level makefile, don't add an extra trailing
> >   slash to srcdir, builddir, or VPATH.  It's annoying.
> 
> WHAT?????  This patch removes an "annoying" trailing slash that doesn't
> hurt anything and instead inserts an if condition which means that this
> logic must essentially be maintained twice.  Is there a valid technical
> reason for this change, or is it personal preference?  If it's personal
> preference, then please back it out, this just makes maintenance harder.

I hope that my last commit to build/fastgen.sh addressed your 
concerns.  -- justin

Re: cvs commit: httpd-2.0/build fastgen.sh

Posted by Justin Erenkrantz <je...@apache.org>.
On Thu, Apr 18, 2002 at 10:56:36AM -0700, Ryan Bloom wrote:
> WHAT?????  This patch removes an "annoying" trailing slash that doesn't
> hurt anything and instead inserts an if condition which means that this
> logic must essentially be maintained twice.  Is there a valid technical
> reason for this change, or is it personal preference?  If it's personal
> preference, then please back it out, this just makes maintenance harder.

IMHO, we should strive for being correct - adding extra slashes is
very sloppy behavior.  I'd prefer us to be not sloppy at the cost of
a little more maintenance - and really how often is this code changed?

I believe that the whole fastgen.sh code is an obstacle to maintaining
our build system.  It attempts to circumvent the autoconf code and
ends up hurting us more than it helps.  -- justin

RE: cvs commit: httpd-2.0/build fastgen.sh

Posted by Ryan Bloom <rb...@covalent.net>.
> jerenkrantz    02/04/18 10:49:42
> 
>   Modified:    build    fastgen.sh
>   Log:
>   The pedant in me wishes to see all extraneous trailing / go away.
>   So, if we are in the top-level makefile, don't add an extra trailing
>   slash to srcdir, builddir, or VPATH.  It's annoying.

WHAT?????  This patch removes an "annoying" trailing slash that doesn't
hurt anything and instead inserts an if condition which means that this
logic must essentially be maintained twice.  Is there a valid technical
reason for this change, or is it personal preference?  If it's personal
preference, then please back it out, this just makes maintenance harder.

Ryan 


RE: cvs commit: httpd-2.0/build fastgen.sh

Posted by Ryan Bloom <rb...@covalent.net>.
> jerenkrantz    02/04/18 10:49:42
> 
>   Modified:    build    fastgen.sh
>   Log:
>   The pedant in me wishes to see all extraneous trailing / go away.
>   So, if we are in the top-level makefile, don't add an extra trailing
>   slash to srcdir, builddir, or VPATH.  It's annoying.

WHAT?????  This patch removes an "annoying" trailing slash that doesn't
hurt anything and instead inserts an if condition which means that this
logic must essentially be maintained twice.  Is there a valid technical
reason for this change, or is it personal preference?  If it's personal
preference, then please back it out, this just makes maintenance harder.

Ryan