You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@lyra.org> on 2002/06/18 21:33:59 UTC
Re: svn commit: rev 2274 - trunk
This change should fix the build problem people saw with 2273. If you have a
working client, then just 'svn update' following by gen-make.py or
autogen.sh. If your installed client got busted, then you can manually patch
it in, or fetch the file using something like:
$ wget http://svn.collab.net/repos/svn/trunk/build.conf
Cheers,
-g
On Tue, Jun 18, 2002 at 04:18:11PM -0500, gstein@tigris.org wrote:
> Author: gstein
> Date: 2002-06-18 21:17 GMT
> New Revision: 2274
>
> Modified:
> trunk/build.conf
> Log:
> Looks like Mike forgot this as part of his 2273 checkin.
>
> * build.conf: add the new FS subdirs to the sources line for
> libsvn_fs. Note that we also need to explicitly mention the *.c in
> the libsvn_fs directory itself, too.
>
>
> Modified: trunk/build.conf
> ==============================================================================
> --- trunk/build.conf (original)
> +++ trunk/build.conf Tue Jun 18 16:17:52 2002
> @@ -108,6 +108,7 @@
> [libsvn_fs]
> type = lib
> path = subversion/libsvn_fs
> +sources = *.c bdb/*.c util/*.c
> install = fs-lib
> libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by "Glenn A. Thompson" <gt...@cdr.net>.
OK
Philip Martin wrote:
> "Glenn A. Thompson" <gt...@cdr.net> writes:
>
> > Yup!
> >
> > What to do ?
>
> mkdir from the command line as a temporary workaround.
>
> Long term, possibly fix build/gen_base.py to extract any subdir from
> sources, combine it with path and add it to the BUILD_DIRS output.
>
> > > > > [libsvn_fs]
> > > > > type = lib
> > > > > path = subversion/libsvn_fs
> > > > > +sources = *.c bdb/*.c util/*.c
> > > > > install = fs-lib
> > > > > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
> > >
> > > This is not enough for a VPATH build. The directories
> > > subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
> > > created.
>
> --
> Philip
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by "Glenn A. Thompson" <gt...@cdr.net>.
>
> But still trying to find that dang error text mismatch.
>
Ding!
we have a weiner
hmm the subversion-1 stuff caught me by surprise:-)
gat
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by "Glenn A. Thompson" <gt...@cdr.net>.
I'm compiling again!
But still trying to find that dang error text mismatch.
Is the bdb/ and util/ stuff preparing for more FSs?
If so should I just start trying to work under say sql/?
Don't want to presume:-)
Someone else may be working on a sql FS? If so please finish so I can quit :-)
Damn computers, where is my abacus.
gat
Greg Stein wrote:
> That sounds right. I'll work on a fix tonite (about to leave for a while).
>
> I think that I can take the 'sources' patterns, pass them through
> os.path.dirname(), and add those into the set of build directories.
>
> [ looks like I need to add them to self.target_dirs so that the right
> dependency generation occurs ]
>
> Cheers,
> -g
>
> On Tue, Jun 18, 2002 at 11:03:33PM +0100, Philip Martin wrote:
> >...
> > mkdir from the command line as a temporary workaround.
> >
> > Long term, possibly fix build/gen_base.py to extract any subdir from
> > sources, combine it with path and add it to the BUILD_DIRS output.
> >
> > > > > > [libsvn_fs]
> > > > > > type = lib
> > > > > > path = subversion/libsvn_fs
> > > > > > +sources = *.c bdb/*.c util/*.c
> > > > > > install = fs-lib
> > > > > > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
> > > >
> > > > This is not enough for a VPATH build. The directories
> > > > subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
> > > > created.
>
> --
> Greg Stein, http://www.lyra.org/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by Greg Stein <gs...@lyra.org>.
That sounds right. I'll work on a fix tonite (about to leave for a while).
I think that I can take the 'sources' patterns, pass them through
os.path.dirname(), and add those into the set of build directories.
[ looks like I need to add them to self.target_dirs so that the right
dependency generation occurs ]
Cheers,
-g
On Tue, Jun 18, 2002 at 11:03:33PM +0100, Philip Martin wrote:
>...
> mkdir from the command line as a temporary workaround.
>
> Long term, possibly fix build/gen_base.py to extract any subdir from
> sources, combine it with path and add it to the BUILD_DIRS output.
>
> > > > > [libsvn_fs]
> > > > > type = lib
> > > > > path = subversion/libsvn_fs
> > > > > +sources = *.c bdb/*.c util/*.c
> > > > > install = fs-lib
> > > > > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
> > >
> > > This is not enough for a VPATH build. The directories
> > > subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
> > > created.
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by Philip Martin <ph...@codematters.co.uk>.
"Glenn A. Thompson" <gt...@cdr.net> writes:
> Yup!
>
> What to do ?
mkdir from the command line as a temporary workaround.
Long term, possibly fix build/gen_base.py to extract any subdir from
sources, combine it with path and add it to the BUILD_DIRS output.
> > > > [libsvn_fs]
> > > > type = lib
> > > > path = subversion/libsvn_fs
> > > > +sources = *.c bdb/*.c util/*.c
> > > > install = fs-lib
> > > > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
> >
> > This is not enough for a VPATH build. The directories
> > subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
> > created.
--
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by "Glenn A. Thompson" <gt...@cdr.net>.
Yup!
What to do ?
gat
Philip Martin wrote:
> Greg Stein <gs...@lyra.org> writes:
>
> > > Modified: trunk/build.conf
> > > ==============================================================================
> > > --- trunk/build.conf (original)
> > > +++ trunk/build.conf Tue Jun 18 16:17:52 2002
> > > @@ -108,6 +108,7 @@
> > > [libsvn_fs]
> > > type = lib
> > > path = subversion/libsvn_fs
> > > +sources = *.c bdb/*.c util/*.c
> > > install = fs-lib
> > > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
>
> This is not enough for a VPATH build. The directories
> subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
> created.
>
> --
> Philip
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2274 - trunk
Posted by Philip Martin <ph...@codematters.co.uk>.
Greg Stein <gs...@lyra.org> writes:
> > Modified: trunk/build.conf
> > ==============================================================================
> > --- trunk/build.conf (original)
> > +++ trunk/build.conf Tue Jun 18 16:17:52 2002
> > @@ -108,6 +108,7 @@
> > [libsvn_fs]
> > type = lib
> > path = subversion/libsvn_fs
> > +sources = *.c bdb/*.c util/*.c
> > install = fs-lib
> > libs = libsvn_delta libsvn_subr $(SVN_APRUTIL_LIBS) $(SVN_DB_LIBS) $(SVN_APR_LIBS)
This is not enough for a VPATH build. The directories
subversion/libsvn_fs/bdb and subversion/libsvn_fs/util do not get
created.
--
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org