Commits

camlspotter committed 0258cae Merge

fixing custom

  • Participants
  • Parent commits f86da01, d5d857d
  • Branches custom-fix

Comments (0)

Files changed (631)

File .depend

File contents unchanged.

File .hgignore

File contents unchanged.

File .hgtags

File contents unchanged.

File 0scripts/0BUILD.sh

File contents unchanged.

File 0scripts/0CHECKOUT-SVN

File contents unchanged.

File Changes

File contents unchanged.

File INSTALL

File contents unchanged.

File Makefile

File contents unchanged.

File Makefile.nt

File contents unchanged.

File README

File contents unchanged.

File README.win32

File contents unchanged.

File VERSION

File contents unchanged.

File _tags

File contents unchanged.

File asmcomp/amd64/arch.ml

File contents unchanged.

File asmcomp/amd64/emit.mlp

File contents unchanged.

File asmcomp/amd64/emit_nt.mlp

File contents unchanged.

File asmcomp/amd64/proc.ml

File contents unchanged.

File asmcomp/amd64/selection.ml

File contents unchanged.

File asmcomp/arm/arch.ml

File contents unchanged.

File asmcomp/arm/emit.mlp

File contents unchanged.

File asmcomp/arm/proc.ml

File contents unchanged.

File asmcomp/arm/scheduling.ml

File contents unchanged.

File asmcomp/arm/selection.ml

File contents unchanged.

File asmcomp/asmgen.ml

File contents unchanged.

File asmcomp/asmgen.mli

File contents unchanged.

File asmcomp/asmlibrarian.ml

File contents unchanged.

File asmcomp/asmlink.ml

File contents unchanged.

File asmcomp/asmlink.mli

File contents unchanged.

File asmcomp/asmpackager.ml

File contents unchanged.

File asmcomp/asmpackager.mli

File contents unchanged.

File asmcomp/clambda.ml

File contents unchanged.

File asmcomp/clambda.mli

File contents unchanged.

File asmcomp/closure.ml

File contents unchanged.

File asmcomp/cmm.ml

File contents unchanged.

File asmcomp/cmm.mli

File contents unchanged.

File asmcomp/cmmgen.ml

File contents unchanged.

File asmcomp/cmmgen.mli

File contents unchanged.

File asmcomp/cmx_format.mli

File contents unchanged.

File asmcomp/compilenv.ml

File contents unchanged.

File asmcomp/compilenv.mli

File contents unchanged.

File asmcomp/debuginfo.ml

File contents unchanged.

File asmcomp/debuginfo.mli

File contents unchanged.

File asmcomp/emitaux.ml

File contents unchanged.

File asmcomp/emitaux.mli

File contents unchanged.

File asmcomp/i386/arch.ml

File contents unchanged.

File asmcomp/i386/emit.mlp

File contents unchanged.

File asmcomp/i386/emit_nt.mlp

File contents unchanged.

File asmcomp/i386/proc.ml

File contents unchanged.

File asmcomp/i386/selection.ml

File contents unchanged.

File asmcomp/linearize.ml

File contents unchanged.

File asmcomp/linearize.mli

File contents unchanged.

File asmcomp/liveness.ml

File contents unchanged.

File asmcomp/liveness.mli

File contents unchanged.

File asmcomp/mach.ml

File contents unchanged.

File asmcomp/mach.mli

File contents unchanged.

File asmcomp/power/arch.ml

File contents unchanged.

File asmcomp/power/emit.mlp

File contents unchanged.

File asmcomp/power/selection.ml

File contents unchanged.

File asmcomp/printcmm.ml

File contents unchanged.

File asmcomp/printlinear.ml

File contents unchanged.

File asmcomp/printmach.ml

File contents unchanged.

File asmcomp/reloadgen.ml

File contents unchanged.

File asmcomp/schedgen.ml

File contents unchanged.

File asmcomp/selectgen.ml

File contents unchanged.

File asmcomp/selectgen.mli

File contents unchanged.

File asmcomp/sparc/arch.ml

File contents unchanged.

File asmcomp/sparc/emit.mlp

File contents unchanged.

File asmcomp/sparc/selection.ml

File contents unchanged.

File asmcomp/spill.ml

File contents unchanged.

File asmcomp/split.ml

File contents unchanged.

File asmrun/Makefile

File contents unchanged.

File asmrun/Makefile.nt

File contents unchanged.

File asmrun/amd64.S

File contents unchanged.

File asmrun/amd64nt.asm

File contents unchanged.

File asmrun/arm.S

File contents unchanged.

File asmrun/backtrace.c

File contents unchanged.

File asmrun/fail.c

File contents unchanged.

File asmrun/i386.S

File contents unchanged.

File asmrun/i386nt.asm

File contents unchanged.

File asmrun/natdynlink.c

File contents unchanged.

File asmrun/power-elf.S

File contents unchanged.

File asmrun/power-rhapsody.S

File contents unchanged.

File asmrun/roots.c

File contents unchanged.

File asmrun/signals_asm.c

File contents unchanged.

File asmrun/signals_osdep.h

File contents unchanged.

File asmrun/sparc.S

File contents unchanged.

File asmrun/stack.h

File contents unchanged.

File asmrun/startup.c

File contents unchanged.

File boot/.ignore

File contents unchanged.

File boot/myocamlbuild.boot

Binary file modified.

File boot/ocamlc

Binary file modified.

File boot/ocamldep

Binary file modified.

File boot/ocamllex

Binary file modified.

File build/camlp4-byte-only.sh

File contents unchanged.

File build/camlp4-native-only.sh

File contents unchanged.

File build/distclean.sh

File contents unchanged.

File build/fastworld.sh

File contents unchanged.

File build/install.sh

File contents unchanged.

File build/mixed-boot.sh

File contents unchanged.

File build/mkconfig.sh

File contents unchanged.

File build/mkmyocamlbuild_config.sh

File contents unchanged.

File build/myocamlbuild.sh

File contents unchanged.

File build/ocamlbuild-byte-only.sh

File contents unchanged.

File build/ocamlbuild-native-only.sh

File contents unchanged.

File build/ocamlbuildlib-native-only.sh

File contents unchanged.

File build/otherlibs-targets.sh

File contents unchanged.

File build/partial-install.sh

File contents unchanged.

File build/world.sh

File contents unchanged.

File bytecomp/bytegen.ml

File contents unchanged.

File bytecomp/bytelibrarian.ml

File contents unchanged.

File bytecomp/bytelibrarian.mli

File contents unchanged.

File bytecomp/bytelink.ml

File contents unchanged.

File bytecomp/bytelink.mli

File contents unchanged.

File bytecomp/bytepackager.ml

File contents unchanged.

File bytecomp/bytepackager.mli

File contents unchanged.

File bytecomp/bytesections.ml

File contents unchanged.

File bytecomp/instruct.ml

File contents unchanged.

File bytecomp/lambda.ml

File contents unchanged.

File bytecomp/lambda.mli

File contents unchanged.

File bytecomp/matching.ml

File contents unchanged.

File bytecomp/printlambda.ml

File contents unchanged.

File bytecomp/printlambda.mli

File contents unchanged.

File bytecomp/simplif.ml

File contents unchanged.

File bytecomp/symtable.ml

File contents unchanged.

File bytecomp/symtable.mli

File contents unchanged.

File bytecomp/translclass.ml

File contents unchanged.

File bytecomp/translclass.mli

File contents unchanged.

File bytecomp/translcore.ml

File contents unchanged.

File bytecomp/translcore.mli

File contents unchanged.

File bytecomp/translmod.ml

File contents unchanged.

File bytecomp/typeopt.ml

File contents unchanged.

File byterun/.ignore

File contents unchanged.

File byterun/Makefile

File contents unchanged.

File byterun/Makefile.common

File contents unchanged.

File byterun/alloc.h

File contents unchanged.

File byterun/array.c

File contents unchanged.

File byterun/backtrace.c

