Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-04 16:46:25 -0800 (Tue, 04 Mar 2008)
Revision: 12758
Log message:

      Documentation fix: it should be "close($(stdout))", not "close(stdout)".

Changes  Path(relative to omake-branches/0.9.8.x/src/builtin)
+3 -3 omake_builtin_io_fun.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-04 17:07:25 -0800 (Tue, 04 Mar 2008)
Revision: 12759
Log message:

      (Bug #717) The built-in dependency scanner for OCaml should _not_ generate
     dependencies on .o/.obj files. All the inlined code is stored in .cmx, so the
     only dependency on .cmx exists.

Changes  Path(relative to omake-branches/0.9.8.x/lib/build)
+1 -3 OCaml.om

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 17:54:51 -0700 (Tue, 18 Mar 2008)
Revision: 12768
Log message:

      (Bug 702) DynamicCLibrary[Copy] - use the CDLL_IMPLIES_STATIC correctly.

Changes  Path(relative to omake-branches/0.9.8.x/lib/build)
+2 -2 C.om

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 18:16:58 -0700 (Tue, 18 Mar 2008)
Revision: 12769
Log message:

      - Switched the object-foreach to use the new-style foreach implementation.
     
     - (Bug 709) Made sure that documentation uses new-style syntax for foreach and
       $(fun ...) everywhere.

Changes  Path(relative to omake-branches/0.9.8.x)
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+15 -15 lib/Pervasives.om
+1 -1 src/builtin/omake_builtin_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 18:17:35 -0700 (Tue, 18 Mar 2008)
Revision: 12770
Log message:

      Regenerated the documentation.

Changes  Path(relative to omake-branches/0.9.8.x/doc)
+5 -5 html/omake-base.html
+29 -29 html/omake-doc.html
+1 -1 html/omake-grammar.html
+4 -4 html/omake-language-examples.html
+2 -2 html/omake-language.html
+12 -12 html/omake-pervasives.html
+1 -1 html/omake-references.html
+3 -3 html/omake-system.html
+1 -1 html/omake-toc.html
+433 -433 info/omake-doc.info
+3 -3 info/omake-doc.info-1
+1 -1 info/omake-doc.info-10
+2 -2 info/omake-doc.info-2
+4 -4 info/omake-doc.info-3
+5 -5 info/omake-doc.info-5
+3 -3 info/omake-doc.info-6
+12 -13 info/omake-doc.info-7
+1 -1 info/omake-doc.info-9
Change(bin) ps/omake-doc.dvi
Change(bin) ps/omake-doc.pdf
Change(bin) ps/omake-doc.ps
+31 -32 txt/omake-doc.txt

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 18:25:35 -0700 (Tue, 18 Mar 2008)
Revision: 12771
Log message:

      Automated merge of 12665:12770 from svn://svn.metaprl.org/omake-branches/0.9.8.x into array-args

Changes  Path(relative to omake-branches/jumbo/array-args)
Properties .
+0 -3 doc/OMakefile
+585 -554 doc/html/omake-all-index.html
+41 -41 doc/html/omake-autoconf.html
+150 -139 doc/html/omake-base.html
+34 -34 doc/html/omake-build-examples.html
+178 -169 doc/html/omake-build.html
+475 -463 doc/html/omake-contents.html
+26 -26 doc/html/omake-detail.html
+1 -1 doc/html/omake-doc.css
+2424 -2170 doc/html/omake-doc.html
+160 -147 doc/html/omake-fun-index.html
+88 -44 doc/html/omake-grammar.html
+35 -35 doc/html/omake-language-examples.html
+39 -31 doc/html/omake-language-naming.html
+121 -55 doc/html/omake-language.html
+27 -26 doc/html/omake-obj-index.html
+4 -4 doc/html/omake-option-index.html
+49 -49 doc/html/omake-options.html
+71 -70 doc/html/omake-pervasives.html
+16 -16 doc/html/omake-quickstart.html
+14 -13 doc/html/omake-references.html
+72 -72 doc/html/omake-rules.html
+34 -34 doc/html/omake-shell.html
+225 -182 doc/html/omake-system.html
+6 -6 doc/html/omake-target-index.html
+31 -31 doc/html/omake-toc.html
+106 -101 doc/html/omake-var-index.html
+4 -4 doc/html/omake.html
+15 -15 doc/html/osh.html
+483 -475 doc/info/omake-doc.info
+223 -220 doc/info/omake-doc.info-1
+512 -494 doc/info/omake-doc.info-10
+407 -404 doc/info/omake-doc.info-2
+340 -311 doc/info/omake-doc.info-3
+377 -404 doc/info/omake-doc.info-4
+392 -370 doc/info/omake-doc.info-5
+397 -407 doc/info/omake-doc.info-6
+559 -577 doc/info/omake-doc.info-7
+499 -511 doc/info/omake-doc.info-8
+1128 -703 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+4321 -3952 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+2 -4 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -36 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12770, omake-branches/0.9.8.x/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12770, omake-branches/0.9.8.x/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 18:29:02 -0700 (Tue, 18 Mar 2008)
Revision: 12772
Log message:

      Automated merge of 12666:12771 from svn://svn.metaprl.org/omake-branches/0.9.8.x into var2

Changes  Path(relative to omake-branches/jumbo/var2)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+433 -433 doc/info/omake-doc.info
+3 -3 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+2 -4 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -36 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12771, omake-branches/0.9.8.x/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12771, omake-branches/0.9.8.x/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 19:09:47 -0700 (Tue, 18 Mar 2008)
Revision: 12773
Log message:

      Merged 12667:12772 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into
     var3 - automated merge with a bit of conflict resolution.

Changes  Path(relative to omake-branches/jumbo/var3)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+487 -487 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -37 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12772, omake-branches/jumbo/var2/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12772, omake-branches/jumbo/var2/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 19:13:37 -0700 (Tue, 18 Mar 2008)
Revision: 12774
Log message:

      Automated merge of 12668:12773 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const

Changes  Path(relative to omake-branches/jumbo/const)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+488 -488 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -37 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12773, omake-branches/jumbo/var3/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12773, omake-branches/jumbo/var3/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-18 19:16:52 -0700 (Tue, 18 Mar 2008)
Revision: 12775
Log message:

      Automated merge of 12669:12774 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto

Changes  Path(relative to omake-branches/jumbo/auto)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+488 -488 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -37 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12774, omake-branches/jumbo/var3/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12774, omake-branches/jumbo/var3/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 10:05:44 -0700 (Wed, 19 Mar 2008)
Revision: 12776
Log message:

      Merged 12670:12775 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into
     int - automated merge with a bit of a manual conflict resolution.

Changes  Path(relative to omake-branches/jumbo/int)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+488 -488 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -40 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12775, omake-branches/jumbo/var3/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12775, omake-branches/jumbo/var3/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 10:10:04 -0700 (Wed, 19 Mar 2008)
Revision: 12777
Log message:

      Automated merge of 12671:12776 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll

Changes  Path(relative to omake-branches/jumbo/dll)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+488 -488 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -40 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12776, omake-branches/jumbo/int/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12776, omake-branches/jumbo/int/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 10:24:51 -0700 (Wed, 19 Mar 2008)
Revision: 12778
Log message:

      Added omake-option-index.html to the list of generated files.

Changes  Path(relative to omake-branches/0.9.8.x/doc)
+1 -0 OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 10:49:47 -0700 (Wed, 19 Mar 2008)
Revision: 12779
Log message:

      Adding some debugging code for -debug_cache (which used to be completely
     ignored).

Changes  Path(relative to omake-branches/jumbo/all-features/src/ir)
+22 -9 omake_cache.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:04:01 -0700 (Wed, 19 Mar 2008)
Revision: 12780
Log message:

      Follow-up bugfix for rev. 12690 - when a rule failed to create its effect, the
     error could have been reported against the wrong target.

Changes  Path(relative to omake-branches/0.9.8.x/src/build)
+1 -1 omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:05:43 -0700 (Wed, 19 Mar 2008)
Revision: 12781
Log message:

      Automated merge of 12770:12780 from svn://svn.metaprl.org/omake-branches/0.9.8.x into array-args

Changes  Path(relative to omake-branches/jumbo/array-args)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:06:47 -0700 (Wed, 19 Mar 2008)
Revision: 12782
Log message:

      Automated merge of 12771:12781 from svn://svn.metaprl.org/omake-branches/0.9.8.x into var2

Changes  Path(relative to omake-branches/jumbo/var2)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:07:50 -0700 (Wed, 19 Mar 2008)
Revision: 12783
Log message:

      Automated merge of 12772:12782 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3

Changes  Path(relative to omake-branches/jumbo/var3)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:08:50 -0700 (Wed, 19 Mar 2008)
Revision: 12784
Log message:

      Automated merge of 12773:12783 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const

Changes  Path(relative to omake-branches/jumbo/const)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:09:44 -0700 (Wed, 19 Mar 2008)
Revision: 12785
Log message:

      Automated merge of 12774:12784 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto

Changes  Path(relative to omake-branches/jumbo/auto)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:10:37 -0700 (Wed, 19 Mar 2008)
Revision: 12786
Log message:

      Automated merge of 12775:12785 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int

Changes  Path(relative to omake-branches/jumbo/int)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:11:32 -0700 (Wed, 19 Mar 2008)
Revision: 12787
Log message:

      Automated merge of 12776:12786 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll

Changes  Path(relative to omake-branches/jumbo/dll)
Properties .
+1 -0 doc/OMakefile
+1 -1 src/build/omake_build.ml

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:29:58 -0700 (Wed, 19 Mar 2008)
Revision: 12788
Log message:

      Oops, had a typo!

Changes  Path(relative to omake-branches/0.9.8.x/doc)
+1 -1 OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:49:43 -0700 (Wed, 19 Mar 2008)
Revision: 12789
Log message:

      - Merged 12672:12787 from svn://svn.metaprl.org/omake-branches/jumbo/const
       into all-features - automated merge with some manual conflict resolution.
     
     - Changed how the "C Parsers" section was incorporated into the documentation
       (there was a poblem where it was trying to put it both into
       omake-parsers.html as a chapter and c-parser.html as a section!)

Changes  Path(relative to omake-branches/jumbo/all-features)
Properties .
+4 -4 doc/OMakefile
+3 -1 doc/html/c-parser.html
+5 -5 doc/html/omake-base.html
+33 -32 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+589 -589 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+1 -1 doc/info/omake-doc.info-11
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -2 doc/info/omake-doc.info-8
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+1 -2 doc/src/omake-doc.tex
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
Deleted doc/src/omake-parsers.tex
+32 -32 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+5 -0 lib/parse/C/Parse.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12787, omake-branches/jumbo/const/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12787, omake-branches/jumbo/const/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:50:47 -0700 (Wed, 19 Mar 2008)
Revision: 12790
Log message:

      Automated merge of 12780:12789 from svn://svn.metaprl.org/omake-branches/0.9.8.x into array-args

Changes  Path(relative to omake-branches/jumbo/array-args)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:51:40 -0700 (Wed, 19 Mar 2008)
Revision: 12791
Log message:

      Automated merge of 12781:12790 from svn://svn.metaprl.org/omake-branches/0.9.8.x into var2

Changes  Path(relative to omake-branches/jumbo/var2)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:52:32 -0700 (Wed, 19 Mar 2008)
Revision: 12792
Log message:

      Automated merge of 12782:12791 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3

Changes  Path(relative to omake-branches/jumbo/var3)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:53:26 -0700 (Wed, 19 Mar 2008)
Revision: 12793
Log message:

      Automated merge of 12783:12792 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const

Changes  Path(relative to omake-branches/jumbo/const)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:54:17 -0700 (Wed, 19 Mar 2008)
Revision: 12794
Log message:

      Automated merge of 12784:12793 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto

Changes  Path(relative to omake-branches/jumbo/auto)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:55:12 -0700 (Wed, 19 Mar 2008)
Revision: 12795
Log message:

      Automated merge of 12785:12794 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int

Changes  Path(relative to omake-branches/jumbo/int)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 11:56:06 -0700 (Wed, 19 Mar 2008)
Revision: 12796
Log message:

      Automated merge of 12786:12795 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll

Changes  Path(relative to omake-branches/jumbo/dll)
Properties .
+1 -1 doc/OMakefile

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 13:11:06 -0700 (Wed, 19 Mar 2008)
Revision: 12797
Log message:

      The doc/html changes do not need to be propagated.

Changes  Path(relative to omake-branches/jumbo)
+1 -3 merge-branch

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 13:14:23 -0700 (Wed, 19 Mar 2008)
Revision: 12798
Log message:

      Actually, instead of reverting the changes to generated files, we should rader
     mark all them as resolved. This way the conflicts are still avoided, but
     adds/deletes are fully propagated.

Changes  Path(relative to omake-branches/jumbo)
+1 -1 merge-branch

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 13:28:12 -0700 (Wed, 19 Mar 2008)
Revision: 12799
Log message:

      Merged 12673:12796 from
     svn://svn.metaprl.org/omake-branches/jumbo/all-features into dll2 - automated
     merge with a little conflict resolution.

Changes  Path(relative to omake-branches/jumbo/dll2)
Properties .
+4 -6 doc/OMakefile
+3 -1 doc/html/c-parser.html
+5 -5 doc/html/omake-base.html
+33 -32 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+546 -546 doc/info/omake-doc.info
+3 -3 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+1 -1 doc/info/omake-doc.info-12
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -2 doc/info/omake-doc.info-8
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+1 -2 doc/src/omake-doc.tex
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
Deleted doc/src/omake-parsers.tex
+32 -32 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+5 -0 lib/parse/C/Parse.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+22 -9 src/ir/omake_cache.ml
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12796, omake-branches/jumbo/all-features/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12796, omake-branches/jumbo/all-features/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 14:02:46 -0700 (Wed, 19 Mar 2008)
Revision: 12800
Log message:

      Merged 12674:12799 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into
     dll-fuse - automated merge with manual conflict resolution.

Changes  Path(relative to omake-branches/jumbo/dll-fuse)
Properties .
+4 -6 doc/OMakefile
+3 -1 doc/html/c-parser.html
+5 -5 doc/html/omake-base.html
+33 -32 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+595 -595 doc/info/omake-doc.info
+3 -3 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-11
+1 -1 doc/info/omake-doc.info-12
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -15 doc/info/omake-doc.info-6
+24 -13 doc/info/omake-doc.info-7
+1 -2 doc/info/omake-doc.info-8
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+1 -2 doc/src/omake-doc.tex
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
Deleted doc/src/omake-parsers.tex
+33 -33 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+5 -0 lib/parse/C/Parse.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+22 -9 src/ir/omake_cache.ml
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12799, omake-branches/jumbo/dll2/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12799, omake-branches/jumbo/dll2/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 16:10:37 -0700 (Wed, 19 Mar 2008)
Revision: 12801
Log message:

      Merged 12675:12800 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into
     dll-odbc - automated + conflict resolution.

Changes  Path(relative to omake-branches/jumbo/dll-odbc)
Properties .
+4 -4 doc/OMakefile
+3 -1 doc/html/c-parser.html
+5 -5 doc/html/omake-base.html
+33 -32 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+604 -604 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-11
+1 -1 doc/info/omake-doc.info-12
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -2 doc/info/omake-doc.info-8
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+1 -2 doc/src/omake-doc.tex
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
Deleted doc/src/omake-parsers.tex
+32 -32 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+5 -0 lib/parse/C/Parse.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+22 -9 src/ir/omake_cache.ml
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12800, omake-branches/jumbo/dll2/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12800, omake-branches/jumbo/dll2/test/targets/Test5)

Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 16:19:15 -0700 (Wed, 19 Mar 2008)
Revision: 12802
Log message:

      Merged 12680:12801 from svn://svn.metaprl.org/omake-branches/jumbo/dll-fuse into everything

