Commits

camlspotter committed 0258cae Merge

fixing custom

Comments (0)

Files changed (631)

.depend

File contents unchanged.

.hgignore

File contents unchanged.

.hgtags

File contents unchanged.

0scripts/0BUILD.sh

File contents unchanged.

0scripts/0CHECKOUT-SVN

File contents unchanged.

Changes

File contents unchanged.

INSTALL

File contents unchanged.

Makefile

File contents unchanged.

Makefile.nt

File contents unchanged.
File contents unchanged.

README.win32

File contents unchanged.

VERSION

File contents unchanged.
File contents unchanged.

asmcomp/amd64/arch.ml

File contents unchanged.

asmcomp/amd64/emit.mlp

File contents unchanged.

asmcomp/amd64/emit_nt.mlp

File contents unchanged.

asmcomp/amd64/proc.ml

File contents unchanged.

asmcomp/amd64/selection.ml

File contents unchanged.

asmcomp/arm/arch.ml

File contents unchanged.

asmcomp/arm/emit.mlp

File contents unchanged.

asmcomp/arm/proc.ml

File contents unchanged.

asmcomp/arm/scheduling.ml

File contents unchanged.

asmcomp/arm/selection.ml

File contents unchanged.

asmcomp/asmgen.ml

File contents unchanged.

asmcomp/asmgen.mli

File contents unchanged.

asmcomp/asmlibrarian.ml

File contents unchanged.

asmcomp/asmlink.ml

File contents unchanged.

asmcomp/asmlink.mli

File contents unchanged.

asmcomp/asmpackager.ml

File contents unchanged.

asmcomp/asmpackager.mli

File contents unchanged.

asmcomp/clambda.ml

File contents unchanged.

asmcomp/clambda.mli

File contents unchanged.

asmcomp/closure.ml

File contents unchanged.

asmcomp/cmm.ml

File contents unchanged.

asmcomp/cmm.mli

File contents unchanged.

asmcomp/cmmgen.ml

File contents unchanged.

asmcomp/cmmgen.mli

File contents unchanged.

asmcomp/cmx_format.mli

File contents unchanged.

asmcomp/compilenv.ml

File contents unchanged.

asmcomp/compilenv.mli

File contents unchanged.

asmcomp/debuginfo.ml

File contents unchanged.

asmcomp/debuginfo.mli

File contents unchanged.

asmcomp/emitaux.ml

File contents unchanged.

asmcomp/emitaux.mli

File contents unchanged.

asmcomp/i386/arch.ml

File contents unchanged.

asmcomp/i386/emit.mlp

File contents unchanged.

asmcomp/i386/emit_nt.mlp

File contents unchanged.

asmcomp/i386/proc.ml

File contents unchanged.

asmcomp/i386/selection.ml

File contents unchanged.

asmcomp/linearize.ml

File contents unchanged.

asmcomp/linearize.mli

File contents unchanged.

asmcomp/liveness.ml

File contents unchanged.

asmcomp/liveness.mli

File contents unchanged.

asmcomp/mach.ml

File contents unchanged.

asmcomp/mach.mli

File contents unchanged.

asmcomp/power/arch.ml

File contents unchanged.

asmcomp/power/emit.mlp

File contents unchanged.

asmcomp/power/selection.ml

File contents unchanged.

asmcomp/printcmm.ml

File contents unchanged.

asmcomp/printlinear.ml

File contents unchanged.

asmcomp/printmach.ml

File contents unchanged.

asmcomp/reloadgen.ml

File contents unchanged.

asmcomp/schedgen.ml

File contents unchanged.

asmcomp/selectgen.ml

File contents unchanged.

asmcomp/selectgen.mli

File contents unchanged.

asmcomp/sparc/arch.ml

File contents unchanged.

asmcomp/sparc/emit.mlp

File contents unchanged.

asmcomp/sparc/selection.ml

File contents unchanged.