File contents unchanged.

File byterun/callback.c

File contents unchanged.

File byterun/callback.h

File contents unchanged.

File byterun/compact.c

File contents unchanged.

File byterun/compare.c

File contents unchanged.

File byterun/config.h

File contents unchanged.

File byterun/custom.h

File contents unchanged.

File byterun/debugger.c

File contents unchanged.

File byterun/debugger.h

File contents unchanged.

File byterun/extern.c

File contents unchanged.

File byterun/fail.h

File contents unchanged.

File byterun/finalise.c

File contents unchanged.

File byterun/fix_code.c

File contents unchanged.

File byterun/fix_code.h

File contents unchanged.

File byterun/floats.c

File contents unchanged.

File byterun/gc_ctrl.c

File contents unchanged.

File byterun/hash.c

File contents unchanged.

File byterun/hash.h

File contents unchanged.

File byterun/intern.c

File contents unchanged.

File byterun/intext.h

File contents unchanged.

File byterun/ints.c

File contents unchanged.

File byterun/io.c

File contents unchanged.

File byterun/io.h

File contents unchanged.

File byterun/md5.c

File contents unchanged.

File byterun/md5.h

File contents unchanged.

File byterun/memory.c

File contents unchanged.

File byterun/memory.h

File contents unchanged.

File byterun/meta.c

File contents unchanged.

File byterun/minor_gc.c

File contents unchanged.

File byterun/mlvalues.h

File contents unchanged.

File byterun/obj.c

File contents unchanged.

File byterun/parsing.c

File contents unchanged.

File byterun/printexc.c

File contents unchanged.

File byterun/printexc.h

File contents unchanged.

File byterun/signals.h

File contents unchanged.

File byterun/startup.c

File contents unchanged.

File byterun/sys.c

File contents unchanged.

File byterun/win32.c

File contents unchanged.

File camlp4/Camlp4/Camlp4Ast.partial.ml

File contents unchanged.

File camlp4/Camlp4/Debug.ml

File contents unchanged.

File camlp4/Camlp4/Printers/OCaml.ml

File contents unchanged.

File camlp4/Camlp4/Printers/OCamlr.ml

File contents unchanged.

File camlp4/Camlp4/Sig.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml

File contents unchanged.

File camlp4/Camlp4/Struct/FreeVars.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Dynamic.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Insert.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Parser.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Parser.mli

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Static.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Structure.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Grammar/Tools.ml

File contents unchanged.

File camlp4/Camlp4/Struct/Lexer.mll

File contents unchanged.

File camlp4/Camlp4/Struct/Token.ml

File contents unchanged.

File 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.");

File camlp4/Camlp4Filters/Camlp4FoldGenerator.ml

File contents unchanged.

File camlp4/Camlp4Filters/Camlp4MetaGenerator.ml

File contents unchanged.

File camlp4/Camlp4Parsers/Camlp4GrammarParser.ml

File contents unchanged.

File camlp4/Camlp4Parsers/Camlp4ListComprehension.ml

File contents unchanged.

File camlp4/Camlp4Parsers/Camlp4MacroParser.ml

File contents unchanged.

File camlp4/Camlp4Parsers/Camlp4OCamlParser.ml

File contents unchanged.

File camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml

File contents unchanged.

File camlp4/Camlp4Top/Top.ml

File contents unchanged.

File camlp4/Camlp4_config.ml

File contents unchanged.

File camlp4/boot/Camlp4.ml

File contents unchanged.

File camlp4/boot/Camlp4Ast.ml

File contents unchanged.

File 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.");

File config/Makefile-templ

File contents unchanged.

File config/Makefile.mingw

File contents unchanged.

File config/Makefile.mingw64

File contents unchanged.

File config/Makefile.msvc

File contents unchanged.

File config/Makefile.msvc64

File contents unchanged.

File config/auto-aux/expm1.c

File contents unchanged.

File config/s-nt.h

File contents unchanged.

File configure

File contents unchanged.

File debugger/.ignore

File contents unchanged.

