Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:33:10 -0700 (Mon, 06 Aug 2007)
Revision: 11629
Log message:
Automated merge of 11608:11628 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll
| Changes | Path(relative to omake-branches/jumbo/dll) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:34:23 -0700 (Mon, 06 Aug 2007)
Revision: 11631
Log message:
Automated merge of 11610:11630 from svn://svn.metaprl.org/omake-branches/jumbo/dll into all-features
| Changes | Path(relative to omake-branches/jumbo/all-features) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 11:35:23 -0700 (Mon, 06 Aug 2007)
Revision: 11632
Log message:
Updating the changelogs - hoisting will not be a part of the 0.9.8.5 release.
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +1 -2 | CHANGELOG.txt |
| +13 -11 | doc/html/changelog.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:36:07 -0700 (Mon, 06 Aug 2007)
Revision: 11634
Log message:
Automated merge of 11611:11631 from svn://svn.metaprl.org/omake-branches/jumbo/all-features into parse
| Changes | Path(relative to omake-branches/jumbo/parse) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:38:15 -0700 (Mon, 06 Aug 2007)
Revision: 11802
Log message:
Automated merge of 11595:11634 from svn://svn.metaprl.org/omake-branches/jumbo/parse into dll2
| Changes | Path(relative to omake-branches/jumbo/dll2) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
| +1 -1 | test/OMakefile |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:40:51 -0700 (Mon, 06 Aug 2007)
Revision: 11828
Log message:
Automated merge of 11596:11802 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into dll-syntax
| Changes | Path(relative to omake-branches/jumbo/dll-syntax) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
| +1 -1 | test/OMakefile |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:43:27 -0700 (Mon, 06 Aug 2007)
Revision: 11829
Log message:
Automated merge of 11597:11828 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-fuse
| Changes | Path(relative to omake-branches/jumbo/dll-fuse) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
| +1 -1 | test/OMakefile |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:46:05 -0700 (Mon, 06 Aug 2007)
Revision: 11830
Log message:
Automated merge of 11598:11829 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-odbc
| Changes | Path(relative to omake-branches/jumbo/dll-odbc) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
| +1 -1 | test/OMakefile |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 11:48:41 -0700 (Mon, 06 Aug 2007)
Revision: 11831
Log message:
Automated merge of 11599:11830 from svn://svn.metaprl.org/omake-branches/jumbo/dll-fuse into everything
| Changes | Path(relative to omake-branches/jumbo/everything) |
| Properties | . |
| +8 -5 | lib/build/OCaml.om |
| +1 -1 | test/OMakefile |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:33:54 -0700 (Mon, 06 Aug 2007)
Revision: 11832
Log message:
test/object/Test16 fails in dll2. Propagating forward.
| Changes | Path(relative to omake-branches/jumbo/keyword/test/object) |
| Added | Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:35:10 -0700 (Mon, 06 Aug 2007)
Revision: 11833
Log message:
Automated merge of 11615:11832 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11832, omake-branches/jumbo/keyword/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:37:08 -0700 (Mon, 06 Aug 2007)
Revision: 11834
Log message:
Automated merge of 11623:11833 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11833, omake-branches/jumbo/var2/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:38:21 -0700 (Mon, 06 Aug 2007)
Revision: 11835
Log message:
Automated merge of 11624:11834 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const
| Changes | Path(relative to omake-branches/jumbo/const) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11834, omake-branches/jumbo/var3/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:39:33 -0700 (Mon, 06 Aug 2007)
Revision: 11836
Log message:
Automated merge of 11625:11835 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto
| Changes | Path(relative to omake-branches/jumbo/auto) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11835, omake-branches/jumbo/var3/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:40:45 -0700 (Mon, 06 Aug 2007)
Revision: 11837
Log message:
Automated merge of 11627:11836 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int
| Changes | Path(relative to omake-branches/jumbo/int) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11836, omake-branches/jumbo/var3/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:45:22 -0700 (Mon, 06 Aug 2007)
Revision: 11838
Log message:
Automated merge of 11628:11837 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll
| Changes | Path(relative to omake-branches/jumbo/dll) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11837, omake-branches/jumbo/int/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:45:52 -0700 (Mon, 06 Aug 2007)
Revision: 11839
Log message:
Automated merge of 11630:11838 from svn://svn.metaprl.org/omake-branches/jumbo/dll into all-features
| Changes | Path(relative to omake-branches/jumbo/all-features) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11838, omake-branches/jumbo/dll/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:47:07 -0700 (Mon, 06 Aug 2007)
Revision: 11840
Log message:
Automated merge of 11631:11839 from svn://svn.metaprl.org/omake-branches/jumbo/all-features into parse (simple)
| Changes | Path(relative to omake-branches/jumbo/parse) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11839, omake-branches/jumbo/all-features/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:48:15 -0700 (Mon, 06 Aug 2007)
Revision: 11841
Log message:
Automated merge of 11634:11840 from svn://svn.metaprl.org/omake-branches/jumbo/parse into dll2 (simple)
| Changes | Path(relative to omake-branches/jumbo/dll2) |
| Properties | . |
| Copied | test/object/Test16 (from rev 11840, omake-branches/jumbo/parse/test/object/Test16) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:51:32 -0700 (Mon, 06 Aug 2007)
Revision: 11842
Log message:
Bah, I wrote Test16 incorrectly.
| Changes | Path(relative to omake-branches/jumbo/keyword/test/object) |
| +2 -1 | Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:52:00 -0700 (Mon, 06 Aug 2007)
Revision: 11843
Log message:
Automated merge of 11832:11842 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2 (simple)
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +2 -1 | test/object/Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:52:25 -0700 (Mon, 06 Aug 2007)
Revision: 11844
Log message:
Automated merge of 11833:11843 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3 (simple)
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +2 -1 | test/object/Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:52:52 -0700 (Mon, 06 Aug 2007)
Revision: 11845
Log message:
Automated merge of 11834:11844 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const (simple)
| Changes | Path(relative to omake-branches/jumbo/const) |
| Properties | . |
| +2 -1 | test/object/Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 12:53:18 -0700 (Mon, 06 Aug 2007)
Revision: 11846
Log message:
Automated merge of 11835:11845 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto (simple)
| Changes | Path(relative to omake-branches/jumbo/auto) |
| Properties | . |
| +2 -1 | test/object/Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 13:26:10 -0700 (Mon, 06 Aug 2007)
Revision: 11849
Log message:
In rev 11504, the hoist_path function was moved to some totally random place
(as far as I can tell). Move it back.
I realize the plan is that path hoisting is disabled in this release.
Probably the best way to do it is leave the hoisting code, but
shadow the Omake_env.add_path_exports function.
let add_path_exports venv_orig _ _ _ _ _ =
venv_orig
| Changes | Path(relative to omake-branches/0.9.8.x/src/env) |
| +12 -14 | omake_env.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:14:04 -0700 (Mon, 06 Aug 2007)
Revision: 11850
Log message:
The hoisting Aleksey added in revs 11448-11849 was not right--
the following expression doesn't make sense:
venv_export_venv venv_orig venv_src
This is because the two environments have different this.
venv_orig has the caller's "this", venv_src has the callee's "this".
The two objects are different, so the export makes no sense.
NOTE: disabled the path check, going back to the original policy
that hoisting overrides export. This is matter of policy, so I
think it is better to keep the code simple, and discuss it.
Also, changed the tests a little, so an exit code of 2
is a "note", not an "error".
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +17 -36 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +4 -1 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +4 -1 | test/object/Test14 |
| +4 -1 | test/object/Test15 |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:15:17 -0700 (Mon, 06 Aug 2007)
Revision: 11851
Log message:
Corrected Test16. Sequence.map should be identical to Sequence.foreach
(for now).
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| +2 -2 | lib/Pervasives.om |
| +1 -1 | test/object/Test16 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:37:35 -0700 (Mon, 06 Aug 2007)
Revision: 11852
Log message:
Hand merge revs 11613:11851.
Added a backwards-compatibility test object/Test17
for omitted => in foreach.
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:39:14 -0700 (Mon, 06 Aug 2007)
Revision: 11853
Log message:
Automated merge of 11842:11852 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2 (simple)
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +5 -4 | lib/Pervasives.om |
| +1 -1 | lib/build/C.om |
| +21 -42 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +1 -1 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11852, omake-branches/jumbo/keyword/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:41:32 -0700 (Mon, 06 Aug 2007)
Revision: 11854
Log message:
Added a "simple" merge script that omits
- rm -rf boot
- omake check
| Changes | Path(relative to omake-branches/jumbo) |
| Copied | merge-branch-simple (from rev 11600, omake-branches/jumbo/merge-branch) |
| +4 -4 | merge-branch-simple (from rev 11600, omake-branches/jumbo/merge-branch) |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:52:01 -0700 (Mon, 06 Aug 2007)
Revision: 11855
Log message:
Hand merge 11843:11854.
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +1 -1 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11854, omake-branches/jumbo/var2/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:52:25 -0700 (Mon, 06 Aug 2007)
Revision: 11856
Log message:
Save the revision numbers on failure.
| Changes | Path(relative to omake-branches/jumbo) |
| +1 -0 | merge-branch-simple |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:53:27 -0700 (Mon, 06 Aug 2007)
Revision: 11857
Log message:
Automated merge of 11844:11856 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const (simple)
| Changes | Path(relative to omake-branches/jumbo/const) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +1 -1 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11856, omake-branches/jumbo/var3/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:54:26 -0700 (Mon, 06 Aug 2007)
Revision: 11858
Log message:
Automated merge of 11845:11857 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto (simple)
| Changes | Path(relative to omake-branches/jumbo/auto) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +1 -1 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11857, omake-branches/jumbo/var3/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:55:21 -0700 (Mon, 06 Aug 2007)
Revision: 11859
Log message:
Automated merge of 11836:11858 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int (simple)
| Changes | Path(relative to omake-branches/jumbo/int) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +3 -2 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11858, omake-branches/jumbo/var3/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:56:18 -0700 (Mon, 06 Aug 2007)
Revision: 11860
Log message:
Automated merge of 11837:11859 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll (simple)
| Changes | Path(relative to omake-branches/jumbo/dll) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +3 -2 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11859, omake-branches/jumbo/int/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:57:15 -0700 (Mon, 06 Aug 2007)
Revision: 11861
Log message:
Automated merge of 11838:11860 from svn://svn.metaprl.org/omake-branches/jumbo/dll into all-features (simple)
| Changes | Path(relative to omake-branches/jumbo/all-features) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +3 -2 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11860, omake-branches/jumbo/dll/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:58:51 -0700 (Mon, 06 Aug 2007)
Revision: 11862
Log message:
Automated merge of 11839:11861 from svn://svn.metaprl.org/omake-branches/jumbo/all-features into parse (simple)
| Changes | Path(relative to omake-branches/jumbo/parse) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +3 -2 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11861, omake-branches/jumbo/all-features/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:59:45 -0700 (Mon, 06 Aug 2007)
Revision: 11863
Log message:
Automated merge of 11614:11862 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into syntax (simple)
| Changes | Path(relative to omake-branches/jumbo/syntax) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +5 -4 | lib/Pervasives.om |
| +1 -1 | lib/build/C.om |
| +21 -42 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| Copied | test/object/Test16 (from rev 11862, omake-branches/jumbo/keyword/test/object/Test16) |
| Copied | test/object/Test17 (from rev 11862, omake-branches/jumbo/keyword/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:02:13 -0700 (Mon, 06 Aug 2007)
Revision: 11864
Log message:
Automated merge of 11840:11863 from svn://svn.metaprl.org/omake-branches/jumbo/parse into dll2 (simple)
| Changes | Path(relative to omake-branches/jumbo/dll2) |
| Properties | . |
| +1 -2 | CHANGELOG.txt |
| +1 -1 | lib/build/C.om |
| +17 -38 | src/env/omake_env.ml |
| +1 -1 | src/env/omake_env.mli |
| +1 -1 | src/eval/omake_eval.ml |
| +19 -3 | test/OMakefile |
| +1 -1 | test/object/Test01/object.om |
| +1 -1 | test/object/Test03 |
| +1 -1 | test/object/Test04 |
| +4 -4 | test/object/Test05 |
| +1 -1 | test/object/Test06 |
| +1 -1 | test/object/Test07 |
| +5 -2 | test/object/Test08 |
| +3 -2 | test/object/Test10 |
| +1 -1 | test/object/Test11 |
| +5 -2 | test/object/Test14 |
| +5 -2 | test/object/Test15 |
| +3 -2 | test/object/Test16 |
| Copied | test/object/Test17 (from rev 11863, omake-branches/jumbo/parse/test/object/Test17) |
| +1 -1 | test/simple/Test8/run.osh |
| +2 -2 | test/targets/Test3/run.osh |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:36:57 -0700 (Mon, 06 Aug 2007)
Revision: 11865
Log message:
Fixed the dll tests.
| Changes | Path(relative to omake-branches/jumbo/dll2) |
| Properties | contrib/gtk/ |
| +1 -1 | contrib/gtk/OMakeroot |
| Added | contrib/gtk/gtk_types.c |
| +3 -8 | lib/build/C.om |
| Properties | test/dll/Test1/ |
| +7 -7 | test/dll/Test1/main.ml |
| Added | test/dll/Test1/run.osh |
| Properties | test/dll/Test1/run.osh |
| Properties | test/dll/Test2/ |
| +4 -4 | test/dll/Test2/test_post.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:38:36 -0700 (Mon, 06 Aug 2007)
Revision: 11866
Log message:
Automated merge of 11802:11865 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into dll-syntax (simple)
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:40:33 -0700 (Mon, 06 Aug 2007)
Revision: 11867
Log message:
Automated merge of 11828:11866 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-fuse (simple)
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:41:33 -0700 (Mon, 06 Aug 2007)
Revision: 11868
Log message:
Automated merge of 11829:11867 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-odbc (simple)
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 15:42:41 -0700 (Mon, 06 Aug 2007)
Revision: 11869
Log message:
Automated merge of 11830:11868 from svn://svn.metaprl.org/omake-branches/jumbo/dll-fuse into everything (simple)
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 15:50:13 -0700 (Mon, 06 Aug 2007)
Revision: 11870
Log message:
- Merging the r11630 of the merge-branch script into merge-branch-simple:
doc/html/{omake-,osh.,omake.}* are generated; all the other ones in
doc/html are not.
- Propagating the doc/html/changelog.html change from the 0.9.8.x
| Changes | Path(relative to omake-branches/jumbo) |
| +13 -11 | keyword/doc/html/changelog.html |
| +2 -2 | merge-branch-simple |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 15:51:53 -0700 (Mon, 06 Aug 2007)
Revision: 11871
Log message:
Do not print the "saved .omakedb" messages when --no--print-status is enabled
(e.g. in tests).
| Changes | Path(relative to omake-branches/0.9.8.x/src/exec) |
| +2 -1 | omake_exec_print.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:08:10 -0700 (Mon, 06 Aug 2007)
Revision: 11872
Log message:
Backported Sequence.sub from the dll-fuse branch.
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +2 -0 | lib/Pervasives.om |
| +71 -0 | src/builtin/omake_builtin_object.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:09:36 -0700 (Mon, 06 Aug 2007)
Revision: 11873
Log message:
Automated merge of 11851:11872 from svn://svn.metaprl.org/omake-branches/0.9.8.x into keyword (simple)
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +71 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:11:51 -0700 (Mon, 06 Aug 2007)
Revision: 11875
Log message:
Merge 11862:11874
| Changes | Path(relative to omake-branches/jumbo/syntax) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +72 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:12:45 -0700 (Mon, 06 Aug 2007)
Revision: 11876
Log message:
Automated merge of 11852:11875 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2 (simple)
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +71 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:16:37 -0700 (Mon, 06 Aug 2007)
Revision: 11877
Log message:
Updated the tests to avoid false positives on Windows.
| Changes | Path(relative to omake-branches/0.9.8.x/test) |
| +3 -2 | OMakefile |
| +9 -8 | exec/Test1/OMakefile |
| +12 -1 | shell/Test1/run.osh |
| Deleted | shell/Test1/stdout.expected |
| +0 -14 | simple/Test1/OMakeroot |
| Deleted | simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:17:39 -0700 (Mon, 06 Aug 2007)
Revision: 11878
Log message:
merge 11854:11876 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +72 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:18:10 -0700 (Mon, 06 Aug 2007)
Revision: 11879
Log message:
Automated merge of 11872:11878 from svn://svn.metaprl.org/omake-branches/0.9.8.x into keyword (simple)
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| Properties | . |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:18:36 -0700 (Mon, 06 Aug 2007)
Revision: 11880
Log message:
Automated merge of 11874:11879 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into syntax (simple)
| Changes | Path(relative to omake-branches/jumbo/syntax) |
| Properties | . |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:19:02 -0700 (Mon, 06 Aug 2007)
Revision: 11881
Log message:
Automated merge of 11875:11880 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2 (simple)
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:19:25 -0700 (Mon, 06 Aug 2007)
Revision: 11882
Log message:
Automated merge of 11876:11881 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3 (simple)
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:19:58 -0700 (Mon, 06 Aug 2007)
Revision: 11883
Log message:
Automated merge of 11856:11882 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into const (simple)
| Changes | Path(relative to omake-branches/jumbo/const) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +72 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:20:26 -0700 (Mon, 06 Aug 2007)
Revision: 11884
Log message:
Document the Sequence.sub backport.
| Changes | Path(relative to omake-branches/0.9.8.x/doc/html) |
| +4 -3 | changelog.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:20:33 -0700 (Mon, 06 Aug 2007)
Revision: 11885
Log message:
Automated merge of 11857:11883 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into auto (simple)
| Changes | Path(relative to omake-branches/jumbo/auto) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +72 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:23:16 -0700 (Mon, 06 Aug 2007)
Revision: 11886
Log message:
merge 11858:11885 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into int
| Changes | Path(relative to omake-branches/jumbo/int) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +75 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:24:43 -0700 (Mon, 06 Aug 2007)
Revision: 11887
Log message:
Automated merge of 11859:11886 from svn://svn.metaprl.org/omake-branches/jumbo/int into dll (simple)
| Changes | Path(relative to omake-branches/jumbo/dll) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +75 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:25:21 -0700 (Mon, 06 Aug 2007)
Revision: 11888
Log message:
Automated merge of 11860:11887 from svn://svn.metaprl.org/omake-branches/jumbo/dll into all-features (simple)
| Changes | Path(relative to omake-branches/jumbo/all-features) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +75 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:26:01 -0700 (Mon, 06 Aug 2007)
Revision: 11889
Log message:
Automated merge of 11861:11888 from svn://svn.metaprl.org/omake-branches/jumbo/all-features into parse (simple)
| Changes | Path(relative to omake-branches/jumbo/parse) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +75 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:28:53 -0700 (Mon, 06 Aug 2007)
Revision: 11890
Log message:
merge 11863:11889 from svn://svn.metaprl.org/omake-branches/jumbo/parse into dll2
| Changes | Path(relative to omake-branches/jumbo/dll2) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +81 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:32:07 -0700 (Mon, 06 Aug 2007)
Revision: 11891
Log message:
merge 11865:11890 from svn://svn.metaprl.org/omake-branches/jumbo/dll2 into dll-syntax
| Changes | Path(relative to omake-branches/jumbo/dll-syntax) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +82 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:34:37 -0700 (Mon, 06 Aug 2007)
Revision: 11892
Log message:
merge 11866:11891 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-fuse
| Changes | Path(relative to omake-branches/jumbo/dll-fuse) |
| Properties | . |
| +1 -1 | lib/Pervasives.om |
| +1 -1 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:35:26 -0700 (Mon, 06 Aug 2007)
Revision: 11893
Log message:
Automated merge of 11867:11892 from svn://svn.metaprl.org/omake-branches/jumbo/dll-syntax into dll-odbc (simple)
| Changes | Path(relative to omake-branches/jumbo/dll-odbc) |
| Properties | . |
| +2 -0 | lib/Pervasives.om |
| +82 -0 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 16:36:08 -0700 (Mon, 06 Aug 2007)
Revision: 11894
Log message:
Automated merge of 11868:11893 from svn://svn.metaprl.org/omake-branches/jumbo/dll-fuse into everything (simple)
| Changes | Path(relative to omake-branches/jumbo/everything) |
| Properties | . |
| +1 -1 | lib/Pervasives.om |
| +1 -1 | src/builtin/omake_builtin_object.ml |
| +2 -1 | src/exec/omake_exec_print.ml |
| +3 -2 | test/OMakefile |
| +9 -8 | test/exec/Test1/OMakefile |
| +12 -1 | test/shell/Test1/run.osh |
| Deleted | test/shell/Test1/stdout.expected |
| +0 -14 | test/simple/Test1/OMakeroot |
| Deleted | test/simple/Test1/a/ |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:44:04 -0700 (Mon, 06 Aug 2007)
Revision: 11896
Log message:
A simple script for resetting the .config in every branch.
| Changes | Path(relative to omake-branches/jumbo) |
| Added | fix-config |
| Properties | fix-config |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:46:19 -0700 (Mon, 06 Aug 2007)
Revision: 11897
Log message:
Automated merge of 11878:11896 from svn://svn.metaprl.org/omake-branches/0.9.8.x into keyword
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| Properties | . |
| +4 -3 | doc/html/changelog.html |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:49:43 -0700 (Mon, 06 Aug 2007)
Revision: 11898
Log message:
Fixed a syntax error (the test is currenty "supposed" to fail, but I made it
fail for the "right" reason).
| Changes | Path(relative to omake-branches/jumbo/keyword/test/object) |
| +1 -1 | Test17 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:52:05 -0700 (Mon, 06 Aug 2007)
Revision: 11899
Log message:
Hand-merge 11879:11898, making sure the doc/html/changelog.html changes are
fully propagated.
| Changes | Path(relative to omake-branches/jumbo/syntax) |
| Properties | . |
| +17 -14 | doc/html/changelog.html |
| +1 -1 | test/object/Test17 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 16:55:03 -0700 (Mon, 06 Aug 2007)
Revision: 11900
Log message:
Hand-merge 11880:11899, making sure the doc/html/changelog.html changes are
fully propagated.
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +17 -14 | doc/html/changelog.html |
| +1 -1 | test/object/Test17 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 17:14:38 -0700 (Mon, 06 Aug 2007)
Revision: 11902
Log message:
Branching for the 0.9.8.5 release.
This commit incorporates changes (hopefully all of them) that should NOT be
merged back to 0.9.8.x:
- Set the version number to 0.9.8.5-1
- Disabled path hoisting and updated the tests accordingly
- Removed the "this version is undergoing changes" warning.
| Changes | Path(relative to omake-branches/0.9.8.5) |
| Copied | . (from rev 11900, omake-branches/0.9.8.x) |
| +2 -2 | omake.spec |
| +1 -7 | src/build/omake_build.ml |
| +2 -3 | src/env/omake_env.ml |
| +0 -3 | test/object/Test08 |
| +1 -1 | test/object/Test09 |
| +1 -1 | test/object/Test13 |
| +1 -4 | test/object/Test14 |
| +1 -4 | test/object/Test15 |
| +1 -1 | version.txt |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 17:35:19 -0700 (Mon, 06 Aug 2007)
Revision: 11903
Log message:
Documentation / download page / etc updates in praparation for the 0.9.8.5
release. These changes SHOULD be merged back into the 0.9.8.x branch once we
are ready to announce the release.
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 17:37:41 -0700 (Mon, 06 Aug 2007)
Revision: 11904
Log message:
Do checkouts from the 0.9.8.5 brach (should NOT be merged)
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | make_checkout |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-07 09:09:06 -0700 (Tue, 07 Aug 2007)
Revision: 11905
Log message:
Fixed the problem with anonymous functions. I have no idea whether people
are using anonymous functions, but it seems best to support them.
Note: this should not propagate to the keyword branch, since it
already handles anonymous functions correctly.
| Changes | Path(relative to omake-branches/0.9.8.x/src) |
| +1 -3 | builtin/omake_builtin_fun.ml |
| +4 -0 | builtin/omake_builtin_object.ml |
| +7 -0 | env/omake_command_digest.ml |
| +47 -0 | eval/omake_eval.ml |
| +8 -0 | eval/omake_value.ml |
| +4 -2 | ir/omake_value_print.ml |
| +2 -0 | ir/omake_value_type.ml |
| +1 -0 | main/omake_shell.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-07 13:40:17 -0700 (Tue, 07 Aug 2007)
Revision: 11906
Log message:
Updating the "omake:branch-baserev" property from 11896 to 11905 in order to
skip the "do not propagate to keyword" rev. 11905 (anonymous functions
temporary fix).
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| Properties | . |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-07 13:42:53 -0700 (Tue, 07 Aug 2007)
Revision: 11907
Log message:
The src/ir/omake_value_type.ml file had one MAGICBEGIN, but two MAGICEND
markers and as a result, the value type was erroneously excluded from the
magic computation!
I realized this when Jason's change for anonymous function resulted in
segfaults...
| Changes | Path(relative to omake-branches/0.9.8.x/src/ir) |
| +1 -2 | omake_value_type.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-07 13:45:43 -0700 (Tue, 07 Aug 2007)
Revision: 11908
Log message:
- Merged the revs 11904:11907 from the 0.9.8.x branch (anonymous functions
fix).
- Updated the version to 0.9.8.5-2
This revision should NOT be merged into 0.9.8.x
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-07 13:47:35 -0700 (Tue, 07 Aug 2007)
Revision: 11909
Log message:
- Updated the download page (0.9.8.5-2 instead of 0.9.8.5-1)
- Regenerated the documentation.
This revision SHOULD be merged back into 0.9.8.x once we are ready to announce
0.9.8.5-2.
| Changes | Path(relative to omake-branches/0.9.8.5/doc) |
| +5 -5 | html/download.html |
| +2 -2 | html/omake-doc.html |
| +1 -1 | html/omake-references.html |
| +1 -1 | html/omake-toc.html |
| +1 -1 | info/omake-doc.info-1 |
| +1 -1 | info/omake-doc.info-10 |
| Change(bin) | ps/omake-doc.dvi |
| Change(bin) | ps/omake-doc.pdf |
| Change(bin) | ps/omake-doc.ps |
| +2 -2 | txt/omake-doc.txt |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-07 17:06:01 -0700 (Tue, 07 Aug 2007)
Revision: 11913
Log message:
Posting release 0.9.8.5-2 on the web page.
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-08 14:19:26 -0700 (Wed, 08 Aug 2007)
Revision: 11921
Log message:
For experimental curried-functions (should be inserted keyword -> curry -> var2).
| Changes | Path(relative to omake-branches/jumbo/curry) |
| Copied | . (from rev 11920, omake-branches/jumbo/keyword) |
| Properties | . (from rev 11920, omake-branches/jumbo/keyword) |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 14:56:52 -0700 (Wed, 08 Aug 2007)
Revision: 11923
Log message:
Automated merge of 11905:11922 from svn://svn.metaprl.org/omake-branches/0.9.8.x into keyword
| Changes | Path(relative to omake-branches/jumbo/keyword) |
| Properties | . |
| +1 -1 | CHANGELOG.txt |
| +1 -1 | doc/html/changelog.html |
| +16 -8 | doc/html/download.html |
| +3 -1 | doc/html/index.html |
| +2 -2 | doc/src/omake-doc.tex |
| +2 -2 | omake.aip |
| +1 -2 | src/ir/omake_value_type.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 15:02:46 -0700 (Wed, 08 Aug 2007)
Revision: 11925
Log message:
Automated merge of 11899:11924 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into var2
| Changes | Path(relative to omake-branches/jumbo/var2) |
| Properties | . |
| +1 -1 | CHANGELOG.txt |
| +1 -1 | doc/html/changelog.html |
| +16 -8 | doc/html/download.html |
| +3 -1 | doc/html/index.html |
| +2 -2 | doc/src/omake-doc.tex |
| +2 -2 | omake.aip |
| +1 -2 | src/ir/omake_value_type.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 15:03:09 -0700 (Wed, 08 Aug 2007)
Revision: 11926
Log message:
Automated merge of 11905:11924 from svn://svn.metaprl.org/omake-branches/jumbo/keyword into curry
| Changes | Path(relative to omake-branches/jumbo/curry) |
| Properties | . |
| +1 -1 | CHANGELOG.txt |
| +1 -1 | doc/html/changelog.html |
| +16 -8 | doc/html/download.html |
| +3 -1 | doc/html/index.html |
| +2 -2 | doc/src/omake-doc.tex |
| +2 -2 | omake.aip |
| +1 -2 | src/ir/omake_value_type.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 15:24:20 -0700 (Wed, 08 Aug 2007)
Revision: 11927
Log message:
var2 is now a descendant of curry.
| Changes | Path(relative to omake-branches/jumbo) |
| +2 -1 | DEPENDENCIES |
| Properties | var2/ |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 15:24:45 -0700 (Wed, 08 Aug 2007)
Revision: 11928
Log message:
Automated merge of 11881:11926 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
| +1 -1 | CHANGELOG.txt |
| +18 -15 | doc/html/changelog.html |
| +16 -8 | doc/html/download.html |
| +3 -1 | doc/html/index.html |
| +2 -2 | doc/src/omake-doc.tex |
| +2 -2 | omake.aip |
| +1 -1 | src/ir/omake_value_type.ml |
| +1 -1 | test/object/Test17 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-08 15:25:59 -0700 (Wed, 08 Aug 2007)
Revision: 11929
Log message:
Manually bumping the omake:branch-baserev property to avoid a conflict due to
"reparenting" of var2.
| Changes | Path(relative to omake-branches/jumbo/var3) |
| Properties | . |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-08 16:02:01 -0700 (Wed, 08 Aug 2007)
Revision: 11932
Log message:
This adds just the main evaluation of curried functions, where
application must be total.
Note, the way it is implemented now, the application must be
total for all nested curried functions. For example, suppose
you write,
curry.f(x) =
curry.g(y) =
add($x, $y)
# The following is a partial application, illegal
f(0)
We may wish to make this legal (pretty easy to do).
TODO: make it possible to _define_ curried functions.
TODO: augment "apply" to allow partial applications.
TODO: check that path exports in eval_apply_method_export_exp are working correctly.
| Changes | Path(relative to omake-branches/jumbo/curry/src) |
| +4 -0 | builtin/omake_builtin_object.ml |
| +11 -0 | env/omake_command_digest.ml |
| +36 -0 | env/omake_env.ml |
| +4 -0 | env/omake_env.mli |
| +66 -2 | eval/omake_eval.ml |
| +8 -0 | eval/omake_value.ml |
| +4 -0 | ir/omake_value_print.ml |
| +1 -0 | ir/omake_value_type.ml |
| +1 -0 | main/omake_shell.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-08 16:09:31 -0700 (Wed, 08 Aug 2007)
Revision: 11933
Log message:
Decided that export should be passed down from curried functions.
curry.MyCProgram() =
export
CFLAGS += -g
value $(CProgram)
Note this is in conflict with partial application(!) so we
may want to back it out.
If this were legal, we have to decide whether LDFLAGS would
get exported to the toplevel.
X = $(MyCProgram)
| Changes | Path(relative to omake-branches/jumbo/curry/src/eval) |
| +4 -3 | omake_eval.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 09:50:05 -0700 (Thu, 09 Aug 2007)
Revision: 11943
Log message:
Curried functions are defined with the "curry" qualifier.
curry.f() =
...
Added some tests.
| Changes | Path(relative to omake-branches/jumbo/curry) |
| +2 -1 | src/env/omake_command_digest.ml |
| +27 -11 | src/env/omake_ir_ast.ml |
| +2 -2 | src/env/omake_ir_semant.ml |
| +23 -13 | src/eval/omake_eval.ml |
| +3 -1 | src/ir/omake_ir.ml |
| +1 -1 | src/ir/omake_ir_free_vars.ml |
| +6 -2 | src/ir/omake_ir_print.ml |
| +1 -1 | src/ir/omake_ir_util.ml |
| +1 -0 | src/ir/omake_symbol.ml |
| Properties | test/curry/ |
| Added | test/curry/Test1 |
| Added | test/curry/Test2 |
| Added | test/curry/Test3 |
| Added | test/curry/Test4 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 11:17:33 -0700 (Thu, 09 Aug 2007)
Revision: 11944
Log message:
Added partial application.
add-c-suffix = $(apply $(addsuffix), .c)
Partial application can be used with both normal and
builtin functions. For builtin functions, however, we
trust the arity spec, and the arity is often incorrect!
apply allows application to too few args, as well as
application to too many args.
f(A = 1, x) =
g(B = 2, y) =
add($A, $B, $x, $y)
i = $(apply $f, B = 10, 20, 30)
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 12:10:04 -0700 (Thu, 09 Aug 2007)
Revision: 11945
Log message:
Changed Sequence.foreach to a curried function.
curry.foreach() =
private.THIS = $(this)
g(f) =
export
sequence-map($(f), $(THIS))
The curried functions are working fine. But see that plain
"export"? That means private values are not going to be
exported.
| Changes | Path(relative to omake-branches/jumbo/curry) |
| +6 -3 | lib/Pervasives.om |
| +1 -1 | src/env/omake_env.ml |
| +1 -1 | src/eval/omake_eval.ml |
| +9 -4 | test/object/Test14 |
| +4 -5 | test/object/Test15 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 12:46:00 -0700 (Thu, 09 Aug 2007)
Revision: 11946
Log message:
Fixed the old-style ocamldep-omake problem, and the OCamlPackage problem
(see message from Mike Furr, August 9, 2007, <46BB40C6.8070100@cs.umd.edu>).
| Changes | Path(relative to omake-branches/0.9.8.5/lib/build) |
| +17 -7 | OCaml.om |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 13:12:44 -0700 (Thu, 09 Aug 2007)
Revision: 11949
Log message:
Allow the export function to specify the variables to be exported.
(See Markus Mottl's email, August 19 2007, <f8560b80708090942h75910398x49212f30d7d3445b@mail.gmail.com>).
| Changes | Path(relative to omake-branches/0.9.8.5/src) |
| +16 -5 | builtin/omake_builtin_base.ml |
| +1 -1 | ir/omake_value_type.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 14:08:48 -0700 (Thu, 09 Aug 2007)
Revision: 11950
Log message:
Don't use % in the OCamlPackage scanner rule.
| Changes | Path(relative to omake-branches/0.9.8.5/lib/build) |
| +1 -1 | OCaml.om |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 14:14:56 -0700 (Thu, 09 Aug 2007)
Revision: 11951
Log message:
Update the whitespace. I have no idea why the indentation on line 295 looked
correct in emacs and omake was happy.
| Changes | Path(relative to omake-branches/0.9.8.5/lib/build) |
| +2 -3 | OCaml.om |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-09 15:57:35 -0700 (Thu, 09 Aug 2007)
Revision: 11952
Log message:
Pass packages only if using ocamlfind.
| Changes | Path(relative to omake-branches/0.9.8.5/lib/build) |
| +1 -1 | OCaml.om |
Changes by: Matthew Maurer (maurer at caltech.edu)
Date: 2007-08-09 17:36:26 -0700 (Thu, 09 Aug 2007)
Revision: 11954
Log message:
I've got channels, but they don't appear to work it appears to infinite loop on input_line, I don't know why, and am trying to figure this out.
| Changes | Path(relative to omake-research/omake-distrib) |
| +0 -0 | OMakefile |
| +1 -1 | src/Makefile |
| +2 -1 | src/magic/omake_gen_magic.ml |
| +53 -4 | src/shell/omake_shell_servers.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-10 11:07:05 -0700 (Fri, 10 Aug 2007)
Revision: 11955
Log message:
Ouch, a terrible typo in Omake_ir_semant meant that expressions
in a ValBody were not converted. We should probably turn on
strict free-variable checking.
X el ->
(* Oops, "e" is a typo, but OCaml doesn't report it *)
let z, e = f z el in
z, X el
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | lib/build/OCaml.om |
| +48 -20 | src/env/omake_ir_semant.ml |
| +5 -4 | src/env/omake_ir_semant.mli |
| +3 -3 | src/eval/omake_eval.ml |
| +1 -1 | src/eval/omake_eval.mli |
| +4 -4 | src/main/omake_shell.ml |
| Properties | test/return/ |
| Added | test/return/Test1 |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-10 13:10:27 -0700 (Fri, 10 Aug 2007)
Revision: 11956
Log message:
Updating the version number in preparation for 0.9.8.5-3
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | lib/build/OCaml.om |
| +1 -1 | version.txt |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-10 15:29:57 -0700 (Fri, 10 Aug 2007)
Revision: 11958
Log message:
omake.spec is generated, but needs to be committed too.
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | omake.spec |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-10 16:29:47 -0700 (Fri, 10 Aug 2007)
Revision: 11959
Log message:
Update the downloads page to 0.9.8.5-3. I won't announce on the web
page until we get it propagated to godi.
| Changes | Path(relative to omake-branches/0.9.8.5/doc/html) |
| +6 -6 | download.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 12:49:01 -0700 (Mon, 13 Aug 2007)
Revision: 11960
Log message:
Add some RPMS directly to the downloads page.
| Changes | Path(relative to omake-branches/0.9.8.5/doc/html) |
| +4 -0 | download.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 12:51:19 -0700 (Mon, 13 Aug 2007)
Revision: 11961
Log message:
Somehow, it isn't showing up.
| Changes | Path(relative to omake-branches/0.9.8.5/doc/html) |
| +4 -4 | download.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 12:57:11 -0700 (Mon, 13 Aug 2007)
Revision: 11962
Log message:
Still more minor formatting.
| Changes | Path(relative to omake-branches/0.9.8.5/doc/html) |
| +6 -3 | download.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 13:08:19 -0700 (Mon, 13 Aug 2007)
Revision: 11963
Log message:
svn merge -r 11946:11958 ../0.9.8.5
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +18 -9 | lib/build/OCaml.om |
| +1 -1 | omake.spec |
| +16 -5 | src/builtin/omake_builtin_base.ml |
| +48 -20 | src/env/omake_ir_semant.ml |
| +5 -4 | src/env/omake_ir_semant.mli |
| +3 -3 | src/eval/omake_eval.ml |
| +1 -1 | src/eval/omake_eval.mli |
| +1 -1 | src/ir/omake_value_type.ml |
| +4 -4 | src/main/omake_shell.ml |
| Copied | test/return/ (from rev 11958, omake-branches/0.9.8.5/test/return) |
| Properties | test/return/ (from rev 11958, omake-branches/0.9.8.5/test/return) |
| +1 -1 | version.txt |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 13:10:25 -0700 (Mon, 13 Aug 2007)
Revision: 11964
Log message:
svn merge -r 11959:11962 ../0.9.8.5
| Changes | Path(relative to omake-branches/0.9.8.x/doc/html) |
| +7 -0 | download.html |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-13 13:15:43 -0700 (Mon, 13 Aug 2007)
Revision: 11965
Log message:
Sigh, I guess I don't know whether svn merge takes a closed or
half-open interval.
| Changes | Path(relative to omake-branches/0.9.8.x/doc/html) |
| +6 -6 | download.html |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-15 23:10:41 -0700 (Wed, 15 Aug 2007)
Revision: 11966
Log message:
I've buit the "standard" set of 0.9.8.5-3 RPMs.
| Changes | Path(relative to omake-branches/0.9.8.x/doc/html) |
| +4 -9 | download.html |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 14:31:21 -0700 (Mon, 20 Aug 2007)
Revision: 11970
Log message:
Copied the latest changes off the 0.9.8.x branch.
| Changes | Path(relative to omake-branches/0.9.8.5/doc/html) |
| +4 -9 | download.html |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 14:32:43 -0700 (Mon, 20 Aug 2007)
Revision: 11971
Log message:
Regenerated the documentation.
| Changes | Path(relative to omake-branches/0.9.8.5/doc) |
| +2 -2 | html/omake-base.html |
| +4 -4 | html/omake-doc.html |
| +1 -1 | html/omake-references.html |
| +1 -1 | html/omake-toc.html |
| +476 -476 | info/omake-doc.info |
| +3 -3 | info/omake-doc.info-1 |
| +1 -1 | info/omake-doc.info-10 |
| +2 -2 | info/omake-doc.info-4 |
| Change(bin) | ps/omake-doc.dvi |
| Change(bin) | ps/omake-doc.pdf |
| Change(bin) | ps/omake-doc.ps |
| +6 -6 | txt/omake-doc.txt |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 14:33:33 -0700 (Mon, 20 Aug 2007)
Revision: 11972
Log message:
Merged the rev. 11971 (regenerated documentation) off the 0.9.8.5 branch.
| Changes | Path(relative to omake-branches/0.9.8.x/doc) |
| +1 -1 | html/download.html |
| +2 -2 | html/omake-base.html |
| +4 -4 | html/omake-doc.html |
| +1 -1 | html/omake-references.html |
| +1 -1 | html/omake-toc.html |
| +476 -476 | info/omake-doc.info |
| +3 -3 | info/omake-doc.info-1 |
| +1 -1 | info/omake-doc.info-10 |
| +2 -2 | info/omake-doc.info-4 |
| Change(bin) | ps/omake-doc.dvi |
| Change(bin) | ps/omake-doc.pdf |
| Change(bin) | ps/omake-doc.ps |
| +6 -6 | txt/omake-doc.txt |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 15:49:10 -0700 (Mon, 20 Aug 2007)
Revision: 11973
Log message:
Removing support for ocamldep-omake.
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +6 -24 | lib/build/OCaml.om |
| Deleted | ocamldep/ |
| +1 -3 | omake.aip |
| +1 -1 | omake.spec |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 15:49:58 -0700 (Mon, 20 Aug 2007)
Revision: 11974
Log message:
Forgot to remove ocamldep from one more place.
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | OMakefile |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 15:58:56 -0700 (Mon, 20 Aug 2007)
Revision: 11975
Log message:
Rev 11955 follow-up - changed the magic number for the IRs.
| Changes | Path(relative to omake-branches/0.9.8.5/src/ir) |
| +1 -1 | omake_ir.ml |
Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-20 16:08:35 -0700 (Mon, 20 Aug 2007)
Revision: 11976
Log message:
Gobble whitespace eagerly at <eol>, so, for example, trailing comments
work as expected.
X = abc # 123
equal($X, abc) # this is now true
Note, eol whitespace is still significant within strings.
See <46CA1340.1000609@hrl.com> on omake@metaprl.org,
and also test/simple/Test9.
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +16 -14 | src/env/omake_ast_lex.mll |
| Added | test/simple/Test9 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 16:22:57 -0700 (Mon, 20 Aug 2007)
Revision: 11977
Log message:
Extended the test slightly (still passes).
| Changes | Path(relative to omake-branches/0.9.8.x/test/simple) |
| +4 -0 | Test9 |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 16:24:20 -0700 (Mon, 20 Aug 2007)
Revision: 11978
Log message:
Merged revs 11975:11977 from the 0.9.8.x (Gobble whitespace eagerly at <eol>).
| Changes | Path(relative to omake-branches/0.9.8.5) |
| +1 -1 | omake.spec |
| +16 -14 | src/env/omake_ast_lex.mll |
| Copied | test/simple/Test9 (from rev 11977, omake-branches/0.9.8.x/test/simple/Test9) |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 16:26:26 -0700 (Mon, 20 Aug 2007)
Revision: 11979
Log message:
Merged the revs 11972:11975 off the omake-0.9.8.5 branch:
- ocamldep-omake removed
- changed the magic number for the IRs (following Jason's fix in
Omake_ir_semant).
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +1 -1 | OMakefile |
| +6 -24 | lib/build/OCaml.om |
| Deleted | ocamldep/ |
| +1 -3 | omake.aip |
| +1 -1 | omake.spec |
| +1 -1 | src/ir/omake_ir.ml |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-20 18:01:06 -0700 (Mon, 20 Aug 2007)
Revision: 11980
Log message:
Got rid of the OCAMLDEP_MODULES variable, using OCAMLDEP everywhere instead.
| Changes | Path(relative to omake-branches/0.9.8.5/lib/build) |
| +7 -17 | OCaml.om |
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-31 17:49:00 -0700 (Fri, 31 Aug 2007)
Revision: 12069
Log message:
Fixing documentation problems reported by Florian Hars.
Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-31 17:50:44 -0700 (Fri, 31 Aug 2007)
Revision: 12070
Log message:
Merged rev 11975:12069 from the 0.9.8.5 branch.
| Changes | Path(relative to omake-branches/0.9.8.x) |
| +1 -1 | doc/src/omake-build-examples.tex |
| +2 -2 | doc/src/omake-language-examples.tex |
| +4 -4 | doc/src/omake-language.tex |
| +2 -2 | doc/src/omake-rules.tex |
| +7 -17 | lib/build/OCaml.om |
| +1 -1 | omake.spec |
| +7 -4 | src/builtin/omake_builtin_base.ml |
| +2 -2 | src/builtin/omake_builtin_object.ml |