[Omake] SVN Commit: OMake Build System (Rev. 12674)

Aleksey Nogin nogin at metaprl.org
Tue Jan 15 16:29:33 PST 2008


Merged 12563:12673 from
svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/jumbo/all-features
into dll2 - automated merge followed by some manual fixes.

P.S. Some of the tests on this branch fail with:

*** omake error:
   File /home/nogin/metaprl/omake-jumbo-branches/dll2/lib/parse/C/Dll.om: line 407, characters 8-34
   Variable declaration mismatch:
      variable
         protected.[parse/C/Dll.om]public/const/build-dll/unmarshal::ty
      is already defined as
         public.[parse/C/Dll.om]public/const/build-dll/unmarshal::ty
         File /home/nogin/metaprl/omake-jumbo-branches/dll2/lib/parse/C/Dll.om: line 405, characters 20-22

----
Changes in omake-branches/jumbo/dll2:
    Properties  .
    +2 -2       OMakefile
    Copied      bench/ (from rev 12673, omake-branches/jumbo/all-features/bench)
    Properties  bench/ (from rev 12673, omake-branches/jumbo/all-features/bench)
    +0 -0       bench/mandel/
    +9 -12      doc/OMakefile
    Copied      doc/html/c-parser.html (from rev 12673, omake-branches/jumbo/all-features/doc/html/c-parser.html)
    +91 -91     doc/html/c-parser.html (from rev 12673, omake-branches/jumbo/all-features/doc/html/c-parser.html)
    +690 -554   doc/html/omake-all-index.html
    +41 -41     doc/html/omake-autoconf.html
    +167 -141   doc/html/omake-base.html
    +34 -34     doc/html/omake-build-examples.html
    +187 -171   doc/html/omake-build.html
    +617 -463   doc/html/omake-contents.html
    +26 -26     doc/html/omake-detail.html
    Added       doc/html/omake-dll-gtk.html
    Properties  doc/html/omake-dll-gtk.html
    Added       doc/html/omake-dll.html
    Properties  doc/html/omake-dll.html
    +1 -1       doc/html/omake-doc.css
    +4088 -2275 doc/html/omake-doc.html
    +252 -236   doc/html/omake-fun-index.html
    +87 -43     doc/html/omake-grammar.html
    +32 -32     doc/html/omake-language-examples.html
    +142 -44    doc/html/omake-language-naming.html
    +147 -59    doc/html/omake-language.html
    +125 -26    doc/html/omake-obj-index.html
    +4 -4       doc/html/omake-option-index.html
    +49 -49     doc/html/omake-options.html
    +61 -63     doc/html/omake-pervasives.html
    +16 -16     doc/html/omake-quickstart.html
    +15 -14     doc/html/omake-references.html
    +72 -72     doc/html/omake-rules.html
    +34 -34     doc/html/omake-shell.html
    +222 -179   doc/html/omake-system.html
    +6 -6       doc/html/omake-target-index.html
    +35 -32     doc/html/omake-toc.html
    +108 -101   doc/html/omake-var-index.html
    +9 -5       doc/html/omake.html
    +15 -15     doc/html/osh.html
    +597 -476   doc/info/omake-doc.info
    +233 -223   doc/info/omake-doc.info-1
    +1785 -605  doc/info/omake-doc.info-10
    Added       doc/info/omake-doc.info-11
    Added       doc/info/omake-doc.info-12
    +550 -514   doc/info/omake-doc.info-2
    +465 -452   doc/info/omake-doc.info-3
    +536 -610   doc/info/omake-doc.info-4
    +593 -555   doc/info/omake-doc.info-5
    +606 -598   doc/info/omake-doc.info-6
    +706 -731   doc/info/omake-doc.info-7
    +851 -861   doc/info/omake-doc.info-8
    +1436 -1182 doc/info/omake-doc.info-9
    Change(bin) doc/ps/omake-doc.dvi
    Change(bin) doc/ps/omake-doc.pdf
    Change(bin) doc/ps/omake-doc.ps
    +2 -0       doc/src/omake-doc.tex
    +6665 -3976 doc/txt/omake-doc.txt
    +184 -154   lib/Pervasives.om
    +5 -5       lib/build/C.om
    +0 -1       lib/parse/LaTeX/Spell.om
    +1 -1       src/builtin/omake_builtin_base.ml
    +46 -60     src/clib/omake_shell_sys.c
    +3 -3       src/env/omake_exp_lex.ml
    +4 -1       src/env/omake_ir_ast.ml
    +2 -0       src/eval/omake_eval.ml
    +4 -1       src/ir/omake_ir.ml
    +1 -1       src/ir/omake_value_print.ml
    +1 -1       src/ir/omake_var.ml
    +14 -5      src/shell/omake_shell_sys_win32.ml
    +1 -1       test/memo/Test6/OMakeroot
    Copied      test/simple/Test10 (from rev 12673, omake-branches/jumbo/all-features/test/simple/Test10)
    Copied      test/targets/Test4/ (from rev 12673, omake-branches/jumbo/all-features/test/targets/Test4)
    Properties  test/targets/Test4/ (from rev 12673, omake-branches/jumbo/all-features/test/targets/Test4)
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2008-01.html#08/01/15.16:29:33



More information about the OMake-CVS mailing list