summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile14
-rw-r--r--tools/Makefile.Mac14
-rw-r--r--tools/Makefile.nt14
-rwxr-xr-xtools/csl2ocaml21
-rw-r--r--tools/cvt_emit.mll3
-rw-r--r--tools/dumpapprox.ml3
-rw-r--r--tools/dumpobj.ml3
-rw-r--r--tools/objinfo.ml3
-rw-r--r--tools/ocaml.spec34
-rw-r--r--tools/ocamlcp.ml3
-rw-r--r--tools/ocamldep.ml3
-rw-r--r--tools/ocamlmktop.ml3
-rw-r--r--tools/ocamlprof.ml3
-rw-r--r--tools/primreq.ml3
-rw-r--r--tools/profiling.ml3
-rw-r--r--tools/profiling.mli3
16 files changed, 75 insertions, 55 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 7867c4504..762651920 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# Objective Caml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
+# $Id$
+
include ../config/Makefile
CAMLRUN=../boot/ocamlrun
diff --git a/tools/Makefile.Mac b/tools/Makefile.Mac
index f23a5b53b..6438d2cf6 100644
--- a/tools/Makefile.Mac
+++ b/tools/Makefile.Mac
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# Objective Caml #
+# #
+# Damien Doligez, projet Para, INRIA Rocquencourt #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
+# $Id$
+
CAMLRUN = ::boot:ocamlrun
CAMLC = {CAMLRUN} ::boot:ocamlc -I ::boot:
CAMLLEX = {CAMLRUN} ::boot:ocamllex
diff --git a/tools/Makefile.nt b/tools/Makefile.nt
index fa78ae35e..c05f5abd5 100644
--- a/tools/Makefile.nt
+++ b/tools/Makefile.nt
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# Objective Caml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
+# $Id$
+
!include ..\config\Makefile.nt
CAMLRUN=..\boot\ocamlrun
diff --git a/tools/csl2ocaml b/tools/csl2ocaml
deleted file mode 100755
index 66315e7e9..000000000
--- a/tools/csl2ocaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/local/bin/perl -pi.bak
-
-# Conversion of Caml Special Light source files to Objective Caml.
-# Rename library functions that have changed names and warn
-# for identifiers that are now keywords.
-# Transforms the file(s) in place. The old source is left in a file
-# with extension .bak
-
-s/Array\.new/Array.create/g;
-s/Array\.new_matrix/Array.create_matrix/g;
-s/Hashtbl\.new/Hashtbl.create/g;
-s/Queue\.new/Queue.create/g;
-s/Stack\.new/Stack.create/g;
-s/Thread\.new/Thread.create/g;
-s/Mutex\.new/Mutex.create/g;
-s/Condition\.new/Condition.create/g;
-
-if (/\b(class|closed|constraint|inherit|method|new|private|virtual)\b/) {
- print STDERR "$ARGV:$.: `$1' is now a keyword\n";
-}
-
diff --git a/tools/cvt_emit.mll b/tools/cvt_emit.mll
index 50c484a86..3aefa3ebd 100644
--- a/tools/cvt_emit.mll
+++ b/tools/cvt_emit.mll
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/dumpapprox.ml b/tools/dumpapprox.ml
index 5fe17d9eb..2af4fb6af 100644
--- a/tools/dumpapprox.ml
+++ b/tools/dumpapprox.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/dumpobj.ml b/tools/dumpobj.ml
index 7c7aa43b4..b306984fd 100644
--- a/tools/dumpobj.ml
+++ b/tools/dumpobj.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/objinfo.ml b/tools/objinfo.ml
index b1f1a7ba7..b2ee3ee58 100644
--- a/tools/objinfo.ml
+++ b/tools/objinfo.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/ocaml.spec b/tools/ocaml.spec
index e57ec0a6a..7b511e43f 100644
--- a/tools/ocaml.spec
+++ b/tools/ocaml.spec
@@ -1,12 +1,10 @@
Name: ocaml
-Version: 2.02
-Release: 2
+Version: 2.03
+Release: 1
Summary: The Objective Caml compiler and programming environment
-Source0: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.02.tar.gz
-Source1: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.02-refman.html.tar.gz
-Source2: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.02-refman.ps.gz
-Source3: ftp://ftp.inria.fr/lang/caml-light/ocamltk41-R200.tar.gz
-Patch0: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.02-patch1.diffs
+Source0: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.03.tar.gz
+Source1: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.03-refman.html.tar.gz
+Source2: ftp://ftp.inria.fr/lang/caml-light/ocaml-2.03-refman.ps.gz
Copyright: freely redistributable
Group: Development/Languages
Vendor: INRIA Rocquencourt
@@ -23,29 +21,17 @@ Lex&Yacc tools, a replay debugger, and a comprehensive library.
%prep
%setup -T -b 0
%setup -T -D -a 1
-%setup -T -D -a 3
-%patch0 -p1
-mv ocamltk41 otherlibs/ocamltk41
cp ../../SOURCES/ocaml-2.02-refman.ps.gz refman.ps.gz
%build
./configure -bindir /usr/bin -libdir /usr/lib/ocaml -mandir /usr/man/man1
-cat > otherlibs/ocamltk41/site.config.redhat << 'EOF'
-OCAMLLIBDIR=/usr/lib/ocaml
-CPPFLAGS=-I/usr/X11R6/include
-INSTALLDIR=/usr/lib/ocaml/camltk
-EOF
-(cd otherlibs/ocamltk41; ./configure --with-config=site.config.redhat)
make world opt ocamlc.opt ocamlopt.opt
-rm -rf /usr/lib/ocaml
-make install
-cd otherlibs/ocamltk41
-make all opt
-make install installopt
-rm /usr/lib/ocaml/camltk/ocamltktop
+(cd emacs; make ocamltags)
%install
-(cd emacs; make install EMACSDIR=/usr/lib/emacs/site-lisp)
+rm -rf /usr/lib/ocaml
+make install
+(cd emacs; make install install-ocamltags EMACSDIR=/usr/lib/emacs/site-lisp)
%files
/usr/bin/ocaml
@@ -61,6 +47,7 @@ rm /usr/lib/ocaml/camltk/ocamltktop
/usr/bin/ocamlyacc
/usr/bin/ocamlc.opt
/usr/bin/ocamlopt.opt
+/usr/bin/ocamltags
/usr/lib/ocaml
/usr/man/man1/ocaml.1
/usr/man/man1/ocamlc.1
@@ -79,4 +66,5 @@ rm /usr/lib/ocaml/camltk/ocamltktop
/usr/lib/emacs/site-lisp/caml.el
/usr/lib/emacs/site-lisp/camldebug.el
/usr/lib/emacs/site-lisp/inf-caml.el
+/usr/lib/emacs/site-lisp/caml-compat.el
%doc refman.ps.gz htmlman
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index 2654eaa4d..aa2a92dd6 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1998 Institut National de Recherche en Informatique et *)
-(* en Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml
index 5a84f334b..14591919e 100644
--- a/tools/ocamldep.ml
+++ b/tools/ocamldep.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1999 Institut National de Recherche en Informatique et *)
-(* en Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/ocamlmktop.ml b/tools/ocamlmktop.ml
index 32561c538..318be3adf 100644
--- a/tools/ocamlmktop.ml
+++ b/tools/ocamlmktop.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml
index 089ae8b7c..409a6fc71 100644
--- a/tools/ocamlprof.ml
+++ b/tools/ocamlprof.ml
@@ -6,7 +6,8 @@
(* Ported to Caml Special Light by John Malecki *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/primreq.ml b/tools/primreq.ml
index 37a36335e..46aaf9463 100644
--- a/tools/primreq.ml
+++ b/tools/primreq.ml
@@ -5,7 +5,8 @@
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 1999 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/tools/profiling.ml b/tools/profiling.ml
index 3b28cb902..55c26592c 100644
--- a/tools/profiling.ml
+++ b/tools/profiling.ml
@@ -6,7 +6,8 @@
(* Ported to Caml Special Light by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the GNU Library General Public License. *)
(* *)
(***********************************************************************)
diff --git a/tools/profiling.mli b/tools/profiling.mli
index 4a346e2e8..4b8a9dd46 100644
--- a/tools/profiling.mli
+++ b/tools/profiling.mli
@@ -6,7 +6,8 @@
(* Ported to Objective Caml by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* Automatique. Distributed only by permission. *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the GNU Library General Public License. *)
(* *)
(***********************************************************************)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-24 06:02:31 +0000