asmcomp/spill.ml

File contents unchanged.

asmcomp/split.ml

File contents unchanged.

asmrun/Makefile

File contents unchanged.

asmrun/Makefile.nt

File contents unchanged.

asmrun/amd64.S

File contents unchanged.

asmrun/amd64nt.asm

File contents unchanged.

asmrun/arm.S

File contents unchanged.

asmrun/backtrace.c

File contents unchanged.

asmrun/fail.c

File contents unchanged.

asmrun/i386.S

File contents unchanged.

asmrun/i386nt.asm

File contents unchanged.

asmrun/natdynlink.c

File contents unchanged.

asmrun/power-elf.S

File contents unchanged.

asmrun/power-rhapsody.S

File contents unchanged.

asmrun/roots.c

File contents unchanged.

asmrun/signals_asm.c

File contents unchanged.

asmrun/signals_osdep.h

File contents unchanged.

asmrun/sparc.S

File contents unchanged.

asmrun/stack.h

File contents unchanged.

asmrun/startup.c

File contents unchanged.

boot/.ignore

File contents unchanged.

boot/myocamlbuild.boot

Binary file modified.

boot/ocamlc

Binary file modified.

boot/ocamldep

Binary file modified.

boot/ocamllex

Binary file modified.

build/camlp4-byte-only.sh

File contents unchanged.

build/camlp4-native-only.sh

File contents unchanged.

build/distclean.sh

File contents unchanged.

build/fastworld.sh

File contents unchanged.

build/install.sh

File contents unchanged.

build/mixed-boot.sh

File contents unchanged.

build/mkconfig.sh

File contents unchanged.

build/mkmyocamlbuild_config.sh

File contents unchanged.

build/myocamlbuild.sh

File contents unchanged.

build/ocamlbuild-byte-only.sh

File contents unchanged.

build/ocamlbuild-native-only.sh

File contents unchanged.

build/ocamlbuildlib-native-only.sh

File contents unchanged.

build/otherlibs-targets.sh

File contents unchanged.

build/partial-install.sh

File contents unchanged.

build/world.sh

File contents unchanged.

bytecomp/bytegen.ml

File contents unchanged.

bytecomp/bytelibrarian.ml

File contents unchanged.

bytecomp/bytelibrarian.mli

File contents unchanged.

bytecomp/bytelink.ml

File contents unchanged.

bytecomp/bytelink.mli

File contents unchanged.

bytecomp/bytepackager.ml

File contents unchanged.

bytecomp/bytepackager.mli

File contents unchanged.

bytecomp/bytesections.ml

File contents unchanged.

bytecomp/instruct.ml

File contents unchanged.

bytecomp/lambda.ml

File contents unchanged.

bytecomp/lambda.mli

File contents unchanged.

bytecomp/matching.ml

File contents unchanged.

bytecomp/printlambda.ml

File contents unchanged.

bytecomp/printlambda.mli

File contents unchanged.

bytecomp/simplif.ml

File contents unchanged.

bytecomp/symtable.ml

File contents unchanged.

bytecomp/symtable.mli

File contents unchanged.

bytecomp/translclass.ml

File contents unchanged.

bytecomp/translclass.mli

File contents unchanged.

bytecomp/translcore.ml

File contents unchanged.

bytecomp/translcore.mli

File contents unchanged.

bytecomp/translmod.ml

File contents unchanged.

bytecomp/typeopt.ml

File contents unchanged.

byterun/.ignore

File contents unchanged.

byterun/Makefile

File contents unchanged.

byterun/Makefile.common

File contents unchanged.

byterun/alloc.h

File contents unchanged.

byterun/array.c

File contents unchanged.

byterun/backtrace.c

File contents unchanged.

byterun/callback.c

File contents unchanged.

byterun/callback.h

File contents unchanged.

byterun/compact.c

File contents unchanged.

byterun/compare.c

