mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 09:23:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix various problems, mostly minor, with the README* files.

Browse Source 
Estimated hours taken: 0.75

Fix various problems, mostly minor, with the README* files.
The most significant of these was that the ftp sites listed
in the README file in the binary distribution were out-of-date.

README.Linux:
	Fix a typo.

.README.in:
	Mention some new README.* files.
	Update the version number and copyright dates for the Boehm GC.

bindist/bindist.README:
	Update the version number and copyright dates for the Boehm GC.
	Update the ftp sites.  Update the copyright date.
	Update the file names for the Mercury standard library and
	runtime library.

bindist/Mmakefile:
	Include the files README.OSF1, README.Linux-Alpha, README.Linux-PPC,
	and README.Solaris in the binary distribution.

bindist/bindist.README.Linux:
	Update to match the changes to README.Linux in the source distribution.

profiler/mercury_profile.m:
	Update the copyright date printed by `mprof --help'.
This commit is contained in:
Fergus Henderson
1999-12-19 15:54:29 +00:00
parent 3995b5050f
commit cc3dab98d9
6 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.README.in
View File

@@ -16,12 +16,12 @@ Mercury compiler, version @VERSION@.
if the need should arise.
The subdirectory `boehm_gc' contains a slightly modified copy of
version 4.13alpha2 of the conservative garbage collector distributed
version 5.0alpha3 of the conservative garbage collector distributed
by Hans Boehm:
Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
Copyright (c) 1991-1995 by Xerox Corporation. All rights reserved.
Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved.
Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
@@ -77,13 +77,16 @@ README file for your particular platform, if there is one:
README.AIX RS/6000 systems running AIX
README.BSDI The BSDI version of BSD Unix on Intel x86
README.FreeBSD The FreeBSD version of BSD Unix on Intel x86
README.IRIX-5 SGI IRIX version 5.x
README.Linux Linux on Intel x86
README.Linux-Alpha Linux on DEC Alpha
README.Linux-PPC Linux on PowerPC
README.Linux-m68k Linux on Motorola 68000
README.MS-Windows Microsoft Windows
README.HPUX HPPA systems running HPUX
README.OSF1 DEC Alpha systems running OSF/1 version 3.x
README.Solaris Solaris (SunOS) on SPARC or Intel x86.
The documentation sources are in the `doc' subdirectory. The installation
process will install INFO, HTML, and DVI versions in the locations specified

2
README.Linux
View File

@@ -1,7 +1,7 @@
This file documents just the Linux/x86 port.
For the Linux/PowerPC port, see README.Linux-PPC.
For the Linux/Alpha port, see README.Linux-Alpha.
(Ports to Linux on other architecures have not yet
(Ports to Linux on other architectures have not yet
been attempted, but should not be difficult.)
On Linux with a.out, shared libraries are not supported.

3
bindist/Mmakefile
View File

@@ -26,7 +26,8 @@ UTILS = $(INSTALL_PREFIX)/bin/mkinit$(EXT_FOR_EXE) \
README_ETC = ../COPYING ../COPYING.LIB ../HISTORY ../LIMITATIONS \
../NEWS ../RELEASE_NOTES ../BUGS ../WORK_IN_PROGRESS \
../VERSION
../VERSION ../README.OSF1 ../README.Linux-PPC \
../README.Linux-Alpha ../README.Solaris
SCRIPT_FILES = ../scripts/*.in ../scripts/*.sh-subr \
../scripts/Mmake.rules \

28
bindist/bindist.README
View File

@@ -3,23 +3,23 @@ University of Melbourne Mercury compiler, version <VERSION>,
built on a `<FULLARCH>' system.
The Mercury implementation is free software, but it is Copyright (C)
1993-1998 The University of Melbourne. It is distributed under the
1993-1999 The University of Melbourne. It is distributed under the
terms of the GNU General Public License. See the file COPYING for
copying permission. The Mercury library and runtime (libmercury.* and
libmer.*) are distributed under the terms of the GNU Library General
copying permission. The Mercury library and runtime (libmer_std.* and
libmer_rt.*) are distributed under the terms of the GNU Library General
Public License. See the file COPYING.LIB for copying permissions for
those files. (If these licencing arrangements are unsatisfactory,
please contact us! We are willing to come to alternative arrangements,
if the need should arise.)
This distribution also contains a slightly modified version of the
conservative garbage collector distributed by Hans Boehm, version 4.13alpha2,
conservative garbage collector distributed by Hans Boehm, version 5.0alpha3,
which has the following copyright attached (taken from the README file
of the garbage collector source):
Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved.
Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved.
Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
@@ -87,10 +87,16 @@ If you find something you do like, please tell the world!
The Mercury binary and source distributions are available via anonymous
ftp or WWW from the following locations:
Australia:
ftp://turiel.cs.mu.oz.au/pub/mercury/
USA:
ftp://ftp.cs.sunysb.edu/pub/XSB/mercury/
Europe:
ftp://ftp.csd.uu.se/pub/Mercury/
Home site:
Australia: ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/
Mirrors:
Sweden: ftp://ftp.csd.uu.se/pub/Mercury/
Greece: ftp://ftp.ntua.gr/pub/lang/mercury/
Other sites (these may be less complete and/or out-of-date):
USA: ftp://ftp.cs.sunysb.edu/pub/XSB/mercury/
USA: ftp://sunsite.unc.edu/pub/Linux/devel/lang/mercury/
Sunsite also has many other mirrors, see
http://sunsite.unc.edu/pub/Linux/MIRRORS.html.