Changes  Path(relative to omake-branches/jumbo/everything)
Properties .
+4 -4 doc/OMakefile
+97 -91 doc/html/c-parser.html
+96 -96 doc/html/omake-all-index.html
+5 -5 doc/html/omake-base.html
+98 -98 doc/html/omake-contents.html
+37 -32 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+96 -96 doc/html/omake-obj-index.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+2 -2 doc/html/omake-toc.html
+1 -1 doc/html/omake.html
+1 -1 doc/html/whats-new.html
+618 -618 doc/info/omake-doc.info
+3 -3 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-11
+1 -1 doc/info/omake-doc.info-13
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+2 -2 doc/info/omake-doc.info-8
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+1 -2 doc/src/omake-doc.tex
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
Deleted doc/src/omake-parsers.tex
+32 -32 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+5 -0 lib/parse/C/Parse.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+22 -9 src/ir/omake_cache.ml
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12801, omake-branches/jumbo/dll-fuse/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12801, omake-branches/jumbo/dll-fuse/test/targets/Test5)

Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2008-03-31 16:35:42 -0700 (Mon, 31 Mar 2008)
Revision: 12812
Log message:

      Scoping errors.

Changes  Path(relative to omake-branches/jumbo/dll-fuse)
+1 -1 contrib/fuse/OMakefile
+2 -2 contrib/fuse/OMakeroot
+3 -3 lib/build/C.om
+4 -4 lib/parse/C/Dll.om
+0 -5 lib/parse/C/Parse.om