[PD-dev] Re: zexyconf.h conflicts

Hans-Christoph Steiner hans at eds.org
Fri Oct 27 04:57:17 CEST 2006

On Oct 19, 2006, at 4:43 AM, IOhannes m zmoelnig wrote:

> Hans-Christoph Steiner wrote:
>> I am getting conflicts just my using your build stuff.  Could you  
>> remove zexyconf.h from CVS since its dynamically generated?   
>> Otherwise this will require manual intervention after automatic  
>> builds.
>> RCS file: /cvsroot/pure-data/externals/zexy/src/zexyconf.h,v
>> retrieving revision 1.3
>> retrieving revision 1.4
>> Merging differences between 1.3 and 1.4 into zexyconf.h
>> rcsmerge: warning: conflicts during merge
>> cvs update: conflicts found in zexy/src/zexyconf.h
>> C zexy/src/zexyconf.h
> i see. this is indeed a problem.
> the reason why zexyconf.h is checked in, is that you can also build  
> zexy with M$VC without running configure first: in this case nobody  
> will create the zexyconf.h file, which - imho - makes building  
> overcomplicated (i don't think it is an option to tell people to  
> copy zexyconf.h.in to zexyconf.h and edit to their needs).

That sounds good.  I think its far too much work to support every  
compiler under the sun.  I like gcc on all platforms.

> the issue here was, that incidentially a "generic" zexyconf.h has  
> been overwritten in the past by a generated file.
> i have to read the CVS manual, to see how to exclude checked in  
> files from being updated.
> another solution might be, to run "make distclean" before doing CVS  
> updates, which will remove the generated files.

That would be a workaround, rather than a fix.  Sounds likely to  
introduce more problems in the future.



If nature has made any one thing less susceptible than all others of  
exclusive property, it is the action of the thinking power called an  
idea, which an individual may exclusively possess as long as he keeps  
it to himself; but the moment it is divulged, it forces itself into  
the possession of everyone, and the receiver cannot dispossess  
himself of it.            - Thomas Jefferson

More information about the Pd-dev mailing list