29
bindist/bindist.README.Linux
View File

@@ -1,6 +1,8 @@
Mercury has only been ported to Linux/x86, not to Linux/Alpha
Linux/PowerPC, Linux/m68k, etc. Those other ports should
not be difficult, but this file documents just the Linux/x86 port.
This file documents just the Linux/x86 port.
For the Linux/PowerPC port, see README.Linux-PPC.
For the Linux/Alpha port, see README.Linux-Alpha.
(Ports to Linux on other architectures have not yet
been attempted, but should not be difficult.)
On Linux with ELF, shared libraries are supported. However, ELF shared
libraries require position-independent code, and (partly due to
@@ -18,20 +20,19 @@ happened to be a little bit harder to implement. We may change this in
a future release.)
To use the shared libraries, you must compile your program with
`mmc --cflags -DPIC_REG' and link with `ml --mercury-libs shared'
or add `MGNUCFLAGS=-DPIC_REG' and `MLFLAGS=--mercury-libs shared'
to your Mmake file.
`mmc --pic-reg' and link with `ml --shared' or add
`MGNUCFLAGS=--pic-reg' and `MLFLAGS=--shared' to your Mmake file.
Mercury code compiled with `-DPIC_REG' or `-fpic' has what we shall call
"PIC linkage", whereas Mercury code compiled without these options has
"non-PIC linkage". The static version of the Mercury libraries has
non-PIC linkage, while the shared version has PIC linkage.
Be very careful that you do not try to link Mercury code
with PIC linkage and Mercury code with non-PIC linkage into the same
executable, otherwise your code will *almost certainly crash*.
Mercury code compiled with `--pic-reg' or with gcc's `-fpic' option has
what we shall call "PIC linkage", whereas Mercury code compiled without
these options has "non-PIC linkage". The static version of the Mercury
libraries has non-PIC linkage, while the shared version has PIC linkage.
Be careful that you do not try to link Mercury code with PIC linkage and
Mercury code with non-PIC linkage into the same executable, otherwise you
will probably get an obscure link error about `MR_grade_...' undefined
or `MR_runtime_grade' multiply defined.
(The reason for this is that standard non-PIC Mercury code uses the
`ebx' register in ways that are incompatible with its uses as the global
offset table pointer register in PIC code. If only the Intel
architecture wasn't so register-starved, we wouldn't need to use `ebx',
and then PIC and non-PIC code could be mixed without any problems.)

6
profiler/mercury_profile.m
View File

@@ -1,5 +1,5 @@
%-----------------------------------------------------------------------------%
% Copyright (C) 1995-1997 The University of Melbourne.
% Copyright (C) 1995-1997, 1999 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -105,7 +105,7 @@ usage -->
{ library__version(Version) },
io__write_strings(StdErr,
["Mercury Profiler, version ", Version, "\n"]),
io__write_string(StdErr, "Copyright (C) 1995-1997 The University of Melbourne\n"),
io__write_string(StdErr, "Copyright (C) 1995-1999 The University of Melbourne\n"),
io__write_string(StdErr, "Usage: "),
io__write_string(StdErr, ProgName),
io__write_string(StdErr, " [<options>] [<files>]\n"),
@@ -118,7 +118,7 @@ long_usage -->
io__progname_base("mprof", ProgName),
{ library__version(Version) },
io__write_strings(["Mercury Profiler, version ", Version, "\n"]),
io__write_string("Copyright (C) 1995-1997 The University of Melbourne\n"),
io__write_string("Copyright (C) 1995-1999 The University of Melbourne\n"),
io__write_string("\n"),
io__write_string("Usage: "),
io__write_string(ProgName),