Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-04-25 16:35:55 -0700 (Wed, 25 Apr 2007)
Revision: 10512
Log message:

      There are still issues with the "var1" code, so I am reverting it for now.
     
     P.S. The particular problem that I am seeing when trying to "make install" the
     0.9.8.x+var1 is that the dependency scanning is incomplete. If I execute
     
     OMAKEFLAGS= OMAKEPATH=lib ./omake-boot --dotomake .omake --force-dotomake -j2 --show-dependencies src/libmojave/lm_location.cmx src/libmojave/lm.cmxa
     
     then in rev. 10500 (e.g. before "var1"), I see the correct:
     
     dependencies:
        target: src/libmojave/lm_location.cmx
           scanner dependencies: <scanner src/libmojave/scan-ocaml-lm_location.ml>
           static dependencies: src/libmojave/lm_location.cmi src/libmojave/lm_location.ml
           build dependencies: src/libmojave/lm_symbol.o src/libmojave/lm_printf.o src/libmojave/lm_location.cmi
              src/libmojave/lm_symbol.cmi <scanner src/libmojave/scan-ocaml-lm_location.ml> src/libmojave/lm_location.ml
              src/libmojave/lm_printf.cmi src/libmojave/lm_symbol.cmx src/libmojave/lm_printf.cmx
           dependencies are merged from: src/libmojave/lm_location.cmx src/libmojave/lm_location.o
           targets that depend on this node at this point: src/libmojave/lm_channel.cmx src/libmojave/lm_position.o
              src/libmojave/lm.cmxa src/libmojave/lm_position.cmx src/libmojave/lm.a src/libmojave/lm_channel.o
     
     while in rev. 10509 (i.e. after "var1" merge), I see a much shorter list, with
     the dependency on lm_symbol.cmx missing:
     
     dependencies:
        target: src/libmojave/lm_location.cmx
           scanner dependencies: <scanner src/libmojave/scan-ocaml-lm_location.ml>
           static dependencies: src/libmojave/lm_location.cmi src/libmojave/lm_location.ml
           build dependencies: src/libmojave/lm_location.cmi src/libmojave/lm_symbol.cmi
              <scanner src/libmojave/scan-ocaml-lm_location.ml> src/libmojave/lm_location.ml src/libmojave/lm_printf.cmi
           dependencies are merged from: src/libmojave/lm_location.cmx src/libmojave/lm_location.o
           targets that depend on this node at this point: src/libmojave/lm.cmxa src/libmojave/lm.a

Changes  Path
+0 -2 omake-branches/0.9.8.x/lib/Pervasives.om
+3 -7 omake-branches/0.9.8.x/src/Makefile
+3 -7 omake-branches/0.9.8.x/src/Makefile.nt
+6 -6 omake-branches/0.9.8.x/src/build/omake_build.ml
+7 -11 omake-branches/0.9.8.x/src/build/omake_builtin.ml
+4 -4 omake-branches/0.9.8.x/src/build/omake_builtin.mli
+5 -71 omake-branches/0.9.8.x/src/build/omake_builtin_util.ml
+4 -10 omake-branches/0.9.8.x/src/build/omake_builtin_util.mli
+44 -41 omake-branches/0.9.8.x/src/build/omake_rule.ml
+20 -39 omake-branches/0.9.8.x/src/builtin/omake_builtin_base.ml
+5 -6 omake-branches/0.9.8.x/src/builtin/omake_builtin_file.ml
+16 -47 omake-branches/0.9.8.x/src/builtin/omake_builtin_io.ml
+32 -31 omake-branches/0.9.8.x/src/builtin/omake_builtin_io_fun.ml
+5 -108 omake-branches/0.9.8.x/src/builtin/omake_builtin_object.ml
+0 -9 omake-branches/0.9.8.x/src/builtin/omake_builtin_rule.ml
+2 -3 omake-branches/0.9.8.x/src/builtin/omake_builtin_shell.ml
+11 -12 omake-branches/0.9.8.x/src/builtin/omake_builtin_sys.ml
+4 -5 omake-branches/0.9.8.x/src/builtin/omake_builtin_target.ml
+9 -10 omake-branches/0.9.8.x/src/builtin/omake_builtin_test.ml
Properties omake-branches/0.9.8.x/src/clib/
+0 -1 omake-branches/0.9.8.x/src/env/omake_ast_lex.mll
+21 -39 omake-branches/0.9.8.x/src/env/omake_ast_parse.input
+81 -107 omake-branches/0.9.8.x/src/env/omake_command_digest.ml
+575 -556 omake-branches/0.9.8.x/src/env/omake_env.ml
+30 -30 omake-branches/0.9.8.x/src/env/omake_env.mli
+4 -7 omake-branches/0.9.8.x/src/env/omake_gen_parse.ml
+465 -1255 omake-branches/0.9.8.x/src/env/omake_ir_ast.ml
+27 -20 omake-branches/0.9.8.x/src/env/omake_ir_ast.mli
+84 -77 omake-branches/0.9.8.x/src/env/omake_ir_free_vars.ml
+5 -5 omake-branches/0.9.8.x/src/env/omake_ir_free_vars.mli
+46 -43 omake-branches/0.9.8.x/src/env/omake_ir_semant.ml
+169 -192 omake-branches/0.9.8.x/src/eval/omake_eval.ml
+9 -9 omake-branches/0.9.8.x/src/eval/omake_eval.mli
+3 -4 omake-branches/0.9.8.x/src/eval/omake_value.ml
+2 -3 omake-branches/0.9.8.x/src/eval/omake_value.mli
+0 -1 omake-branches/0.9.8.x/src/ir/OMakefile
+6 -7 omake-branches/0.9.8.x/src/ir/omake_command_type.ml
+35 -185 omake-branches/0.9.8.x/src/ir/omake_ir.ml
+72 -102 omake-branches/0.9.8.x/src/ir/omake_ir_print.ml
+5 -6 omake-branches/0.9.8.x/src/ir/omake_ir_print.mli
+9 -9 omake-branches/0.9.8.x/src/ir/omake_ir_util.ml
+4 -22 omake-branches/0.9.8.x/src/ir/omake_options.ml
+3 -5 omake-branches/0.9.8.x/src/ir/omake_options.mli
+0 -8 omake-branches/0.9.8.x/src/ir/omake_symbol.ml
Deleted omake-branches/0.9.8.x/src/ir/omake_var.ml
Deleted omake-branches/0.9.8.x/src/ir/omake_var.mli
+13 -5 omake-branches/0.9.8.x/src/ir/omake_virtual_id.ml
+6 -3 omake-branches/0.9.8.x/src/ir/omake_virtual_id.mli
Properties omake-branches/0.9.8.x/src/libmojave/
+6 -6 omake-branches/0.9.8.x/src/main/omake_main.ml
+23 -23 omake-branches/0.9.8.x/src/main/omake_shell.ml
+2 -3 omake-branches/0.9.8.x/src/shell/omake_shell_completion.ml
+2 -3 omake-branches/0.9.8.x/src/shell/omake_shell_job.ml