Permalink
Browse files

merge changes from branching of 3.12 to release/3.12.0

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent 7132655 commit dbf6fb1ac7f7cca349f45c5e65f6c19238221811 doligez committed Aug 2, 2010
Showing with 10,262 additions and 8,268 deletions.
  1. +10 −8 .depend
  2. +11 −0 Changes
  3. +0 −5 INSTALL
  4. +4 −0 Makefile
  5. +6 −6 Makefile.nt
  6. +97 −72 README.win32
  7. +1 −1 VERSION
  8. +0 −1 _tags
  9. +618 −618 asmrun/.depend
  10. BIN boot/ocamlc
  11. BIN boot/ocamldep
  12. BIN boot/ocamllex
  13. +11 −8 build/camlp4-bootstrap-recipe.txt
  14. +3 −0 build/camlp4-bootstrap.sh
  15. +24 −0 build/camlp4-mkCamlp4Ast.sh
  16. +275 −272 byterun/.depend
  17. +1 −1 byterun/Makefile
  18. +4 −1 byterun/unix.c
  19. +48 −20 camlp4/Camlp4/Camlp4Ast.partial.ml
  20. +8 −0 camlp4/Camlp4/OCamlInitSyntax.ml
  21. +65 −46 camlp4/Camlp4/Printers/OCaml.ml
  22. +9 −8 camlp4/Camlp4/Printers/OCaml.mli
  23. +15 −8 camlp4/Camlp4/Printers/OCamlr.ml
  24. +89 −25 camlp4/Camlp4/Sig.ml
  25. +42 −28 camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
  26. +3 −3 camlp4/Camlp4/Struct/FreeVars.ml
  27. +0 −1 camlp4/Camlp4/Struct/Grammar.mlpack
  28. +0 −90 camlp4/Camlp4/Struct/Grammar/Context.ml
  29. +5 −7 camlp4/Camlp4/Struct/Grammar/Delete.ml
  30. +3 −2 camlp4/Camlp4/Struct/Grammar/Dynamic.ml
  31. +21 −20 camlp4/Camlp4/Struct/Grammar/Entry.ml
  32. +4 −6 camlp4/Camlp4/Struct/Grammar/Failed.ml
  33. +4 −3 camlp4/Camlp4/Struct/Grammar/Fold.ml
  34. +14 −15 camlp4/Camlp4/Struct/Grammar/Insert.ml
  35. +171 −128 camlp4/Camlp4/Struct/Grammar/Parser.ml
  36. +15 −20 camlp4/Camlp4/Struct/Grammar/Parser.mli
  37. +4 −2 camlp4/Camlp4/Struct/Grammar/Print.ml
  38. +5 −1 camlp4/Camlp4/Struct/Grammar/Search.ml
  39. +2 −1 camlp4/Camlp4/Struct/Grammar/Static.ml
  40. +20 −8 camlp4/Camlp4/Struct/Grammar/Structure.ml
  41. +110 −13 camlp4/Camlp4/Struct/Grammar/Tools.ml
  42. +1 −1 camlp4/Camlp4/Struct/Lexer.mll
  43. +1 −1 camlp4/Camlp4Filters/Camlp4FoldGenerator.ml
  44. +2 −1 camlp4/Camlp4Filters/Camlp4MetaGenerator.ml
  45. +6 −1 camlp4/Camlp4Parsers/Camlp4GrammarParser.ml
  46. +3 −2 camlp4/Camlp4Parsers/Camlp4ListComprehension.ml
  47. +21 −98 camlp4/Camlp4Parsers/Camlp4OCamlParser.ml
  48. +137 −119 camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml
  49. +2 −2 camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml
  50. +7 −0 camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml
  51. +4,902 −4,170 camlp4/boot/Camlp4.ml
  52. +0 −1 camlp4/boot/Camlp4.ml4
  53. +362 −117 camlp4/boot/Camlp4Ast.ml
  54. +2,291 −1,709 camlp4/boot/camlp4boot.ml
  55. +1 −1 config/Makefile.msvc
  56. +1 −1 config/Makefile.msvc64
  57. +12 −12 configure
  58. +1 −0 driver/main_args.ml
  59. +1 −1 myocamlbuild.ml
  60. +1 −2 ocamlbuild/discard_printf.ml
  61. +1 −1 ocamlbuild/ocamlbuild_unix_plugin.ml
  62. +0 −2 ocamldoc/.depend
  63. +1 −1 ocamldoc/Makefile
  64. +1 −0 ocamldoc/odoc_cross.ml
  65. +43 −2 ocamldoc/odoc_name.ml
  66. +4 −0 ocamldoc/odoc_name.mli
  67. +3 −1 ocamldoc/odoc_text_lexer.mll
  68. +15 −15 otherlibs/bigarray/.depend
  69. +100 −60 otherlibs/graph/.depend
  70. +11 −2 otherlibs/labltk/lib/Makefile
  71. +1 −0 otherlibs/labltk/lib/labltk.bat
  72. +10 −10 otherlibs/num/.depend
  73. +5 −5 otherlibs/str/.depend
  74. +10 −10 otherlibs/systhreads/.depend
  75. +20 −23 otherlibs/threads/.depend
  76. +355 −351 otherlibs/unix/.depend
  77. +1 −1 stdlib/map.mli
  78. +1 −0 stdlib/pervasives.ml
  79. +10 −0 testsuite/tests/typing-objects-bugs/pr4824_ok.ml
  80. +6 −0 testsuite/tests/typing-objects-bugs/pr4824a_bad.ml
  81. +10 −0 testsuite/tests/typing-poly/poly.ml
  82. +9 −0 testsuite/tests/typing-poly/poly.ml.principal.reference
  83. +9 −0 testsuite/tests/typing-poly/poly.ml.reference
  84. +1 −0 tools/.cvsignore
  85. +8 −10 tools/.depend
  86. +1 −1 tools/Makefile.shared
  87. +35 −23 typing/ctype.ml
  88. +1 −1 typing/ctype.mli
  89. +6 −0 typing/includeclass.ml
  90. +73 −36 typing/typecore.ml
  91. +35 −25 typing/typemod.ml
  92. +2 −1 typing/typetexp.ml
