Changes by: Jason Hickey (jyh at cs.caltech.edu)
Date: 2005-08-09 16:56:51 -0700 (Tue, 09 Aug 2005)
Revision: 1347
Log message:

      Merged against the trunk.
      

Changes  Path
+12 -0 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_filename_util.ml
+7 -3 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_filename_util.mli
+9 -1 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_list_util.ml
+18 -17 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_list_util.mli
+15 -5 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_map.ml
+2 -0 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_set.ml
+5 -3 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_string_util.ml
+7 -7 libmojave-branches/omake_0_9_7_pre5/stdlib/lm_thread_sig.ml
+1188 -28 libmojave-branches/omake_0_9_7_pre5/util/lm_hash.ml
+96 -19 libmojave-branches/omake_0_9_7_pre5/util/lm_hash.mli
+18 -3 libmojave-branches/omake_0_9_7_pre5/util/lm_lexer.ml
+2 -0 libmojave-branches/omake_0_9_7_pre5/util/lm_location.ml
+2 -0 libmojave-branches/omake_0_9_7_pre5/util/lm_position.ml
+87 -73 libmojave-branches/omake_0_9_7_pre5/util/lm_symbol.ml
+8 -0 libmojave-branches/omake_0_9_7_pre5/util/lm_symbol.mli
Properties omake-branches/omake_0_9_7_pre5
+3 -0 omake-branches/omake_0_9_7_pre5/.cvsignore
+24 -17 omake-branches/omake_0_9_7_pre5/OMakefile
+8 -9 omake-branches/omake_0_9_7_pre5/OMakeroot
+10 -10 omake-branches/omake_0_9_7_pre5/doc/OMakefile
+226 -245 omake-branches/omake_0_9_7_pre5/doc/html/omake-base.html
+253 -94 omake-branches/omake_0_9_7_pre5/doc/html/omake-pervasives.html
+66 -154 omake-branches/omake_0_9_7_pre5/doc/html/omake-root.html
+126 -160 omake-branches/omake_0_9_7_pre5/doc/html/omake-system.html
+40 -58 omake-branches/omake_0_9_7_pre5/doc/man/omake-base.1
+253 -212 omake-branches/omake_0_9_7_pre5/doc/man/omake-doc.1
+214 -40 omake-branches/omake_0_9_7_pre5/doc/man/omake-pervasives.1
+0 -84 omake-branches/omake_0_9_7_pre5/doc/man/omake-root.1
+0 -29 omake-branches/omake_0_9_7_pre5/doc/man/omake-system.1
+5 -5 omake-branches/omake_0_9_7_pre5/lib/OMakeroot.om
+1303 -974 omake-branches/omake_0_9_7_pre5/lib/Pervasives.om
+3 -0 omake-branches/omake_0_9_7_pre5/lib/boot/Default
+1 -1 omake-branches/omake_0_9_7_pre5/lib/boot/License
+359 -358 omake-branches/omake_0_9_7_pre5/lib/build/C.om
+1 -150 omake-branches/omake_0_9_7_pre5/lib/build/Common.om
+244 -247 omake-branches/omake_0_9_7_pre5/lib/build/LaTeX.om
+514 -517 omake-branches/omake_0_9_7_pre5/lib/build/OCaml.om
+13 -12 omake-branches/omake_0_9_7_pre5/lib/configure/Configure.om
+2 -1 omake-branches/omake_0_9_7_pre5/lib/configure/fam.om
+2 -1 omake-branches/omake_0_9_7_pre5/lib/configure/ncurses.om
+3 -2 omake-branches/omake_0_9_7_pre5/lib/configure/readline.om
+5 -5 omake-branches/omake_0_9_7_pre5/mk/defaults
+9 -5 omake-branches/omake_0_9_7_pre5/mk/make_config
+24 -20 omake-branches/omake_0_9_7_pre5/mk/make_gen
+30 -30 omake-branches/omake_0_9_7_pre5/src/Makefile
+30 -30 omake-branches/omake_0_9_7_pre5/src/Makefile.nt
+5 -0 omake-branches/omake_0_9_7_pre5/src/ast/OMakefile
+11 -4 omake-branches/omake_0_9_7_pre5/src/ast/omake_ast.ml
+65 -36 omake-branches/omake_0_9_7_pre5/src/ast/omake_ast_print.ml
+12 -12 omake-branches/omake_0_9_7_pre5/src/ast/omake_ast_util.ml
+6 -2 omake-branches/omake_0_9_7_pre5/src/build/OMakefile
+94 -124 omake-branches/omake_0_9_7_pre5/src/build/omake_build.ml
+2 -0 omake-branches/omake_0_9_7_pre5/src/build/omake_build.mli
+0 -14 omake-branches/omake_0_9_7_pre5/src/build/omake_build_type.ml
+3 -2 omake-branches/omake_0_9_7_pre5/src/build/omake_build_util.ml
+95 -56 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin.ml
+2 -4 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin.mli
+93 -143 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_base.ml
+46 -46 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_file.ml
+18 -36 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_fun.ml
+25 -63 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_io.ml
+63 -45 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_io_fun.ml
+46 -103 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_object.ml
+6 -17 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_rule.ml
+10 -9 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_shell.ml
+10 -9 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_target.ml
+11 -10 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_test.ml
+7 -8 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_type.ml
+96 -13 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_util.ml
+8 -5 omake-branches/omake_0_9_7_pre5/src/build/omake_builtin_util.mli
Properties omake-branches/omake_0_9_7_pre5/src/env
+1 -0 omake-branches/omake_0_9_7_pre5/src/env/.cvsignore
+7 -2 omake-branches/omake_0_9_7_pre5/src/env/OMakefile
+34 -26 omake-branches/omake_0_9_7_pre5/src/env/omake_ast_lex.mll
+146 -42 omake-branches/omake_0_9_7_pre5/src/env/omake_ast_parse.input
+341 -981 omake-branches/omake_0_9_7_pre5/src/env/omake_command_digest.ml
+1948 -883 omake-branches/omake_0_9_7_pre5/src/env/omake_env.ml
+235 -173 omake-branches/omake_0_9_7_pre5/src/env/omake_env.mli
+11 -2 omake-branches/omake_0_9_7_pre5/src/env/omake_gen_parse.ml
+2016 -522 omake-branches/omake_0_9_7_pre5/src/env/omake_ir_ast.ml
+10 -30 omake-branches/omake_0_9_7_pre5/src/env/omake_ir_ast.mli
+74 -81 omake-branches/omake_0_9_7_pre5/src/env/omake_ir_free_vars.ml
+2 -2 omake-branches/omake_0_9_7_pre5/src/env/omake_ir_free_vars.mli
+97 -57 omake-branches/omake_0_9_7_pre5/src/env/omake_ir_semant.ml
+5 -0 omake-branches/omake_0_9_7_pre5/src/eval/OMakefile
+938 -669 omake-branches/omake_0_9_7_pre5/src/eval/omake_eval.ml
+20 -15 omake-branches/omake_0_9_7_pre5/src/eval/omake_eval.mli
+87 -91 omake-branches/omake_0_9_7_pre5/src/eval/omake_rule.ml
+51 -24 omake-branches/omake_0_9_7_pre5/src/eval/omake_value.ml
+3 -2 omake-branches/omake_0_9_7_pre5/src/eval/omake_value.mli
+5 -0 omake-branches/omake_0_9_7_pre5/src/exec/OMakefile
+20 -10 omake-branches/omake_0_9_7_pre5/src/exec/omake_exec_print.ml
+5 -0 omake-branches/omake_0_9_7_pre5/src/ir/OMakefile
+34 -40 omake-branches/omake_0_9_7_pre5/src/ir/omake_cache.ml
+2 -0 omake-branches/omake_0_9_7_pre5/src/ir/omake_cache_type.ml
+1 -1 omake-branches/omake_0_9_7_pre5/src/ir/omake_command_type.ml
+2 -2 omake-branches/omake_0_9_7_pre5/src/ir/omake_install.ml
+236 -44 omake-branches/omake_0_9_7_pre5/src/ir/omake_ir.ml
+268 -113 omake-branches/omake_0_9_7_pre5/src/ir/omake_ir_print.ml
+16 -8 omake-branches/omake_0_9_7_pre5/src/ir/omake_ir_print.mli
+13 -10 omake-branches/omake_0_9_7_pre5/src/ir/omake_ir_util.ml
+538 -503 omake-branches/omake_0_9_7_pre5/src/ir/omake_node.ml
+17 -16 omake-branches/omake_0_9_7_pre5/src/ir/omake_node.mli
+23 -31 omake-branches/omake_0_9_7_pre5/src/ir/omake_node_sig.ml
+0 -1 omake-branches/omake_0_9_7_pre5/src/ir/omake_options_type.ml
+13 -6 omake-branches/omake_0_9_7_pre5/src/ir/omake_state.ml
+6 -5 omake-branches/omake_0_9_7_pre5/src/ir/omake_state.mli
+17 -7 omake-branches/omake_0_9_7_pre5/src/ir/omake_symbol.ml
+221 -0 omake-branches/omake_0_9_7_pre5/src/ir/omake_virtual_id.ml
+104 -0 omake-branches/omake_0_9_7_pre5/src/ir/omake_virtual_id.mli
Properties omake-branches/omake_0_9_7_pre5/src/magic
+1 -0 omake-branches/omake_0_9_7_pre5/src/magic/.cvsignore
+5 -3 omake-branches/omake_0_9_7_pre5/src/magic/OMakefile
Properties omake-branches/omake_0_9_7_pre5/src/main
+3 -0 omake-branches/omake_0_9_7_pre5/src/main/.cvsignore
+4 -0 omake-branches/omake_0_9_7_pre5/src/main/OMakefile
+18 -7 omake-branches/omake_0_9_7_pre5/src/main/omake_main.ml
+61 -42 omake-branches/omake_0_9_7_pre5/src/main/omake_shell.ml
+7 -2 omake-branches/omake_0_9_7_pre5/src/shell/OMakefile
+3 -2 omake-branches/omake_0_9_7_pre5/src/shell/omake_shell_job.ml
+7 -2 omake-branches/omake_0_9_7_pre5/src/util/OMakefile
+1 -1 omake-branches/omake_0_9_7_pre5/version.txt