MAJ et nettoyages

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4944 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 2002-06-20 16:08:46 +00:00
parent be82a1c3d0
commit 19893d17ff
3 changed files with 73 additions and 54 deletions

View File

@ -13,8 +13,8 @@ Here is a summary of the main differences between these ports:
Native MS Native MinGW Cygwin
Third-party software required
- for base bytecode system none none none
- for ocamlc -custom MSVC MinGW Cygwin
- for native-code generation MSVC+MASM MinGW Cygwin
- for ocamlc -custom MSVC MinGW or Cygwin Cygwin
- for native-code generation MSVC+MASM MinGW or Cygwin Cygwin
Speed of bytecode interpreter 70% 100% 100%
@ -26,41 +26,15 @@ The Threads library yes yes no
The Graphics library yes yes no
Restrictions on generated executables? none none yes (*)
(*) Cygwin-generated .exe files refer to a DLL that is distributed under
the GPL. Thus, these .exe files can only be distributed under a license
that is compatible with the GPL. Executables generated by MS VC or by
MinGW have no such restrictions.
The remainder of this document gives more information on each port.
------------------------------------------------------------------------------
The Cygwin port of Objective Caml
---------------------------------
REQUIREMENTS:
This port requires the Cygwin environment from Cygnus/RedHat, which
is freely available at:
http://sources.redhat.com/cygwin/
This port runs under all versions of MS Windows supported by Cygwin,
i.e. Windows 95, 98, ME, NT and 2000 on Intel IA32 machines.
INSTALLATION:
For various reasons, no binary distribution of this port is available.
You need to recompile from the source distribution.
RECOMPILATION FROM THE SOURCES:
Just follow the instructions for Unix machines given in the file INSTALL.
NOTES:
The libraries available in this port are "num", "str", "unix" and "labltk".
"graph" and "threads" are not available yet.
The replay debugger is supported.
------------------------------------------------------------------------------
The native Win32 port built with Microsoft Visual C
@ -82,11 +56,13 @@ supported out of the box, without additional software.
The native-code compiler (ocamlopt) requires Visual C++ version 6
and the Microsoft assembler MASM version 6.11 or later.
MASM can be downloaded for free from Microsoft's Web site;
see the comp.lang.asm.x86 FAQ for directions, or
http://www2.dgsys.com/~raymoon/faq/masm.html
for directions, see
http://www.easystreet.com/~jkirwan/pctools.html
or http://www2.dgsys.com/~raymoon/faq/masm.html
or the comp.lang.asm.x86 FAQ.
The LablTk GUI requires Tcl/Tk 8.3. Windows binaries are
available from ftp://ftp.scriptics.com/pub/tcl/tcl8_3/.
available from http://prdownloads.sourceforge.net/tcl/tcl832.exe.
INSTALLATION:
@ -134,7 +110,10 @@ directory of the OCaml distribution. Then, do
cp config/s-nt.h config/s.h
cp config/Makefile.msvc config/Makefile
Then, edit config/Makefile as needed (see the comments in this file).
Then, edit config/Makefile as needed, following the comments in this file.
Normally, the only variables that need to be changed are
PREFIX where to install everything
TK_ROOT where TCL/TK was installed
Finally, use "make -f Makefile.nt" to build the system, e.g.
@ -146,7 +125,8 @@ Finally, use "make -f Makefile.nt" to build the system, e.g.
NOTES:
* The VC++ compiler does a poor job on byterun/interp.c. Consequently,
* The VC++ compiler does not implement "computed gotos", and therefore
doesn't generate very efficient code for byterun/interp.c. Consequently,
the performance of bytecode programs is about 2/3 of that obtained under
Unix/GCC or Cygwin or Mingw on similar hardware.
@ -177,29 +157,28 @@ The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
runs without any additional tools.
The native-code compiler (ocamlopt), as well as static linking of
Caml bytecode with C code (ocamlc -custom), require the MinGW
Caml bytecode with C code (ocamlc -custom), require either the MinGW
development tools, which is free software available at
http://www.mingw.org/
or the Cygwin development toos, available at
http://sources.redhat.com/cygwin/
The LablTk GUI requires Tcl/Tk 8.0 for MinGW, available from
ftp://ftp.xraylith.wisc.edu/pub/khan/tcl/tcltk-8.0p2-mingw32.zip
The LablTk GUI requires Tcl/Tk 8.3. Windows binaries are
available from http://prdownloads.sourceforge.net/tcl/tcl832.exe.
INSTALLATION:
There is no binary distribution yet, so follow the compilation instructions
below.
There is no binary distribution yet, so please follow the compilation
instructions below.
RECOMPILATION FROM THE SOURCES:
You will need the following software components to perform the recompilation:
- Windows NT, 2000, or XP (we advise against compiling under Windows 95/98/ME)
- MinGW: http://www.mingw.org/
- Cygwin: http://sourceware.cygnus.com/cygwin/
- Make sure that MinGW binaries occur before Cygwin binaries in the PATH
(e.g. PATH=/mingw/bin:/usr/bin/:...)
- TCL/TK version 8.0 for MinGW (see above).
- TCL/TK version 8.3 (see above).
Start a Cygwin shell and unpack the source distribution
(ocaml-X.YZ.tar.gz) with "tar xzf". Change to the top-level
@ -209,7 +188,10 @@ directory of the OCaml distribution. Then, do
cp config/s-nt.h config/s.h
cp config/Makefile.mingw config/Makefile
Then, edit config/Makefile as needed (see the comments in this file).
Then, edit config/Makefile as needed, following the comments in this file.
Normally, the only variables that need to be changed are
PREFIX where to install everything
TK_ROOT where TCL/TK was installed
Finally, use "make -f Makefile.nt" to build the system, e.g.
@ -217,6 +199,7 @@ Finally, use "make -f Makefile.nt" to build the system, e.g.
make -f Makefile.nt bootstrap
make -f Makefile.nt opt
make -f Makefile.nt opt.opt
make -f Makefile.nt install
NOTES:
@ -225,3 +208,36 @@ NOTES:
"labltk", and large parts of "unix".
* The replay debugger is not supported.
------------------------------------------------------------------------------
The Cygwin port of Objective Caml
---------------------------------
REQUIREMENTS:
This port requires the Cygwin environment from Cygnus/RedHat, which
is freely available at:
http://sources.redhat.com/cygwin/
This port runs under all versions of MS Windows supported by Cygwin,
i.e. Windows 95, 98, ME, NT and 2000 on Intel IA32 machines.
INSTALLATION:
For various reasons, no binary distribution of this port is available.
You need to recompile from the source distribution.
RECOMPILATION FROM THE SOURCES:
Just follow the instructions for Unix machines given in the file INSTALL.
NOTES:
The libraries available in this port are "num", "str", "unix" and "labltk".
"graph" and "threads" are not available yet.
The replay debugger is supported.