File contents unchanged.

byterun/config.h

File contents unchanged.

byterun/custom.h

File contents unchanged.

byterun/debugger.c

File contents unchanged.

byterun/debugger.h

File contents unchanged.

byterun/extern.c

File contents unchanged.

byterun/fail.h

File contents unchanged.

byterun/finalise.c

File contents unchanged.

byterun/fix_code.c

File contents unchanged.

byterun/fix_code.h

File contents unchanged.

byterun/floats.c

File contents unchanged.

byterun/gc_ctrl.c

File contents unchanged.

byterun/hash.c

File contents unchanged.

byterun/hash.h

File contents unchanged.

byterun/intern.c

File contents unchanged.

byterun/intext.h

File contents unchanged.

byterun/ints.c

File contents unchanged.

byterun/io.c

File contents unchanged.

byterun/io.h

File contents unchanged.

byterun/md5.c

File contents unchanged.

byterun/md5.h

File contents unchanged.

byterun/memory.c

File contents unchanged.

byterun/memory.h

File contents unchanged.

byterun/meta.c

File contents unchanged.

byterun/minor_gc.c

File contents unchanged.

byterun/mlvalues.h

File contents unchanged.

byterun/obj.c

File contents unchanged.

byterun/parsing.c

File contents unchanged.

byterun/printexc.c

File contents unchanged.

byterun/printexc.h

File contents unchanged.

byterun/signals.h

File contents unchanged.

byterun/startup.c

File contents unchanged.

byterun/sys.c

File contents unchanged.

byterun/win32.c

File contents unchanged.

camlp4/Camlp4/Camlp4Ast.partial.ml

File contents unchanged.

camlp4/Camlp4/Debug.ml

File contents unchanged.

camlp4/Camlp4/Printers/OCaml.ml

File contents unchanged.

camlp4/Camlp4/Printers/OCamlr.ml

File contents unchanged.

camlp4/Camlp4/Sig.ml

File contents unchanged.

camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml

File contents unchanged.

camlp4/Camlp4/Struct/FreeVars.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Dynamic.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Insert.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Parser.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Parser.mli

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Static.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Structure.ml

File contents unchanged.

camlp4/Camlp4/Struct/Grammar/Tools.ml

File contents unchanged.

camlp4/Camlp4/Struct/Lexer.mll

File contents unchanged.

camlp4/Camlp4/Struct/Token.ml

File contents unchanged.

camlp4/Camlp4Bin.ml

   };
 
 value initial_spec_list =
