Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2006-04-12 17:57:01 -0700 (Wed, 12 Apr 2006)
Revision: 9070
Log message:

      Merged the 0.9.6.shell branch:
         svn merge -r 8877:9048 svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.6.shell@9048
         with some hand editing.
      
      

Changes  Path
+2 -2 omake-branches/omake_0_9_7_ref/OMakefile
+75 -64 omake-branches/omake_0_9_7_ref/doc/html/omake-base.html
+458 -348 omake-branches/omake_0_9_7_ref/doc/html/omake-doc.html
+153 -54 omake-branches/omake_0_9_7_ref/doc/html/omake-system.html
+10 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-base.1
+6 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-base.txt
+106 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.1
+69 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.txt
+96 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-system.1
+63 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-system.txt
Binary omake-branches/omake_0_9_7_ref/doc/ps/omake-doc.dvi
+6 -5 omake-branches/omake_0_9_7_ref/lib/build/LaTeX.om
+10 -8 omake-branches/omake_0_9_7_ref/src/Makefile
+10 -8 omake-branches/omake_0_9_7_ref/src/Makefile.nt
+1 -0 omake-branches/omake_0_9_7_ref/src/ast/omake_ast.ml
+6 -1 omake-branches/omake_0_9_7_ref/src/ast/omake_ast_print.ml
+4 -0 omake-branches/omake_0_9_7_ref/src/ast/omake_ast_util.ml
+95 -84 omake-branches/omake_0_9_7_ref/src/build/omake_build.ml
+2 -2 omake-branches/omake_0_9_7_ref/src/build/omake_build_type.ml
+244 -163 omake-branches/omake_0_9_7_ref/src/build/omake_rule.ml
+2 -2 omake-branches/omake_0_9_7_ref/src/build/omake_rule.mli
+0 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_base.ml
+27 -0 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_file.ml
+242 -3 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_io_fun.ml
+19 -3 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_object.ml
+1 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_shell.ml
+1 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_target.ml
+1 -0 omake-branches/omake_0_9_7_ref/src/clib/OMakefile
+6 -2 omake-branches/omake_0_9_7_ref/src/env/omake_ast_lex.mll
+8 -0 omake-branches/omake_0_9_7_ref/src/env/omake_ast_parse.input
+202 -6 omake-branches/omake_0_9_7_ref/src/env/omake_command_digest.ml
+1 -1 omake-branches/omake_0_9_7_ref/src/env/omake_command_digest.mli
+229 -59 omake-branches/omake_0_9_7_ref/src/env/omake_env.ml
+67 -18 omake-branches/omake_0_9_7_ref/src/env/omake_env.mli
+13 -1 omake-branches/omake_0_9_7_ref/src/env/omake_ir_ast.ml
+2 -1 omake-branches/omake_0_9_7_ref/src/env/omake_ir_free_vars.ml
+3 -0 omake-branches/omake_0_9_7_ref/src/env/omake_ir_semant.ml
+204 -10 omake-branches/omake_0_9_7_ref/src/eval/omake_eval.ml
+5 -1 omake-branches/omake_0_9_7_ref/src/eval/omake_eval.mli
+8 -1 omake-branches/omake_0_9_7_ref/src/eval/omake_value.ml
+42 -13 omake-branches/omake_0_9_7_ref/src/exec/omake_exec_print.ml
+6 -5 omake-branches/omake_0_9_7_ref/src/exec/omake_exec_print.mli
+1 -0 omake-branches/omake_0_9_7_ref/src/ir/OMakefile
+19 -94 omake-branches/omake_0_9_7_ref/src/ir/omake_command.ml
+7 -8 omake-branches/omake_0_9_7_ref/src/ir/omake_command.mli
+73 -4 omake-branches/omake_0_9_7_ref/src/ir/omake_command_type.ml
+1 -0 omake-branches/omake_0_9_7_ref/src/ir/omake_ir.ml
+3 -0 omake-branches/omake_0_9_7_ref/src/ir/omake_ir_print.ml
Copied omake-branches/omake_0_9_7_ref/src/ir/omake_shell_type.ml
+2 -4 omake-branches/omake_0_9_7_ref/src/main/omake_shell.ml
Properties omake-branches/omake_0_9_7_ref/src/shell
+0 -1 omake-branches/omake_0_9_7_ref/src/shell/OMakefile
+28 -113 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_job.ml
+2 -6 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_job.mli
Copied omake-branches/omake_0_9_7_ref/src/shell/omake_shell_lex.ml
Properties omake-branches/omake_0_9_7_ref/src/shell/omake_shell_lex.ml
+15 -1 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_lex.mli
Deleted omake-branches/omake_0_9_7_ref/src/shell/omake_shell_lex.mll
+149 -143 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_parse.mly
+6 -0 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_sys_unix.ml
Deleted omake-branches/omake_0_9_7_ref/src/shell/omake_shell_type.ml