On Tue, Feb 18, 2014 at 02:09:51PM -0800, Garth N. Wells wrote: > > On 18 Feb 2014, at 13:56, Anders Logg <[email protected]> wrote: > > > On Tue, Feb 18, 2014 at 10:15:51PM +0100, Anders Logg wrote: > >> On Tue, Feb 18, 2014 at 09:57:02PM +0100, Anders Logg wrote: > >>> I'm about to start merging UFC into FFC (today or tomorrow, depending > >>> on how smooth the process is). > >>> > >>> Should this be pushed into next or master? I'm inclined to push this > >>> into master directly since the buildbots will need to be reconfigured > >>> anyway (I assume, to remove UFC). > >> > >> This seemed to go smooth. I have merged UFC into my local FFC/master > >> using this recipe: > >> > >> http://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another > >> > >> I still need to manually merge ChangeLog and other common files (but > >> history for both is intact), but if there are no strong objections, I > >> plan to push these changes to master for both UFC and FFC once things > >> are running smoothly here. > > > > Merge is mostly done now. The following issues remain: > > > > - Merging of contents under doc/. Is the UFC manual still relevant? > > How should it be merged with the FFC documentation? > > > > The FFC doc could have a chapter/section added on target backends, which for > now will be just UFC.
Sounds good. FFC has been merged into UFC now, but installation of UFC still needs be activated. I will look into that later today. For now, FFC + old UFC should work as before, but please don't commit anything to UFC. -- Anders > > - How do we handle licenses? UFC is public domain, but FFC is LGPL. > > Should we still keep UFC as public domain? My suggestion would be > > to keep ufc.h, ufc_geometry.h (and other UFC header files if we add > > them) as public domain, but make everything else (utils) LGPL. > > > > Agree. > > Garth > > > - Merging of setup.py. This is a technical issue and should be > > relatively straighforward. > > > > Feedback wanted on the first two issues. > > > _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
