[Omake] SVN Commit: OMake Build System [0.9.8.x] (Rev. 11462)

Jason Hickey jyh at cs.caltech.edu
Fri Jul 27 15:29:26 PDT 2007


On Jul 26, 2007, at 9:16 PM, Aleksey Nogin wrote:

> I can do the merge myself, if you want (once you do the automated part
> of the merge and let me know which branch introduces your versions -
> 0.9.9.x, dll2, dll-fuse, dll-odbc, dll-syntax, and "everything"  
> have it).

I did the semi-automated part of the merge.  I had do do some hand  
edits on the Static module in Omake_env, and I'm not positive I got  
everything (I tend to get conflicts that say "this 200 lines is  
different from this other 200 lines" and it is hard to see what  
happened).

Also, I lost the test/object/Test0? tests, I'll have to figure out  
what to do about it.

The DynamicCLibrary is first defined in dll2, and that implementation  
should be complete.

    dll2
      dll-syntax
        dll-fuse
        dll-odbc
          dll-everything

> BTW, what's the "original" jumbo-branch - should it be deleted? It  
> seems
> to have some fairly old code.

Deleted.

Jason

--
Jason Hickey                  http://www.cs.caltech.edu/~jyh
Caltech Computer Science      Tel: 626-395-6568 FAX: 626-792-4257





More information about the OMake-Devel mailing list