Re: svn commit: rev 5156 - in trunk: . build

Philip Martin <philip@codematters.co.uk> writes:

> Matt Kraai <kraai@alumni.cmu.edu> writes:
>
> > > > How about this? Is it acceptable for gen_make to hard code
> > > > top_srcdir?
> > >
> > > We already do; there's always room for one more.
> >
> > Actually, this leaves the SWIG build outside the source dir
> > broken. Could you test the following instead?
>
> I got your message just after I'd committed 5163, an os.path.join
> variation of my original patch.

This variation of your patch applies on top of 5163 and "works for me"

Index: build/gen_base.py
===================================================================
--- build/gen_base.py (revision 5162)
+++ build/gen_base.py (working copy)
@@ -264,6 +264,7 @@
     self.lang_abbrev = lang_abbrev[lang]
     ### hmm. this is Makefile-specific
     self.build_cmd = '$(COMPILE_%s_WRAPPER)' % string.upper(self.lang_abbrev)
+ self.source_generated = 1
 
 # the SWIG utility libraries
 class SWIGUtilPython(ObjectFile):
Index: build/gen_make.py
===================================================================
--- build/gen_make.py (revision 5163)
+++ build/gen_make.py (working copy)
@@ -207,15 +207,19 @@
       deps = string.join(sources)
       self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) %s\n'
                        % (objname, deps, string.upper(objname.lang_abbrev),
- sources[0]))
+ os.path.join('$(top_srcdir)', sources[0])))
 
     for objname, sources in self.graph.get_deps(gen_base.DT_OBJECT):
       deps = string.join(sources)
       cmd = getattr(objname, 'build_cmd', '')
       if cmd:
- self.ofile.write('%s: %s\n\t%s %s\n' % (objname, deps, cmd,
- os.path.join('$(top_srcdir)',
- sources[0])))
+ if not getattr(objname, 'source_generated', 0):
+ self.ofile.write('%s: %s\n\t%s %s\n' % (objname, deps, cmd,
+ os.path.join('$(top_srcdir)',
+ sources[0])))
+ else:
+ self.ofile.write('%s: %s\n\t%s %s\n' % (objname, deps, cmd,
+ sources[0]))
       else:
         self.ofile.write('%s: %s\n' % (objname, deps))
 

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org