View File

@ -42,8 +42,7 @@ EXE=.exe
########## Configuration for the bytecode compiler
### Which C compiler to use for the bytecode interpreter.
# Can also use "gcc -mno-cygwin"
BYTECC=gcc
BYTECC=gcc -mno-cygwin
### Additional compile-time options for $(BYTECC). (For static linking.)
BYTECCCOMPOPTS=-O -Wall -Wno-unused
@ -108,8 +107,10 @@ OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray labltk
BIGNUM_ARCH=C
### Configuration for LablTk
TK_DEFS=
TK_LINK=-ltk80 -ltcl80
# Set TK_ROOT to the directory where you installed TCL/TK 8.3
TK_ROOT=c:/tcl
TK_DEFS=-I$(TK_ROOT)/include
TK_LINK=$(TK_ROOT)/lib/tk83.lib $(TK_ROOT)/lib/tcl83.lib
############# Aliases for common commands

View File

@ -107,7 +107,9 @@ OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray labltk
BIGNUM_ARCH=C
### Configuration for LablTk
TK_DEFS=-Ic:/Tcl/include
# Set TK_ROOT to the directory where you installed TCL/TK 8.3
TK_ROOT=c:/tcl
TK_DEFS=-I$(TK_ROOT)/include
TK_LINK=tk83.lib tcl83.lib
############# Aliases for common commands