File debugger/Makefile.shared

File contents unchanged.

File debugger/command_line.ml

File contents unchanged.

File debugger/debugcom.ml

File contents unchanged.

File debugger/debugcom.mli

File contents unchanged.

File debugger/debugger_config.ml

File contents unchanged.

File debugger/debugger_config.mli

File contents unchanged.

File debugger/envaux.ml

File contents unchanged.

File debugger/eval.ml

File contents unchanged.

File debugger/loadprinter.ml

File contents unchanged.

File debugger/main.ml

File contents unchanged.

File debugger/parser.mly

File contents unchanged.

File debugger/program_loading.ml

File contents unchanged.

File debugger/program_management.ml

File contents unchanged.

File debugger/source.ml

File contents unchanged.

File debugger/unix_tools.ml

File contents unchanged.

File driver/compile.ml

File contents unchanged.

File driver/compile.mli

File contents unchanged.

File driver/errors.ml

File contents unchanged.

File driver/main.ml

File contents unchanged.

File driver/main_args.ml

File contents unchanged.

File driver/main_args.mli

File contents unchanged.

File driver/ocamlcomp.sh.in

File contents unchanged.

File driver/optcompile.ml

File contents unchanged.

File driver/optcompile.mli

File contents unchanged.

File driver/opterrors.ml

File contents unchanged.

File driver/optmain.ml

File contents unchanged.

File driver/pparse.ml

File contents unchanged.

File driver/pparse.mli

File contents unchanged.

File emacs/Makefile

File contents unchanged.

File emacs/README

File contents unchanged.

File emacs/caml-font.el

File contents unchanged.

File emacs/caml-help.el

File contents unchanged.

File emacs/caml-hilit.el

File contents unchanged.

File emacs/caml-types.el

File contents unchanged.

File emacs/caml.el

File contents unchanged.

File emacs/camldebug.el

File contents unchanged.

File emacs/inf-caml.el

File contents unchanged.

File experimental/garrigue/variable-names-Tvar.diffs

File contents unchanged.

File lex/Makefile

File contents unchanged.

File lex/cset.mli

File contents unchanged.

File lex/lexer.mll

File contents unchanged.

File lex/main.ml

File contents unchanged.

File man/Makefile

File contents unchanged.

File man/ocaml.m

File contents unchanged.

File man/ocamlc.m

File contents unchanged.

File man/ocamlcp.m

File contents unchanged.

File man/ocamldoc.m

File contents unchanged.

File man/ocamlopt.m

File contents unchanged.

File man/ocamlrun.m

File contents unchanged.

File myocamlbuild.ml

File contents unchanged.

File myocamlbuild_config.mli

File contents unchanged.

File ocamlbuild/_tags

File contents unchanged.

File ocamlbuild/hygiene.ml

File contents unchanged.

File ocamlbuild/man/ocamlbuild.1

File contents unchanged.

File ocamlbuild/my_std.ml

File contents unchanged.

File ocamlbuild/ocaml_compiler.ml

File contents unchanged.

File ocamlbuild/ocaml_specific.ml

File contents unchanged.

File ocamlbuild/ocamlbuild_unix_plugin.ml

File contents unchanged.

File ocamlbuild/options.ml

File contents unchanged.

File ocamlbuild/slurp.ml

File contents unchanged.

File ocamldoc/.depend

File contents unchanged.

File ocamldoc/Makefile

File contents unchanged.

File ocamldoc/Makefile.nt

File contents unchanged.

File ocamldoc/generators/odoc_literate.ml

File contents unchanged.

File ocamldoc/generators/odoc_todo.ml

File contents unchanged.

File ocamldoc/odoc_analyse.ml

File contents unchanged.

File ocamldoc/odoc_args.ml

File contents unchanged.

File ocamldoc/odoc_args.mli

File contents unchanged.

File ocamldoc/odoc_ast.ml

File contents unchanged.

File ocamldoc/odoc_comments_global.ml

File contents unchanged.

File ocamldoc/odoc_cross.ml

File contents unchanged.