-  [("-I", Arg.String (fun x -> input_file (IncludeDir x)),
+  [("-I", Arg.String (fun x -> input_file (IncludeDir (Camlp4_import.Misc.expand_directory Camlp4_config.ocaml_standard_library x))),
     "<directory>  Add directory in search patch for object files.");
   ("-where", Arg.Unit print_stdlib,
     "Print camlp4 library directory and exit.");

camlp4/Camlp4Filters/Camlp4FoldGenerator.ml

File contents unchanged.

camlp4/Camlp4Filters/Camlp4MetaGenerator.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4GrammarParser.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4ListComprehension.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4MacroParser.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4OCamlParser.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml

File contents unchanged.

camlp4/Camlp4Top/Top.ml

File contents unchanged.

camlp4/Camlp4_config.ml

File contents unchanged.

camlp4/boot/Camlp4.ml

File contents unchanged.

camlp4/boot/Camlp4Ast.ml

File contents unchanged.

camlp4/boot/camlp4boot.ml

          !rcall_callback ())
       
     let initial_spec_list =
-      [ ("-I", (Arg.String (fun x -> input_file (IncludeDir x))),
+      [ ("-I", (Arg.String (fun x -> input_file (IncludeDir (Camlp4_import.Misc.expand_directory Camlp4_config.ocaml_standard_library x)))),
          "<directory>  Add directory in search patch for object files.");
         ("-where", (Arg.Unit print_stdlib),
          "Print camlp4 library directory and exit.");

config/Makefile-templ

File contents unchanged.

config/Makefile.mingw

File contents unchanged.

config/Makefile.mingw64

File contents unchanged.

config/Makefile.msvc

File contents unchanged.

config/Makefile.msvc64

File contents unchanged.

config/auto-aux/expm1.c

File contents unchanged.

config/s-nt.h

File contents unchanged.

configure

File contents unchanged.

debugger/.ignore

File contents unchanged.

debugger/Makefile.shared

File contents unchanged.

debugger/command_line.ml

File contents unchanged.

debugger/debugcom.ml

File contents unchanged.

debugger/debugcom.mli

File contents unchanged.

debugger/debugger_config.ml

File contents unchanged.

debugger/debugger_config.mli

File contents unchanged.

debugger/envaux.ml

File contents unchanged.

debugger/eval.ml

File contents unchanged.

debugger/loadprinter.ml

File contents unchanged.

debugger/main.ml

File contents unchanged.

debugger/parser.mly

File contents unchanged.

debugger/program_loading.ml

File contents unchanged.

debugger/program_management.ml

File contents unchanged.

debugger/source.ml

File contents unchanged.

debugger/unix_tools.ml

File contents unchanged.

driver/compile.ml

File contents unchanged.

driver/compile.mli

File contents unchanged.

driver/errors.ml

File contents unchanged.

driver/main.ml

File contents unchanged.

driver/main_args.ml

File contents unchanged.

driver/main_args.mli

File contents unchanged.

driver/ocamlcomp.sh.in

File contents unchanged.

driver/optcompile.ml

File contents unchanged.

driver/optcompile.mli

File contents unchanged.

driver/opterrors.ml

File contents unchanged.

driver/optmain.ml

File contents unchanged.

driver/pparse.ml

File contents unchanged.

driver/pparse.mli

File contents unchanged.

emacs/Makefile

File contents unchanged.

emacs/README

File contents unchanged.

emacs/caml-font.el

File contents unchanged.

emacs/caml-help.el

File contents unchanged.

emacs/caml-hilit.el

File contents unchanged.

emacs/caml-types.el

File contents unchanged.

emacs/caml.el

File contents unchanged.

emacs/camldebug.el

File contents unchanged.

emacs/inf-caml.el

File contents unchanged.

experimental/garrigue/variable-names-Tvar.diffs

File contents unchanged.

lex/Makefile

File contents unchanged.

lex/cset.mli

File contents unchanged.

lex/lexer.mll

File contents unchanged.

lex/main.ml

File contents unchanged.

man/Makefile

File contents unchanged.

man/ocaml.m

File contents unchanged.

man/ocamlc.m

File contents unchanged.

man/ocamlcp.m

File contents unchanged.

man/ocamldoc.m

File contents unchanged.

man/ocamlopt.m

File contents unchanged.

man/ocamlrun.m

File contents unchanged.

myocamlbuild.ml

File contents unchanged.

myocamlbuild_config.mli

File contents unchanged.

ocamlbuild/_tags

File contents unchanged.

ocamlbuild/hygiene.ml

File contents unchanged.

ocamlbuild/man/ocamlbuild.1

File contents unchanged.

ocamlbuild/my_std.ml

File contents unchanged.

ocamlbuild/ocaml_compiler.ml

File contents unchanged.

ocamlbuild/ocaml_specific.ml

File contents unchanged.

ocamlbuild/ocamlbuild_unix_plugin.ml

File contents unchanged.

ocamlbuild/options.ml

File contents unchanged.

ocamlbuild/slurp.ml

File contents unchanged.

ocamldoc/.depend

File contents unchanged.

ocamldoc/Makefile

File contents unchanged.

ocamldoc/Makefile.nt

File contents unchanged.

ocamldoc/generators/odoc_literate.ml

File contents unchanged.

ocamldoc/generators/odoc_todo.ml

File contents unchanged.

ocamldoc/odoc_analyse.ml

File contents unchanged.

ocamldoc/odoc_args.ml

File contents unchanged.

ocamldoc/odoc_args.mli

File contents unchanged.

ocamldoc/odoc_ast.ml

File contents unchanged.

ocamldoc/odoc_comments_global.ml

File contents unchanged.

ocamldoc/odoc_cross.ml

File contents unchanged.

ocamldoc/odoc_gen.ml

File contents unchanged.

ocamldoc/odoc_gen.mli

File contents unchanged.

ocamldoc/odoc_html.ml

File contents unchanged.

ocamldoc/odoc_info.ml

File contents unchanged.

ocamldoc/odoc_info.mli

File contents unchanged.

ocamldoc/odoc_latex.ml

File contents unchanged.

ocamldoc/odoc_lexer.mll

File contents unchanged.

ocamldoc/odoc_man.ml

File contents unchanged.

ocamldoc/odoc_merge.mli

File contents unchanged.

ocamldoc/odoc_messages.ml

File contents unchanged.

ocamldoc/odoc_misc.ml

File contents unchanged.

ocamldoc/odoc_name.ml

File contents unchanged.

ocamldoc/odoc_name.mli

File contents unchanged.

ocamldoc/odoc_parser.mly

File contents unchanged.

ocamldoc/odoc_scan.ml

File contents unchanged.

ocamldoc/odoc_sig.ml

File contents unchanged.

ocamldoc/odoc_str.ml

File contents unchanged.

ocamldoc/odoc_test.ml

File contents unchanged.

ocamldoc/odoc_texi.ml

File contents unchanged.

ocamldoc/odoc_text_lexer.mll

File contents unchanged.

ocamldoc/odoc_to_text.ml

File contents unchanged.

ocamldoc/odoc_types.ml

File contents unchanged.

ocamldoc/odoc_types.mli

File contents unchanged.

ocamldoc/remove_DEBUG

File contents unchanged.

otherlibs/Makefile.shared

File contents unchanged.

otherlibs/bigarray/.depend

File contents unchanged.

otherlibs/bigarray/bigarray.h

File contents unchanged.

otherlibs/bigarray/bigarray.ml

File contents unchanged.

otherlibs/bigarray/bigarray.mli

File contents unchanged.

otherlibs/bigarray/bigarray_stubs.c

File contents unchanged.

otherlibs/bigarray/mmap_unix.c

File contents unchanged.

otherlibs/bigarray/mmap_win32.c

File contents unchanged.

otherlibs/dynlink/Makefile

File contents unchanged.

otherlibs/dynlink/dynlink.ml

File contents unchanged.

otherlibs/dynlink/dynlink.mli

File contents unchanged.

otherlibs/dynlink/natdynlink.ml

File contents unchanged.

otherlibs/graph/.depend

File contents unchanged.

otherlibs/graph/graphicsX11.mli

File contents unchanged.

otherlibs/graph/libgraph.h

File contents unchanged.

otherlibs/labltk/Makefile

File contents unchanged.

otherlibs/labltk/Makefile.nt

File contents unchanged.

otherlibs/labltk/README

File contents unchanged.

otherlibs/labltk/browser/.depend

File contents unchanged.

otherlibs/labltk/browser/.ignore

File contents unchanged.

otherlibs/labltk/browser/Makefile.shared

File contents unchanged.

otherlibs/labltk/browser/editor.ml

File contents unchanged.

otherlibs/labltk/browser/jg_box.ml

File contents unchanged.

otherlibs/labltk/browser/mytypes.mli

File contents unchanged.

otherlibs/labltk/browser/searchid.ml

File contents unchanged.

otherlibs/labltk/browser/searchpos.ml

File contents unchanged.

otherlibs/labltk/browser/typecheck.ml

File contents unchanged.

otherlibs/labltk/browser/viewer.ml

File contents unchanged.

otherlibs/labltk/builtin/builtini_ScrollValue.ml

File contents unchanged.

otherlibs/labltk/camltk/Makefile

File contents unchanged.

otherlibs/labltk/camltk/Makefile.gen

File contents unchanged.

otherlibs/labltk/compiler/Makefile

File contents unchanged.

otherlibs/labltk/compiler/compile.ml

File contents unchanged.

otherlibs/labltk/examples_camltk/eyes.ml

File contents unchanged.

otherlibs/labltk/examples_camltk/tetris.ml

File contents unchanged.

otherlibs/labltk/frx/Makefile

File contents unchanged.

otherlibs/labltk/frx/frx_mem.mli

File contents unchanged.

otherlibs/labltk/jpf/Makefile

File contents unchanged.

otherlibs/labltk/labltk/Makefile

File contents unchanged.

otherlibs/labltk/labltk/Makefile.gen

File contents unchanged.

otherlibs/labltk/lib/Makefile

File contents unchanged.

otherlibs/labltk/support/Makefile

File contents unchanged.

otherlibs/labltk/support/camltk.h

File contents unchanged.

otherlibs/labltk/support/cltkCaml.c

File contents unchanged.

otherlibs/labltk/support/cltkDMain.c

File contents unchanged.

otherlibs/labltk/support/cltkEval.c

File contents unchanged.

otherlibs/labltk/support/cltkImg.c

File contents unchanged.

otherlibs/labltk/support/cltkMain.c

File contents unchanged.

otherlibs/labltk/support/cltkMisc.c

File contents unchanged.

otherlibs/labltk/support/cltkTimer.c

File contents unchanged.

otherlibs/labltk/support/cltkVar.c

File contents unchanged.

otherlibs/labltk/support/cltkWait.c

File contents unchanged.

otherlibs/num/.depend

File contents unchanged.

otherlibs/num/Makefile

File contents unchanged.

otherlibs/num/Makefile.nt

File contents unchanged.

otherlibs/num/big_int.ml

File contents unchanged.

otherlibs/num/big_int.mli

File contents unchanged.

otherlibs/num/bng.c

File contents unchanged.

otherlibs/num/bng_digit.c

File contents unchanged.

otherlibs/num/num.mli

File contents unchanged.

otherlibs/num/ratio.mli

File contents unchanged.

otherlibs/str/.depend

File contents unchanged.

otherlibs/str/str.ml

File contents unchanged.

otherlibs/str/strstubs.c

File contents unchanged.

otherlibs/systhreads/.depend

File contents unchanged.

otherlibs/systhreads/Makefile

File contents unchanged.

otherlibs/systhreads/st_posix.h

File contents unchanged.

otherlibs/systhreads/st_stubs.c

File contents unchanged.

otherlibs/systhreads/st_win32.h

File contents unchanged.

otherlibs/systhreads/thread.ml

File contents unchanged.

otherlibs/systhreads/threads.h

File contents unchanged.

otherlibs/threads/.depend

File contents unchanged.

otherlibs/threads/Makefile

File contents unchanged.

otherlibs/threads/event.mli

File contents unchanged.

otherlibs/threads/pervasives.ml

File contents unchanged.

otherlibs/threads/unix.ml

File contents unchanged.

otherlibs/unix/.depend

File contents unchanged.

otherlibs/unix/Makefile

File contents unchanged.

otherlibs/unix/fork.c

File contents unchanged.

otherlibs/unix/lseek.c

File contents unchanged.

otherlibs/unix/open.c

File contents unchanged.

otherlibs/unix/putenv.c

File contents unchanged.

otherlibs/unix/unix.ml

File contents unchanged.

otherlibs/unix/unix.mli

File contents unchanged.

otherlibs/unix/unixLabels.mli