View
@@ -216,17 +216,19 @@ typing/typeclass.cmx: utils/warnings.cmx typing/typetexp.cmx typing/types.cmx \
typing/typecore.cmo: utils/warnings.cmi typing/typetexp.cmi typing/types.cmi \
typing/typedtree.cmi typing/subst.cmi typing/stypes.cmi \
typing/printtyp.cmi typing/primitive.cmi typing/predef.cmi \
- typing/path.cmi parsing/parsetree.cmi typing/parmatch.cmi utils/misc.cmi \
- parsing/longident.cmi parsing/location.cmi typing/ident.cmi \
- typing/env.cmi typing/ctype.cmi utils/clflags.cmi typing/btype.cmi \
- parsing/asttypes.cmi typing/annot.cmi typing/typecore.cmi
+ typing/path.cmi parsing/parsetree.cmi typing/parmatch.cmi \
+ typing/oprint.cmi utils/misc.cmi parsing/longident.cmi \
+ parsing/location.cmi typing/ident.cmi typing/env.cmi typing/ctype.cmi \
+ utils/clflags.cmi typing/btype.cmi parsing/asttypes.cmi typing/annot.cmi \
+ typing/typecore.cmi
typing/typecore.cmx: utils/warnings.cmx typing/typetexp.cmx typing/types.cmx \
typing/typedtree.cmx typing/subst.cmx typing/stypes.cmx \
typing/printtyp.cmx typing/primitive.cmx typing/predef.cmx \
- typing/path.cmx parsing/parsetree.cmi typing/parmatch.cmx utils/misc.cmx \
- parsing/longident.cmx parsing/location.cmx typing/ident.cmx \
- typing/env.cmx typing/ctype.cmx utils/clflags.cmx typing/btype.cmx \
- parsing/asttypes.cmi typing/annot.cmi typing/typecore.cmi
+ typing/path.cmx parsing/parsetree.cmi typing/parmatch.cmx \
+ typing/oprint.cmx utils/misc.cmx parsing/longident.cmx \
+ parsing/location.cmx typing/ident.cmx typing/env.cmx typing/ctype.cmx \
+ utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi typing/annot.cmi \
+ typing/typecore.cmi
typing/typedecl.cmo: utils/warnings.cmi typing/typetexp.cmi typing/types.cmi \
typing/typedtree.cmi typing/subst.cmi typing/printtyp.cmi \
typing/primitive.cmi typing/predef.cmi typing/path.cmi \
View
@@ -44,6 +44,12 @@ Language features:
inside the signature, removing their respective fields. Among other
uses, this allows to merge two signatures containing identically
named fields.
+* While fixing PR#4824, also corrected a gaping hole in the type checker,
+ which allowed instantiating separately object parameters and instance
+ variables in an interface. This hole was here since the beginning of
+ ocaml, and as a result many programs using object inheritance in a non
+ trivial way will need to be corrected. You can look at lablgtk2 for an
+ example.
Compilers and toplevel:
- Warnings are now numbered and can be switched on and off individually.
@@ -105,8 +111,12 @@ All tools:
Bug Fixes:
- PR#4012: Map.map and Map.mapi do not conform to specification
- PR#4478: better error messages for type definition mismatches
+- PR#4683: labltk script uses fixed path on windows
- PR#4742: finalisation function raising an exception blocks other finalisations
- PR#4775: compiler crash on crazy types (temporary fix)
+- PR#4824: narrowing the type of class parameters with a module specification
+- PR#4862: relaxed value restriction and records
+- PR#4884: optional arguments do not work when Some is redefined
- PR#4964: parenthesized names for infix functions in annot files
- PR#4970: better error message for instance variables
- PR#4975: spelling mistakes
@@ -117,6 +127,7 @@ Bug Fixes:
- PR#5057: fatal typing error with local module + functor + polymorphic variant
- Wrong type for Obj.add_offset.
- Small problem with the representation of Int32, Int64, and Nativeint constants.
+- Use RTLD_LOCAL for native dynlink in private mode.
Objective Caml 3.11.2:
----------------------
View
@@ -222,11 +222,6 @@ An alternative, and faster approach to steps 2 to 5 is
The result is equivalent to "make world opt opt.opt", but this may
fail if anything goes wrong in native-code generation.
-Another alternative, is to use the experimental build system that use
-ocamlbuild instead of make (it replaces steps 2 to 5):
-
- ./build/fastworld.sh
-
6- You can now install the Objective Caml system. This will create the
following commands (in the binary directory selected during
autoconfiguration):
View
@@ -267,6 +267,10 @@ opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
otherlibrariesopt \
ocamllex.opt ocamltoolsopt.opt ocamlbuild.native camlp4opt ocamldoc.opt
+base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+ ocamlbuild.byte camlp4out $(DEBUGGER) ocamldoc ocamlopt.opt \
+ otherlibrariesopt
+
# Installation
install:
if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi
View
@@ -606,23 +606,23 @@ alldepend::
# Camlp4
camlp4out: ocamlc otherlibraries ocamlbuild-mixed-boot ocamlbuild.byte
- OCAMLBUILD_FIND=/usr/bin/find ./build/camlp4-byte-only.sh
+ ./build/camlp4-byte-only.sh
camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot ocamlbuild.native
- OCAMLBUILD_FIND=/usr/bin/find ./build/camlp4-native-only.sh
+ ./build/camlp4-native-only.sh
# Ocamlbuild
ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-mixed-boot
- OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuild-byte-only.sh
+ ./build/ocamlbuild-byte-only.sh
ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot
- OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuild-native-only.sh
+ ./build/ocamlbuild-native-only.sh
ocamlbuildlib.native: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot
- OCAMLBUILD_FIND=/usr/bin/find ./build/ocamlbuildlib-native-only.sh
+ ./build/ocamlbuildlib-native-only.sh
.PHONY: ocamlbuild-mixed-boot
ocamlbuild-mixed-boot:
- OCAMLBUILD_FIND=/usr/bin/find ./build/mixed-boot.sh
+ ./build/mixed-boot.sh
partialclean::
rm -rf _build
View
@@ -44,27 +44,23 @@ The remainder of this document gives more information on each port.
------------------------------------------------------------------------------
- The native Win32 port built with Microsoft Visual C
- ---------------------------------------------------
+ The native Win32 port built with Microsoft Windows SDK
+ ------------------------------------------------------
REQUIREMENTS:
-This port runs under MS Windows Vista, XP, and 2000.
+This port runs under MS Windows 7 (32 and 64 bits), Vista, XP, and 2000.
The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
runs without any additional tools.
-Statically linking Caml bytecode with C code (ocamlc -custom) requires the
-Microsoft Visual C++ compiler (items [1] and [2] in the section
-"third-party software" below) and the flexdll tool (item [5]).
-
-The native-code compiler (ocamlopt) requires Visual C++ (items [1], [2]),
-the Microsoft assembler MASM (item [3]) and the flexdll tool (item [5]).
+The native-code compiler (ocamlopt) requires the Microsoft Windows SDK
+(item [1]) and the flexdll tool (item [2]).
-Instead of items [1], [2] and [3], it is possible to use item [6] which contains
-everything needed.
+Statically linking Caml bytecode with C code (ocamlc -custom) also requires
+items [1] and [2].
-The LablTk GUI requires Tcl/Tk 8.5 (item [4]).
+The LablTk GUI requires Tcl/Tk 8.5 (item [3]).
INSTALLATION:
@@ -79,53 +75,69 @@ installer) must be added to the PATH environment variable.
To compile programs that use the LablTK GUI, the directory where the
libraries tk85.lib and tcl85.lib were installed (by the Tcl/Tk
installer) must be added to the library search path in the LIB
-environment variable. E.g. if Tcl/Tk was installed in C:\tcl, add
-"C:\tcl\lib" to the LIB environment variable.
+environment variable. E.g. if Tcl/Tk was installed in C:\Tcl, add
+"C:\Tcl\lib" to the LIB environment variable.
THIRD-PARTY SOFTWARE:
-[1] Visual C++ version 2008, 2005, 2003, or 6.
- We use Visual C++ 2008 Express Edition, which can be downloaded for free
- from http://www.microsoft.com.
+[1] Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 Service Pack 1.
+ Can be downloaded for free from
+ http://www.microsoft.com/downloads/en/default.aspx
+ under the name "Microsoft Windows 7 SDK".
-[2] Windows header files and development libraries. They are included
- in the Visual C++ 2008 Express Edition distribution.
- Otherwise, you can find them in the Windows Platform SDK,
- which can be downloaded for free from http://www.microsoft.com/.
-
-[3] MASM version 6.11 or later. The full distribution of Visual C++ 2005
- or 2008 contains MASM version 8. Users of the Express Edition of Visual C++
- 2005 can download MASM version 8 from
-http://www.microsoft.com/downloads/details.aspx?FamilyID=7A1C9DA0-0510-44A2-B042-7EF370530C64&displaylang=en
- To obtain MASM version 6.11, see
- http://users.easystreet.com/jkirwan/new/pctools.html.
-
-[4] TCL/TK version 8.5. Windows binaries are available as part of the
- ActiveTCL distribution at http://www.activestate.com/products/ActiveTcl/
-
-[5] flexdll.
+[2] flexdll version 0.23 or later.
Can be downloaded from http://alain.frisch.fr/flexdll.html
-[6] Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 Service Pack 1
+[3] TCL/TK version 8.5. Windows binaries are available as part of the
+ ActiveTCL distribution at http://www.activestate.com/products/ActiveTcl/
RECOMPILATION FROM THE SOURCES:
The command-line tools can be recompiled from the Unix source
-distribution (ocaml-X.YZ.tar.gz), which also contains the files modified
+distribution (ocaml-X.YY.Z.tar.gz), which also contains the files modified
for Windows.
You will need the following software components to perform the recompilation:
-- Windows NT, 2000, XP, or Vista.
-- Items [1], [2], [3], [4] and [5] from the list of recommended software above.
+- Windows NT, 2000, XP, Vista, or 7 (32 or 64 bits).
+- Items [1], [2] and [3] from the list of recommended software above.
+ Make sure to install the 32-bit version of TCL/TK, even if you are
+ compiling on a 64-bit Windows.
- The Cygwin port of GNU tools, available from http://www.cygwin.com/
Install at least the following packages: diffutils, make, ncurses.
-Remember to add the directory where the libraries tk84.lib and
-tcl84.lib were installed (by the Tcl/Tk installer) to the LIB variable
-(library search path).
-
-To recompile, start a Cygwin shell and change to the top-level
+First, you need to set up your cygwin environment for using the MS
+tools. The following assumes that you have installed [1], [2], and [3]
+in their default directories. If this is not the case, you will need
+to adjust the paths accordingly.
+
+ Open a Windows Command Prompt and enter the following command:
+ set PFPATH=C:\Program Files
+ If you are compiling on the 64-bit version of Windows 7, enter the
+ following instead:
+ set PFPATH=C:\Program Files (x86)
+
+ Then enter the following commands:
+ cd "%PFPATH%\Microsoft Visual Studio 9.0\VC\bin"
+ vcvars32
+ echo VCPATH="`cygpath -p '%Path%'`" >C:\cygwin\tmp\msenv
+ echo LIB="%LIB%;C:\Tcl\lib" >>C:\cygwin\tmp\msenv
+ echo LIBPATH="%LIBPATH%" >>C:\cygwin\tmp\msenv
+ echo INCLUDE="%INCLUDE%;C:\Tcl\include" >>C:\cygwin\tmp\msenv
+ echo FLPATH="`cygpath '%PFPATH%\flexdll'`" >>C:\cygwin\tmp\msenv
+ echo PATH="${VCPATH}:$PATH:${FLPATH}" >>C:\cygwin\tmp\msenv
+ echo export PATH LIB LIBPATH INCLUDE >>C:\cygwin\tmp\msenv
+ echo export OCAMLBUILD_FIND=/usr/bin/find >>C:\cygwin\tmp\msenv
+
+ Open a Cygwin shell and enter the following commands:
+ tr -d '\r' </tmp/msenv >.msenv32
+ echo '. $HOME/.msenv32' >>.bashrc
+
+Now, close the Command Prompt and the shell and you're set up for
+using the MS tools under Cygwin.
+
+
+To recompile OCaml, start a new Cygwin shell and change to the top-level
directory of the OCaml distribution. Then, do
cp config/m-nt.h config/m.h
@@ -145,11 +157,6 @@ Finally, use "make -f Makefile.nt" to build the system, e.g.
make -f Makefile.nt opt.opt
make -f Makefile.nt install
-Alternatively you can use the experimental build procedure using ocamlbuild:
-
- ./build/fastworld.sh
- ./build/install.sh
-
NOTES:
* The VC++ compiler does not implement "computed gotos", and therefore
@@ -191,7 +198,7 @@ and the flexdll tool, available at
http://alain.frisch.fr/flexdll.html
You will need to install at least the following Cygwin packages (use
the Setup tool from Cygwin):
-binutils, gcc-core, gcc-mingw-core, mingw-runtime, w32-api.
+binutils, gcc-core, gcc-mingw-core, mingw-runtime, w32api.
Do *not* install the Mingw/MSYS development tools from www.mingw.org:
these are not compatible with this Caml port (@responsefile not
@@ -200,6 +207,8 @@ recognized on the command line).
The LablTk GUI requires Tcl/Tk 8.5. Windows binaries are available
as part of the ActiveTCL distribution at
http://www.activestate.com/products/ActiveTcl/
+Note that you will need to install the 32-bit version of ActiveTCL,
+even if you are on a 64-bit version of Windows.
INSTALLATION:
@@ -232,7 +241,7 @@ companion MSYS tools: these have problems with long command lines.
Instead, use the version of MinGW provided by Cygwin.
Start a Cygwin shell and unpack the source distribution
-(ocaml-X.YZ.tar.gz) with "tar xzf". Change to the top-level
+(ocaml-X.YY.Z.tar.gz) with "tar xzf". Change to the top-level
directory of the OCaml distribution. Then, do
cp config/m-nt.h config/m.h
@@ -297,12 +306,13 @@ The replay debugger is supported.
------------------------------------------------------------------------------
- The native Win64 port built with the Microsoft Platform SDK compilers
- ---------------------------------------------------------------------
+ The native Win64 port built with Microsoft Windows SDK
+ ------------------------------------------------------
REQUIREMENTS:
-This port runs under MS Windows XP 64 and Server 64 on Intel64/AMD64 machines.
+This port runs under MS Windows XP 64, Windows Server 64, and
+Windows 7 64 on Intel64/AMD64 machines.
The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
runs without any additional tools.
@@ -314,6 +324,7 @@ Microsoft Platform SDK compiler (item [1] in the section
The native-code compiler (ocamlopt) requires the Microsoft compiler
and the Microsoft assembler MASM64 (item [1]) and the flexdll tool (item [2]).
+The LablTk GUI is not available in this version.
INSTALLATION:
@@ -323,34 +334,54 @@ described below.
THIRD-PARTY SOFTWARE:
-[1] Microsoft Windows Server 2003 R2 Platform SDK for AMD64 (PSDK-amd64.exe).
- Can be downloaded for free from http://www.microsoft.com/.
- Includes all we need, namely a C compiler, the masm64 assembler,
- Windows libraries and include files.
+[1] Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 Service Pack 1.
+ Can be downloaded for free from
+ http://www.microsoft.com/downloads/en/default.aspx
+ under the name "Microsoft Windows 7 SDK".
- Alternatively, the more recent SDK:
- Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 Service Pack 1
- can be used.
-
-[2] flexdll.
+[2] flexdll version 0.23 or later.
Can be downloaded from http://alain.frisch.fr/flexdll.html
-
RECOMPILATION FROM THE SOURCES:
The command-line tools can be recompiled from the Unix source
distribution (ocaml-X.YZ.tar.gz), which also contains the files modified
for Windows.
You will need the following software components to perform the recompilation:
-- Windows XP 64 or Server 64.
-- The Platform SDK (item [1] from the list of recommended software above).
+- Windows XP 64, Windows Server 64, or Windows 7 64.
+- Items [1] and [2] from the list of recommended software above.
- The Cygwin port of GNU tools, available from http://www.cygwin.com/
Install at least the following packages: diffutils, make, ncurses.
-- The flexdll tool (see above).
-To recompile, start a Cygwin shell and change to the top-level
+First, you need to set up your cygwin environment for using the MS
+tools. The following assumes that you have installed [1] and [2]
+in their default directories. If this is not the case, you will need
+to adjust the paths accordingly.
+
+ Open a Windows Command Prompt and enter the following commands:
+ set PFPATH=C:\Program Files (x86)
+ cd "%PFPATH%\Microsoft Visual Studio 9.0\VC\bin"
+ vcvars64
+ echo VCPATH="`cygpath -p '%Path%'`" >C:\cygwin\tmp\msenv
+ echo LIB="%LIB%;C:\Tcl\lib" >>C:\cygwin\tmp\msenv
+ echo LIBPATH="%LIBPATH%" >>C:\cygwin\tmp\msenv
+ echo INCLUDE="%INCLUDE%;C:\Tcl\include" >>C:\cygwin\tmp\msenv
+ echo FLPATH="`cygpath '%PFPATH%\flexdll'`" >>C:\cygwin\tmp\msenv
+ echo PATH="${VCPATH}:$PATH:${FLPATH}" >>C:\cygwin\tmp\msenv
+ echo export PATH LIB LIBPATH INCLUDE >>C:\cygwin\tmp\msenv
+ echo export OCAMLBUILD_FIND=/usr/bin/find >>C:\cygwin\tmp\msenv
+
+ Open a Cygwin shell and enter the following commands:
+ tr -d '\r' </tmp/msenv >.msenv64
+ echo '. $HOME/.msenv64' >>.bashrc
+
+Now, close the Command Prompt and the shell and you're set up for
+using the MS tools under Cygwin.
+
+
+To recompile OCaml, start a new Cygwin shell and change to the top-level
directory of the OCaml distribution. Then, do
cp config/m-nt.h config/m.h
@@ -361,12 +392,6 @@ Then, edit config/Makefile as needed, following the comments in this file.
Normally, the only variable that need to be changed is
PREFIX where to install everything
-If, for whatever reason, you want to use the Microsoft Visual C++ 2005
-compiler for AMD64 instead of the Platform SDK compiler, replace the line
- EXTRALIBS=bufferoverflowu.lib
-by
- EXTRALIBS=
-
Finally, use "make -f Makefile.nt" to build the system, e.g.
make -f Makefile.nt world
Oops, something went wrong.

0 comments on commit dbf6fb1

Please sign in to comment.