File ocamldoc/odoc_gen.ml

File contents unchanged.

File ocamldoc/odoc_gen.mli

File contents unchanged.

File ocamldoc/odoc_html.ml

File contents unchanged.

File ocamldoc/odoc_info.ml

File contents unchanged.

File ocamldoc/odoc_info.mli

File contents unchanged.

File ocamldoc/odoc_latex.ml

File contents unchanged.

File ocamldoc/odoc_lexer.mll

File contents unchanged.

File ocamldoc/odoc_man.ml

File contents unchanged.

File ocamldoc/odoc_merge.mli

File contents unchanged.

File ocamldoc/odoc_messages.ml

File contents unchanged.

File ocamldoc/odoc_misc.ml

File contents unchanged.

File ocamldoc/odoc_name.ml

File contents unchanged.

File ocamldoc/odoc_name.mli

File contents unchanged.

File ocamldoc/odoc_parser.mly

File contents unchanged.

File ocamldoc/odoc_scan.ml

File contents unchanged.

File ocamldoc/odoc_sig.ml

File contents unchanged.

File ocamldoc/odoc_str.ml

File contents unchanged.

File ocamldoc/odoc_test.ml

File contents unchanged.

File ocamldoc/odoc_texi.ml

File contents unchanged.

File ocamldoc/odoc_text_lexer.mll

File contents unchanged.

File ocamldoc/odoc_to_text.ml

File contents unchanged.

File ocamldoc/odoc_types.ml

File contents unchanged.

File ocamldoc/odoc_types.mli

File contents unchanged.

File ocamldoc/remove_DEBUG

File contents unchanged.

File otherlibs/Makefile.shared

File contents unchanged.

File otherlibs/bigarray/.depend

File contents unchanged.

File otherlibs/bigarray/bigarray.h

File contents unchanged.

File otherlibs/bigarray/bigarray.ml

File contents unchanged.

File otherlibs/bigarray/bigarray.mli

File contents unchanged.

File otherlibs/bigarray/bigarray_stubs.c

File contents unchanged.

File otherlibs/bigarray/mmap_unix.c

File contents unchanged.

File otherlibs/bigarray/mmap_win32.c

File contents unchanged.

File otherlibs/dynlink/Makefile

File contents unchanged.

File otherlibs/dynlink/dynlink.ml

File contents unchanged.

File otherlibs/dynlink/dynlink.mli

File contents unchanged.

File otherlibs/dynlink/natdynlink.ml

File contents unchanged.

File otherlibs/graph/.depend

File contents unchanged.

File otherlibs/graph/graphicsX11.mli

File contents unchanged.

File otherlibs/graph/libgraph.h

File contents unchanged.

File otherlibs/labltk/Makefile

File contents unchanged.

File otherlibs/labltk/Makefile.nt

File contents unchanged.

File otherlibs/labltk/README

File contents unchanged.

File otherlibs/labltk/browser/.depend

File contents unchanged.

File otherlibs/labltk/browser/.ignore

File contents unchanged.

File otherlibs/labltk/browser/Makefile.shared

File contents unchanged.

File otherlibs/labltk/browser/editor.ml

File contents unchanged.

File otherlibs/labltk/browser/jg_box.ml

File contents unchanged.

File otherlibs/labltk/browser/mytypes.mli

File contents unchanged.

File otherlibs/labltk/browser/searchid.ml

File contents unchanged.

File otherlibs/labltk/browser/searchpos.ml

File contents unchanged.

File otherlibs/labltk/browser/typecheck.ml

File contents unchanged.

File otherlibs/labltk/browser/viewer.ml

File contents unchanged.

File otherlibs/labltk/builtin/builtini_ScrollValue.ml

File contents unchanged.

File otherlibs/labltk/camltk/Makefile

File contents unchanged.

File otherlibs/labltk/camltk/Makefile.gen

File contents unchanged.

File otherlibs/labltk/compiler/Makefile

File contents unchanged.

File otherlibs/labltk/compiler/compile.ml

File contents unchanged.