Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2005-09-11 10:20:18 -0700 (Sun, 11 Sep 2005)
Revision: 1500
Log message:

      Latest merge against the trunk.
      

Changes	Path
+9 -0	libmojave-branches/omake_0_9_7_pre7/cutil/lm_unix_cutil.c
+12 -0	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_filename_util.ml
+7 -3	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_filename_util.mli
+9 -1	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_list_util.ml
+18 -17	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_list_util.mli
+29 -5	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_map.ml
+1 -0	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_map_sig.ml
+2 -0	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_set.ml
+5 -3	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_string_util.ml
+7 -7	libmojave-branches/omake_0_9_7_pre7/stdlib/lm_thread_sig.ml
+1 -0	libmojave-branches/omake_0_9_7_pre7/unix/lm_unix_util.ml
+4 -0	libmojave-branches/omake_0_9_7_pre7/unix/lm_unix_util.mli
+8 -1	libmojave-branches/omake_0_9_7_pre7/util/lm_channel.ml
+2 -0	libmojave-branches/omake_0_9_7_pre7/util/lm_channel.mli
+32 -8	libmojave-branches/omake_0_9_7_pre7/util/lm_db.ml
+3 -3	libmojave-branches/omake_0_9_7_pre7/util/lm_db.mli
+1188 -28	libmojave-branches/omake_0_9_7_pre7/util/lm_hash.ml
+96 -19	libmojave-branches/omake_0_9_7_pre7/util/lm_hash.mli
+18 -3	libmojave-branches/omake_0_9_7_pre7/util/lm_lexer.ml
+93 -84	libmojave-branches/omake_0_9_7_pre7/util/lm_parser.ml
+1 -0	libmojave-branches/omake_0_9_7_pre7/util/lm_parser.mli
+2 -0	libmojave-branches/omake_0_9_7_pre7/util/lm_position.ml
+87 -73	libmojave-branches/omake_0_9_7_pre7/util/lm_symbol.ml
+8 -0	libmojave-branches/omake_0_9_7_pre7/util/lm_symbol.mli
Properties	omake/contrib/gtk
Added	omake/contrib/gtk/.cvsignore
Properties	omake/contrib/gtk/.cvsignore
Added	omake/contrib/gtk/OMakefile
Properties	omake/contrib/gtk/OMakefile
Added	omake/contrib/gtk/dll.h
Properties	omake/contrib/gtk/dll.h
Added	omake/contrib/gtk/dll_lib.c
Properties	omake/contrib/gtk/dll_lib.c
Added	omake/contrib/gtk/dll_post.ml
Properties	omake/contrib/gtk/dll_post.ml
Added	omake/contrib/gtk/dll_post.om
Properties	omake/contrib/gtk/dll_post.om
Added	omake/contrib/gtk/dll_types.c
Properties	omake/contrib/gtk/dll_types.c
Added	omake/contrib/gtk/enums.export
Properties	omake/contrib/gtk/enums.export
Added	omake/contrib/gtk/structs.export
Properties	omake/contrib/gtk/structs.export
Added	omake/contrib/gtk/test.ml
Properties	omake/contrib/gtk/test.ml
Added	omake/contrib/gtk/test.om
Properties	omake/contrib/gtk/test.om
Added	omake/contrib/gtk/unions.export
Properties	omake/contrib/gtk/unions.export
Added	omake/contrib/gtk/values.export
Properties	omake/contrib/gtk/values.export
Added	omake/lib/configure/gtk.om
Properties	omake/lib/configure/gtk.om
Properties	omake/lib/parse
Added	omake/lib/parse/.cvsignore
Properties	omake/lib/parse/.cvsignore
Properties	omake/lib/parse/C
Added	omake/lib/parse/C/.cvsignore
Properties	omake/lib/parse/C/.cvsignore
Added	omake/lib/parse/C/Dll.om
Properties	omake/lib/parse/C/Dll.om
Added	omake/lib/parse/C/Lex.om
Properties	omake/lib/parse/C/Lex.om
Added	omake/lib/parse/C/Parse.om
Properties	omake/lib/parse/C/Parse.om
Added	omake/src/build/omake_builtin_dll.ml
Properties	omake/src/build/omake_builtin_dll.ml
Added	omake/src/build/omake_builtin_dll.mli
Properties	omake/src/build/omake_builtin_dll.mli
Added	omake/src/clib/lm_dll.c
Properties	omake/src/clib/lm_dll.c
Added	omake/src/clib/lm_dll.h
Properties	omake/src/clib/lm_dll.h
Added	omake/src/clib/lm_dll_hooks.h
Properties	omake/src/clib/lm_dll_hooks.h
Added	omake/src/libmojave/lm_dll.ml
Properties	omake/src/libmojave/lm_dll.ml
Properties	omake/tests/dll/gtk
Added	omake/tests/dll/gtk/.cvsignore
Properties	omake/tests/dll/gtk/.cvsignore
Added	omake/tests/dll/gtk/Test.om
Properties	omake/tests/dll/gtk/Test.om
Added	omake/tests/dll/gtk/dll.c
Properties	omake/tests/dll/gtk/dll.c
Added	omake/tests/dll/gtk/dll.h
Properties	omake/tests/dll/gtk/dll.h
Added	omake/tests/dll/gtk/enums.export
Properties	omake/tests/dll/gtk/enums.export
Added	omake/tests/dll/gtk/lib.c
Properties	omake/tests/dll/gtk/lib.c
Added	omake/tests/dll/gtk/structs.export
Properties	omake/tests/dll/gtk/structs.export
Added	omake/tests/dll/gtk/values.export
Properties	omake/tests/dll/gtk/values.export
Properties	omake/tests/dll/simple
Added	omake/tests/dll/simple/.cvsignore
Properties	omake/tests/dll/simple/.cvsignore
Added	omake/tests/dll/simple/Test.om
Properties	omake/tests/dll/simple/Test.om
Added	omake/tests/dll/simple/dll.c
Properties	omake/tests/dll/simple/dll.c
Added	omake/tests/dll/simple/dll.h
Properties	omake/tests/dll/simple/dll.h
Added	omake/tests/dll/simple/enums.export
Properties	omake/tests/dll/simple/enums.export
Added	omake/tests/dll/simple/lib.c
Properties	omake/tests/dll/simple/lib.c
Added	omake/tests/dll/simple/structs.export
Properties	omake/tests/dll/simple/structs.export
Added	omake/tests/dll/simple/values.export
Properties	omake/tests/dll/simple/values.export
Properties	omake-branches/omake_0_9_7_pre7
+1 -0	omake-branches/omake_0_9_7_pre7/.cvsignore
+3 -3	omake-branches/omake_0_9_7_pre7/Makefile
+45 -45	omake-branches/omake_0_9_7_pre7/OMakefile
+8 -8	omake-branches/omake_0_9_7_pre7/OMakeroot
+159 -150	omake-branches/omake_0_9_7_pre7/doc/OMakefile
+285 -94	omake-branches/omake_0_9_7_pre7/doc/html/omake-pervasives.html
+86 -154	omake-branches/omake_0_9_7_pre7/doc/html/omake-root.html
+150 -160	omake-branches/omake_0_9_7_pre7/doc/html/omake-system.html
+219 -40	omake-branches/omake_0_9_7_pre7/doc/man/omake-pervasives.1
+209 -108	omake-branches/omake_0_9_7_pre7/doc/man/omake-pervasives.txt
+18 -29	omake-branches/omake_0_9_7_pre7/doc/man/omake-system.1
+10 -11	omake-branches/omake_0_9_7_pre7/doc/man/omake-system.txt
+2 -2	omake-branches/omake_0_9_7_pre7/lib/OMakeroot.om
+1333 -978	omake-branches/omake_0_9_7_pre7/lib/Pervasives.om
+5 -2	omake-branches/omake_0_9_7_pre7/lib/boot/Default
+1 -1	omake-branches/omake_0_9_7_pre7/lib/boot/License
+399 -361	omake-branches/omake_0_9_7_pre7/lib/build/C.om
+1 -149	omake-branches/omake_0_9_7_pre7/lib/build/Common.om
+242 -235	omake-branches/omake_0_9_7_pre7/lib/build/LaTeX.om
+516 -520	omake-branches/omake_0_9_7_pre7/lib/build/OCaml.om
+17 -15	omake-branches/omake_0_9_7_pre7/lib/configure/Configure.om
+2 -1	omake-branches/omake_0_9_7_pre7/lib/configure/fam.om
+2 -1	omake-branches/omake_0_9_7_pre7/lib/configure/ncurses.om
+3 -2	omake-branches/omake_0_9_7_pre7/lib/configure/readline.om
+96 -57	omake-branches/omake_0_9_7_pre7/mk/defaults
+57 -62	omake-branches/omake_0_9_7_pre7/mk/make_config
+73 -71	omake-branches/omake_0_9_7_pre7/mk/make_gen
+19 -9	omake-branches/omake_0_9_7_pre7/src/Makefile
+19 -9	omake-branches/omake_0_9_7_pre7/src/Makefile.nt
+1 -1	omake-branches/omake_0_9_7_pre7/src/OMakefile
+5 -1	omake-branches/omake_0_9_7_pre7/src/ast/OMakefile
+11 -4	omake-branches/omake_0_9_7_pre7/src/ast/omake_ast.ml
+65 -36	omake-branches/omake_0_9_7_pre7/src/ast/omake_ast_print.ml
+12 -12	omake-branches/omake_0_9_7_pre7/src/ast/omake_ast_util.ml
+8 -3	omake-branches/omake_0_9_7_pre7/src/build/OMakefile
+94 -124	omake-branches/omake_0_9_7_pre7/src/build/omake_build.ml
+2 -0	omake-branches/omake_0_9_7_pre7/src/build/omake_build.mli
+0 -14	omake-branches/omake_0_9_7_pre7/src/build/omake_build_type.ml
+3 -2	omake-branches/omake_0_9_7_pre7/src/build/omake_build_util.ml
+96 -56	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin.ml
+2 -4	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin.mli
+111 -143	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_base.ml
+46 -47	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_file.ml
+17 -35	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_fun.ml
+56 -64	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_io.ml
+121 -112	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_io_fun.ml
+326 -306	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_object.ml
+8 -19	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_rule.ml
+11 -10	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_shell.ml
+16 -1	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_sys.ml
+10 -9	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_target.ml
+11 -10	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_test.ml
+7 -8	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_type.ml
+96 -13	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_util.ml
+8 -5	omake-branches/omake_0_9_7_pre7/src/build/omake_builtin_util.mli
+2 -1	omake-branches/omake_0_9_7_pre7/src/clib/OMakefile
Properties	omake-branches/omake_0_9_7_pre7/src/env
+1 -0	omake-branches/omake_0_9_7_pre7/src/env/.cvsignore
+19 -13	omake-branches/omake_0_9_7_pre7/src/env/OMakefile
+90 -34	omake-branches/omake_0_9_7_pre7/src/env/omake_ast_lex.mll
+154 -42	omake-branches/omake_0_9_7_pre7/src/env/omake_ast_parse.input
+330 -987	omake-branches/omake_0_9_7_pre7/src/env/omake_command_digest.ml
+2143 -933	omake-branches/omake_0_9_7_pre7/src/env/omake_env.ml
+266 -180	omake-branches/omake_0_9_7_pre7/src/env/omake_env.mli
+4 -0	omake-branches/omake_0_9_7_pre7/src/env/omake_exn_print.ml
+11 -2	omake-branches/omake_0_9_7_pre7/src/env/omake_gen_parse.ml
+2238 -528	omake-branches/omake_0_9_7_pre7/src/env/omake_ir_ast.ml
+10 -30	omake-branches/omake_0_9_7_pre7/src/env/omake_ir_ast.mli
+74 -82	omake-branches/omake_0_9_7_pre7/src/env/omake_ir_free_vars.ml
+2 -2	omake-branches/omake_0_9_7_pre7/src/env/omake_ir_free_vars.mli
+141 -96	omake-branches/omake_0_9_7_pre7/src/env/omake_ir_semant.ml
+1 -0	omake-branches/omake_0_9_7_pre7/src/env/omake_lexer.ml
+5 -1	omake-branches/omake_0_9_7_pre7/src/eval/OMakefile
+1004 -708	omake-branches/omake_0_9_7_pre7/src/eval/omake_eval.ml
+29 -19	omake-branches/omake_0_9_7_pre7/src/eval/omake_eval.mli
+87 -91	omake-branches/omake_0_9_7_pre7/src/eval/omake_rule.ml
+110 -41	omake-branches/omake_0_9_7_pre7/src/eval/omake_value.ml
+7 -2	omake-branches/omake_0_9_7_pre7/src/eval/omake_value.mli
+5 -1	omake-branches/omake_0_9_7_pre7/src/exec/OMakefile
+20 -10	omake-branches/omake_0_9_7_pre7/src/exec/omake_exec_print.ml
+5 -1	omake-branches/omake_0_9_7_pre7/src/ir/OMakefile
+28 -40	omake-branches/omake_0_9_7_pre7/src/ir/omake_cache.ml
+1 -1	omake-branches/omake_0_9_7_pre7/src/ir/omake_command_type.ml
+2 -2	omake-branches/omake_0_9_7_pre7/src/ir/omake_install.ml
+236 -45	omake-branches/omake_0_9_7_pre7/src/ir/omake_ir.ml
+265 -114	omake-branches/omake_0_9_7_pre7/src/ir/omake_ir_print.ml
+16 -8	omake-branches/omake_0_9_7_pre7/src/ir/omake_ir_print.mli
+13 -11	omake-branches/omake_0_9_7_pre7/src/ir/omake_ir_util.ml
+547 -529	omake-branches/omake_0_9_7_pre7/src/ir/omake_node.ml
+19 -17	omake-branches/omake_0_9_7_pre7/src/ir/omake_node.mli
+31 -39	omake-branches/omake_0_9_7_pre7/src/ir/omake_node_sig.ml
+0 -1	omake-branches/omake_0_9_7_pre7/src/ir/omake_options_type.ml
+13 -6	omake-branches/omake_0_9_7_pre7/src/ir/omake_state.ml
+6 -5	omake-branches/omake_0_9_7_pre7/src/ir/omake_state.mli
+25 -9	omake-branches/omake_0_9_7_pre7/src/ir/omake_symbol.ml
+223 -0	omake-branches/omake_0_9_7_pre7/src/ir/omake_virtual_id.ml
+106 -0	omake-branches/omake_0_9_7_pre7/src/ir/omake_virtual_id.mli
+46 -44	omake-branches/omake_0_9_7_pre7/src/libmojave/OMakefile
Properties	omake-branches/omake_0_9_7_pre7/src/magic
+1 -0	omake-branches/omake_0_9_7_pre7/src/magic/.cvsignore
+52 -50	omake-branches/omake_0_9_7_pre7/src/magic/OMakefile
Properties	omake-branches/omake_0_9_7_pre7/src/main
+5 -0	omake-branches/omake_0_9_7_pre7/src/main/.cvsignore
+2 -1	omake-branches/omake_0_9_7_pre7/src/main/OMakefile
+18 -7	omake-branches/omake_0_9_7_pre7/src/main/omake_main.ml
+54 -40	omake-branches/omake_0_9_7_pre7/src/main/omake_shell.ml
+14 -9	omake-branches/omake_0_9_7_pre7/src/shell/OMakefile
+3 -2	omake-branches/omake_0_9_7_pre7/src/shell/omake_shell_job.ml
+23 -17	omake-branches/omake_0_9_7_pre7/src/util/OMakefile
+2 -1	omake-branches/omake_0_9_7_pre7/src/util/omake_util.ml
+1 -1	omake-branches/omake_0_9_7_pre7/version.txt