detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2736 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02master
parent
26959fb1d9
commit
469ec90391
25
INSTALL
25
INSTALL
|
@ -69,17 +69,17 @@ The "configure" script accepts the following options:
|
|||
It will *not* work under Digital Unix 3.2 or earlier, SunOS 4,
|
||||
HPUX, AIX, nor Linux without LinuxThreads.
|
||||
|
||||
-tkdefs <cpp flags> (default: none)
|
||||
-tklibs <flags and libraries> (default: determined automatically)
|
||||
These options specify where to find the Tcl/Tk libraries for
|
||||
LablTk. "-tkdefs" helps to find the headers, and "-tklibs"
|
||||
the C libraries. "-tklibs" may contain either only -L/path flags,
|
||||
in which case the library names are determined automatically,
|
||||
or the actual libraries, which are used as given.
|
||||
Example: for a Japanese tcl/tk whose headers are in specific
|
||||
directories and libraries in /usr/local/lib, you can use
|
||||
./configure -tklibs "-L/usr/local/lib -ltk8.0jp -ltcl8.0jp"
|
||||
-tkdefs "-I/usr/local/include/tcl8.0jp -I/usr/local/include/tk8.0jp"
|
||||
-tkdefs <cpp flags> (default: none)
|
||||
-tklibs <flags and libraries> (default: determined automatically)
|
||||
These options specify where to find the Tcl/Tk libraries for
|
||||
LablTk. "-tkdefs" helps to find the headers, and "-tklibs"
|
||||
the C libraries. "-tklibs" may contain either only -L/path flags,
|
||||
in which case the library names are determined automatically,
|
||||
or the actual libraries, which are used as given.
|
||||
Example: for a Japanese tcl/tk whose headers are in specific
|
||||
directories and libraries in /usr/local/lib, you can use
|
||||
./configure -tklibs "-L/usr/local/lib -ltk8.0jp -ltcl8.0jp"
|
||||
-tkdefs "-I/usr/local/include/tcl8.0jp -I/usr/local/include/tk8.0jp"
|
||||
|
||||
Examples:
|
||||
./configure -prefix /usr/bin
|
||||
|
@ -148,7 +148,7 @@ ocamlopt. The ".opt" compilers should run faster than the normal
|
|||
compilers, especially on large input files, but they may take longer
|
||||
to start due to increased code size. If compilation times are an issue on
|
||||
your programs, try the ".opt" compilers to see if they make a
|
||||
significant difference.
|
||||
significant difference.
|
||||
|
||||
6- You can now install the Objective Caml system. This will create the
|
||||
following commands (in the binary directory selected during autoconfiguration):
|
||||
|
@ -234,4 +234,3 @@ If this causes a problem, the solution is to upgrade to 2.7.2.3 or above.
|
|||
unable to compile correctly the runtime system (wrong code is
|
||||
generated for (x - y) where x is a pointer and y an integer).
|
||||
Fix: use gcc.
|
||||
|
||||
|
|
14
LICENSE
14
LICENSE
|
@ -116,8 +116,8 @@ settled by the Court of Versailles.
|
|||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
|
@ -127,7 +127,7 @@ settled by the Court of Versailles.
|
|||
[This is the first released version of the library GPL. It is
|
||||
numbered 2 because it goes with version 2 of the ordinary GPL.]
|
||||
|
||||
Preamble
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
|
@ -217,7 +217,7 @@ works together with the library.
|
|||
Note that it is possible for a library to be covered by the ordinary
|
||||
General Public License rather than by this special one.
|
||||
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library which
|
||||
|
@ -251,7 +251,7 @@ such a program is covered only if its contents constitute a work based
|
|||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
|
@ -529,7 +529,7 @@ decision will be guided by the two goals of preserving the free status
|
|||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
|
@ -552,7 +552,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
|||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
Appendix: How to Apply These Terms to Your New Libraries
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ let get_label n =
|
|||
| _ -> let lbl = new_label() in (lbl, cons_instr (Llabel lbl) n)
|
||||
|
||||
(* Discard all instructions up to the next label.
|
||||
This function is to be called before adding a non-terminating
|
||||
This function is to be called before adding a non-terminating
|
||||
instruction. *)
|
||||
|
||||
let rec discard_dead_code n =
|
||||
|
@ -153,15 +153,15 @@ let rec linear i n =
|
|||
| _, Iend, Lbranch lbl ->
|
||||
copy_instr (Lcondbranch(invert_test test, lbl)) i (linear ifso n1)
|
||||
| Iexit, _, _ ->
|
||||
let n2 = linear ifnot n1 in
|
||||
begin match !exit_label with None -> n2
|
||||
| Some lbl -> copy_instr (Lcondbranch(test, lbl)) i n2
|
||||
end
|
||||
let n2 = linear ifnot n1 in
|
||||
begin match !exit_label with None -> n2
|
||||
| Some lbl -> copy_instr (Lcondbranch(test, lbl)) i n2
|
||||
end
|
||||
| _, Iexit, _ ->
|
||||
let n2 = linear ifso n1 in
|
||||
begin match !exit_label with None -> n2
|
||||
| Some lbl -> copy_instr (Lcondbranch(invert_test test, lbl)) i n2
|
||||
end
|
||||
let n2 = linear ifso n1 in
|
||||
begin match !exit_label with None -> n2
|
||||
| Some lbl -> copy_instr (Lcondbranch(invert_test test, lbl)) i n2
|
||||
end
|
||||
| Iend, _, _ ->
|
||||
let (lbl_end, n2) = get_label n1 in
|
||||
copy_instr (Lcondbranch(test, lbl_end)) i (linear ifnot n2)
|
||||
|
@ -214,7 +214,7 @@ let rec linear i n =
|
|||
| Iexit ->
|
||||
let n1 = linear i.Mach.next n in
|
||||
begin match !exit_label with None -> n1
|
||||
| Some lbl -> add_branch lbl n1
|
||||
| Some lbl -> add_branch lbl n1
|
||||
end
|
||||
| Itrywith(body, handler) ->
|
||||
let (lbl_join, n1) = get_label (linear i.Mach.next n) in
|
||||
|
@ -230,4 +230,3 @@ let fundecl f =
|
|||
{ fun_name = f.Mach.fun_name;
|
||||
fun_body = linear f.Mach.fun_body end_instr;
|
||||
fun_fast = f.Mach.fun_fast }
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ while : ; do
|
|||
-tklibs*|--tklibs*)
|
||||
tk_libs=$2; shift;;
|
||||
-verbose|--verbose)
|
||||
verbose=yes;;
|
||||
verbose=yes;;
|
||||
*) echo "Unknown option \"$1\"." 1>&2; exit 2;;
|
||||
esac
|
||||
shift
|
||||
|
@ -890,30 +890,30 @@ echo
|
|||
echo "** Configuration summary **"
|
||||
echo
|
||||
echo "Directories where Objective Caml will be installed:"
|
||||
echo " binaries.................. $bindir"
|
||||
echo " standard library.......... $libdir"
|
||||
echo " manual pages.............. $mandir (with extension .$manext)"
|
||||
echo " binaries.................. $bindir"
|
||||
echo " standard library.......... $libdir"
|
||||
echo " manual pages.............. $mandir (with extension .$manext)"
|
||||
|
||||
echo "Configuration for the bytecode compiler:"
|
||||
echo " C compiler used........... $bytecc"
|
||||
echo " options for compiling..... $bytecccompopts"
|
||||
echo " options for linking....... $bytecclinkopts $cclibs"
|
||||
echo " C compiler used........... $bytecc"
|
||||
echo " options for compiling..... $bytecccompopts"
|
||||
echo " options for linking....... $bytecclinkopts $cclibs"
|
||||
|
||||
echo "Configuration for the native-code compiler:"
|
||||
if test "$arch" = "none"; then
|
||||
echo " (not supported on this platform)"
|
||||
echo " (not supported on this platform)"
|
||||
else
|
||||
if test "$model" = "default"; then
|
||||
echo " hardware architecture..... $arch"
|
||||
echo " hardware architecture..... $arch"
|
||||
else
|
||||
echo " hardware architecture..... $arch ($model)"
|
||||
echo " hardware architecture..... $arch ($model)"
|
||||
fi
|
||||
if test "$system" = "unknown"; then : ; else
|
||||
echo " OS variant................ $system"
|
||||
echo " OS variant................ $system"
|
||||
fi
|
||||
echo " C compiler used........... $nativecc"
|
||||
echo " options for compiling..... $nativecccompopts"
|
||||
echo " options for linking....... $nativecclinkopts $cclibs"
|
||||
echo " C compiler used........... $nativecc"
|
||||
echo " options for compiling..... $nativecccompopts"
|
||||
echo " options for linking....... $nativecclinkopts $cclibs"
|
||||
echo " assembler ................ \$(AS) $asflags"
|
||||
echo " preprocessed assembler ... $aspp $asppflags"
|
||||
if test "$profiling" = "prof"; then
|
||||
|
@ -930,22 +930,22 @@ else
|
|||
fi
|
||||
|
||||
echo "Configuration for the external libraries:"
|
||||
echo " libraries supported....... $otherlibraries"
|
||||
echo " libraries supported....... $otherlibraries"
|
||||
|
||||
echo "The \"num\" library:"
|
||||
echo " target architecture ...... $bignum_arch"
|
||||
echo " target architecture ...... $bignum_arch"
|
||||
|
||||
if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
|
||||
echo "The \"graph\" library:"
|
||||
echo " options for compiling .... $x11_include"
|
||||
echo " options for linking ...... $x11_link"
|
||||
echo " options for compiling .... $x11_include"
|
||||
echo " options for linking ...... $x11_link"
|
||||
fi
|
||||
|
||||
if test $has_tk = true; then
|
||||
echo "The \"labltk\" library:"
|
||||
echo " use tcl/tk version ....... $tcl_version"
|
||||
echo " options for compiling .... $tk_defs"
|
||||
echo " options for linking ...... $tk_libs"
|
||||
echo " use tcl/tk version ....... $tcl_version"
|
||||
echo " options for compiling .... $tk_defs"
|
||||
echo " options for linking ...... $tk_libs"
|
||||
else
|
||||
echo "The \"labltk\" library: configuration failed"
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue