Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macos9: suppression de GUSI (PR#307); suppression 68k 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3467 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2001-03-13 16:49:28 +00:00
parent f2bcd946bf
commit 1b13d5ec5a
12 changed files with 88 additions and 3200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
byterun/.cvsignore
View File

@ -5,6 +5,7 @@ opnames.h
ocamlrun
ocamlrund
libcamlrun.x
libcamlrun-gui.x
*.c.x
ocamlrun.xcoff
ocamlrun.dbg

53
byterun/Makefile.Mac
View File

@ -12,38 +12,13 @@
# $Id$
C = sc
COptions = -w 29,30,35 {ocamlgusiflag} -i ::config: {cdbgflag}
-model far -mbg full
AOptions = -model far {adbgflag}
LinkOptions = -model far -ad 4 -msg nodup -compact -pad 0 -state nouse -br 68k
Libs = "{libraries}IntEnv.o"
"{libraries}Interface.o"
"{libraries}MacRuntime.o"
"{libraries}MathLib.o"
"{clibraries}StdCLib.o"
"{libraries}ToolLibs.o"
PPCC = mrc
PPCCOptions = -w 29,30,35 {ocamlgusiflag} -i ::config: {cdbgflag}
PPCCOptions = -w 29,30,35 -i ::config: {cdbgflag}
PPCLinkOptions = -d {ldbgflag}
PPCLibs = "{sharedlibraries}MathLib" "{ppclibraries}PPCCRuntime.o"
"{ppclibraries}PPCToolLibs.o" "{sharedlibraries}StdCLib"
"{ppclibraries}StdCRuntime.o" "{sharedlibraries}InterfaceLib"
OBJS = :interp.a.o :misc.c.o :stacks.c.o ¶
:fix_code.c.o :startup.c.o :main.c.o ¶
:freelist.c.o :major_gc.c.o :minor_gc.c.o :memory.c.o :alloc.c.o :roots.c.o ¶
:fail.c.o :signals.c.o ¶
:compare.c.o :ints.c.o :floats.c.o :str.c.o :array.c.o :io.c.o :extern.c.o ¶
:intern.c.o ¶
:hash.c.o :sys.c.o :meta.c.o :parsing.c.o ¶
:gc_ctrl.c.o :terminfo.c.o :md5.c.o ¶
:obj.c.o :lexing.c.o :macintosh.c.o ¶
:rotatecursor.c.o :printexc.c.o :callback.c.o ¶
:debugger.c.o :weak.c.o :compact.c.o ¶
:instrtrace.c.o :finalise.c.o :custom.c.o :backtrace.c.o
PPCOBJS = :interp.c.x :misc.c.x :stacks.c.x ¶
:fix_code.c.x :startup.c.x :main.c.x ¶
:freelist.c.x :major_gc.c.x :minor_gc.c.x :memory.c.x :alloc.c.x :roots.c.x ¶
@ -63,25 +38,21 @@ PRIMS = alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c
PUBLIC_INCLUDES = mlvalues.h alloc.h misc.h callback.h fail.h custom.h
all Ä ocamlrun libcamlrun.o libcamlrun.x
all Ä libcamlrun-gui.x libcamlrun.x ocamlrun
ocamlrun ÄÄ libcamlrun.x :prims.c.x
libcamlrun-gui.x Ä {PPCOBJS}
ppclink {PPCLinkOptions} -xm library -o libcamlrun-gui.x {PPCOBJS}
libcamlrun.x Ä libcamlrun-gui.x mpwtool.c.x
ppclink {PPCLinkOptions} -xm library -o libcamlrun.x libcamlrun-gui.x mpwtool.c.x
ocamlrun Ä libcamlrun.x :prims.c.x
ppclink -c 'MPS ' -t MPST {PPCLinkOptions} -o ocamlrun prims.c.x ¶
libcamlrun.x {PPCLibs}
ocamlrun ÄÄ libcamlrun.o :prims.c.o
ilink -c 'MPS ' -t MPST {LinkOptions} -o ocamlrun prims.c.o ¶
libcamlrun.o {libs}
libcamlrun.x Ä {PPCOBJS}
ppclink {PPCLinkOptions} -xm library -o libcamlrun.x {PPCOBJS}
libcamlrun.o Ä {OBJS}
lib -o libcamlrun.o {OBJS}
install Ä
duplicate -y ocamlrun "{BINDIR}ocamlrun"
duplicate -y libcamlrun.x libcamlrun.o "{LIBDIR}"
duplicate -y libcamlrun.x libcamlrun-gui.x "{LIBDIR}"
if "`exists -d "{LIBDIR}caml:"`" == ""
newfolder "{LIBDIR}caml:"
end
@ -139,11 +110,7 @@ primitives
:md5.c.x Ä
{PPCC} :md5.c -o :md5.c.x -opt off {PPCCOptions} -opt off
:rotatecursor.c.o Ä
{C} -b rotatecursor.c -o rotatecursor.c.o {COptions}
depend Ä :prims.c :opnames.h
begin
makedepend -w -objext .x Å.c
makedepend -w Å.c
end | streamedit -e "/¶t/ replace // ' ' -c °" > Makefile.Mac.depend

1150
byterun/Makefile.Mac.depend
View File

File diff suppressed because it is too large Load Diff

38
byterun/mpwtool.c Normal file
View File

@ -0,0 +1,38 @@
/***********************************************************************/
/* */
/* Objective Caml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
/* $Id$ */
/* glue code for MPW tools */
#include <stdio.h>
#include <stdlib.h>
int ui_read (int fd, char *p, unsigned int n)
{
return read (fd, p, n);
}
int ui_write (int fd, char *p, unsigned int n)
{
return write (fd, p, n);
}
void ui_print_stderr (char *msg, void *arg)
{
fprintf (stderr, msg, arg);
}
void ui_exit (int retcode)
{
exit (retcode);
}

10
byterun/signals.c
View File

@ -117,9 +117,7 @@ void enter_blocking_section(void)
it will be lost. */
temp = pending_signal; pending_signal = 0;
if (temp) execute_signal(temp, 0);
#if !macintosh_GUSI
async_signal_mode = 1;
#endif
if (!pending_signal) break;
async_signal_mode = 0;
}
@ -129,16 +127,8 @@ void enter_blocking_section(void)
void leave_blocking_section(void)
{
if (leave_blocking_section_hook != NULL) leave_blocking_section_hook();
#if !macintosh_GUSI
Assert(async_signal_mode);
async_signal_mode = 0;
#else
{
int temp = pending_signal;
pending_signal = 0;
if (temp) execute_signal (temp, 0);
}
#endif
}
#ifndef SIGABRT

7
config/config.Mac
View File

@ -36,13 +36,12 @@ set -e APPLIDIR "{mpw}:OCaml-distrib:"
# bigarray Statically-allocated arrays
# dynlink Dynamic linking of bytecode
# graph Graphics (for the standalone application only)
# macosunix Unix emulation (application only, needs GUSI)
# num Arbitrary-precision rational arithmetic
# str Regular expressions and high-level string processing
# systhreads Lightweight processes (application only, needs GUSI)
#
# You need all of them to build the standalone application.
set -e OTHERLIBRARIES "bigarray dynlink graph macosunix num str systhreads"
set -e OTHERLIBRARIES "bigarray dynlink graph num str"
############# To compile in debug mode (or not)
@ -73,4 +72,4 @@ set -e MAJOR 1
set -e MINOR 0
set -e BUGFIX 0
set -e STAGE a
set -e REV 10
set -e REV 11

2
config/s-MacOS.h
View File

@ -16,4 +16,4 @@
#define HAS_STRERROR
#define HAS_GETCWD
#define SIGVTALRM 26 /* FIXME */
#define HAS_UI

24
maccaml/Makefile.Mac
View File

@ -18,8 +18,7 @@ VERSIONSTR =
COPYRIGHTSTR = "¶"Copyright 1991-2001 INRIA¶""
XIncludes = -i ::byterun:,::config: ¶
-i ":WASTE:WASTE 1.3 Distribution:WASTE C/C++ Headers:"
# -includes unix -i "{GUSI}include:"
-i ":WASTE:WASTE 1.3 Distribution:WASTE C/C++ Headers:"
PPCC = mrc -proto strict -w 6
PPCCplus = mrcpp
@ -27,41 +26,25 @@ PPCCOptions = {XIncludes} {cdbgflag}
PPCLinkOptions = -d {ldbgflag}
PPCCamlrunLibs = ::otherlibs:num:libnums.x ¶
::otherlibs:bigarray:libbigarray.x ¶
# ::otherlibs:systhreads:libthreads.x ¶
::byterun:libcamlrun-gui.x ¶
::otherlibs:str:libstr.x
PPCWELibs = ":WASTE:WASTE 1.3 Distribution:WASTELib.x"
#ppcgusilibs = "{gusi}lib:gusi_mpw.mrc.lib" ¶
# "{gusi}lib:gusi_sfio.mrc.lib" ¶
# "{gusi}lib:gusi_core.mrc.lib" ¶
# "{sfio}lib:sfio.mrc.lib"
PPCSysLibs = #"{ppclibraries}ppcsio.o" ¶
"{PPCLibraries}MrCPlusLib.o"
PPCSysLibs = "{PPCLibraries}MrCPlusLib.o"
"{PPCLibraries}PPCStdCLib.o"
"{PPCLibraries}StdCRuntime.o"
"{PPCLibraries}PPCCRuntime.o"
"{PPCLibraries}PPCToolLibs.o"
"{SharedLibraries}InterfaceLib"
# "{SharedLibraries}ThreadsLib" ¶
# "{PPCLibraries}MrCIOStreams.o" ¶
"{SharedLibraries}StdCLib"
# "{SharedLibraries}OpenTransportLib" ¶
# "{SharedLibraries}OpenTptInternetLib" ¶
# "{PPCLibraries}OpenTransportAppPPC.o" ¶
# "{PPCLibraries}OpenTptInetPPC.o" ¶
"{sharedlibraries}MathLib"
"{sharedlibraries}DragLib"
PPCLibs = {ppccamlrunlibs} {ppcwelibs} {ppcsyslibs}
# {ppcgusilibs}
camllibs = ::otherlibs:graph:graphics.cma ¶
::otherlibs:num:nums.cma ¶
# ::otherlibs:macosunix:unix.cma ¶
::otherlibs:bigarray:bigarray.cma ¶
# ::otherlibs:systhreads:threads.cma
primfiles = ::byterun:primitives prim_bigarray prim_graph prim_num prim_str
# prim_systhreads ::otherlibs:macosunix:unix-primitives
RezDefs = -d MAJORVNUM={MAJOR} -d MINORVNUM=0x{MINOR}{BUGFIX}
-d STAGE={STAGE} -d DEVVNUM={REV}
@ -72,7 +55,7 @@ PPCOBJS = aboutbox.c.x appleevents.c.x clipboard.c.x
events.c.x files.c.x glue.c.x ¶
graph.c.x lcontrols.c.x lib.c.x main.c.x mcmemory.c.x ¶
menus.c.x mcmisc.c.x modalfilter.c.x prefs.c.x prims.c.x ¶
print.c.x scroll.c.x windows.c.x #gusistuff.cp.x
print.c.x scroll.c.x windows.c.x
all Ä appli appliprims ocamlconstants.h appli.r "Objective Caml"
set status 0
@ -135,5 +118,4 @@ clean
depend Ä prims.c
begin
makedepend -w -objext .x Å.c
makedepend -w Å.c
end | streamedit -e "/¶t/ replace // ' ' -c °" > Makefile.Mac.depend

1754
maccaml/Makefile.Mac.depend
View File

File diff suppressed because it is too large Load Diff

121
maccaml/gusistuff.cp
View File

@ -1,121 +0,0 @@
/***********************************************************************/
/* */
/* Objective Caml */
/* */
/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
/* */
/* Copyright 2000 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
/* $Id$ */
#define GUSI_SOURCE
#include <GUSIConfig.h>
#include <GUSIBasics.h>
extern "C" {
#include "main.h"
#include <rotatecursor.h>
}
static void spin_hook_for_gusi (bool wait)
{
#pragma unused (wait)
if (rotatecursor_flag){
rotatecursor_rearm ();
RotateCursor (32);
}
}
/**************** B E G I N GUSI CONFIGURATION ****************************
*
* GUSI Configuration section generated by GUSI Configurator
* last modified: Thu Mar 30 18:08:06 2000
*
* This section will be overwritten by the next run of Configurator.
*/
#define GUSI_SOURCE
#include <GUSIConfig.h>
#include <sys/cdefs.h>
/* Declarations of Socket Factories */
__BEGIN_DECLS
void GUSIwithInetSockets();
void GUSIwithLocalSockets();
void GUSIwithMTInetSockets();
void GUSIwithMTTcpSockets();
void GUSIwithMTUdpSockets();
void GUSIwithOTInetSockets();
void GUSIwithOTTcpSockets();
void GUSIwithOTUdpSockets();
void GUSIwithPPCSockets();
void GUSISetupFactories();
__END_DECLS
/* Configure Socket Factories */
void GUSISetupFactories()
{
#ifdef GUSISetupFactories_BeginHook
GUSISetupFactories_BeginHook
#endif
GUSIwithInetSockets();
GUSIwithLocalSockets();
GUSIwithPPCSockets();
#ifdef GUSISetupFactories_EndHook
GUSISetupFactories_EndHook
#endif
GUSISetHook (GUSI_SpinHook, (GUSIHook) spin_hook_for_gusi);
}
/* Declarations of File Devices */
__BEGIN_DECLS
void GUSIwithDConSockets();
void GUSIwithNullSockets();
void GUSISetupDevices();
__END_DECLS
/* Configure File Devices */
void GUSISetupDevices()
{
#ifdef GUSISetupDevices_BeginHook
GUSISetupDevices_BeginHook
#endif
GUSIwithNullSockets ();
#ifdef GUSISetupDevices_EndHook
GUSISetupDevices_EndHook
#endif
GUSISetHook (GUSI_SpinHook, (GUSIHook) spin_hook_for_gusi);
}
#ifndef __cplusplus
#error GUSISetupConfig() needs to be written in C++
#endif
GUSIConfiguration::FileSuffix sSuffices[] = {
".ml" , 'TEXT', 'Caml',
".mli" , 'TEXT', 'Caml',
"" , '????', '????',
};
extern "C" void GUSISetupConfig()
{
GUSIConfiguration * config =
GUSIConfiguration::CreateInstance(GUSIConfiguration::kNoResource);
config->ConfigureSuffices(
sizeof(sSuffices)/sizeof(GUSIConfiguration::FileSuffix)-1, sSuffices);
config->ConfigureAutoInitGraf(false);
config->ConfigureAutoSpin(false);
config->ConfigureSigInt(false);
config->ConfigureSigPipe(true);
GUSISetHook (GUSI_SpinHook, (GUSIHook) spin_hook_for_gusi);
}
/**************** E N D GUSI CONFIGURATION *************************/

15
maccaml/prim_systhreads
View File

@ -1,15 +0,0 @@
caml_condition_broadcast
caml_condition_new
caml_condition_signal
caml_condition_wait
caml_mutex_lock
caml_mutex_new
caml_mutex_try_lock
caml_mutex_unlock
caml_thread_id
caml_thread_initialize
caml_thread_join
caml_thread_new
caml_thread_self
caml_thread_yield
caml_wait_signal

113
maccaml/prim_unix
View File

@ -1,113 +0,0 @@
macosunix_startup
unix_accept
unix_access
unix_alarm
unix_bind
unix_chdir
unix_chmod
unix_chown
unix_chroot
unix_clear_close_on_exec
unix_clear_nonblock
unix_close
unix_closedir
unix_connect
unix_dup
unix_dup2
unix_environment
unix_error_message
unix_execv
unix_execve
unix_execvp
unix_execvpe
unix_exit
unix_fchmod
unix_fchown
unix_fork
unix_fstat
unix_ftruncate
unix_getcwd
unix_getegid
unix_geteuid
unix_getgid
unix_getgrgid
unix_getgrnam
unix_getgroups
unix_gethostbyaddr
unix_gethostbyname
unix_gethostname
unix_getitimer
unix_getlogin
unix_getpeername
unix_getpid
unix_getppid
unix_getprotobyname
unix_getprotobynumber
unix_getpwnam
unix_getpwuid
unix_getservbyname
unix_getservbyport
unix_getsockname
unix_getsockopt
unix_gettimeofday
unix_getuid
unix_gmtime
unix_inet_addr_of_string
unix_kill
unix_link
unix_listen
unix_localtime
unix_lockf
unix_lseek
unix_lstat
unix_mkdir
unix_mkfifo
unix_mktime
unix_nice
unix_open
unix_opendir
unix_pipe
unix_putenv
unix_read
unix_readdir
unix_readlink
unix_recv
unix_recvfrom
unix_rename
unix_rewinddir
unix_rmdir
unix_select
unix_send
unix_sendto
unix_set_close_on_exec
unix_set_nonblock
unix_setgid
unix_setitimer
unix_setsid
unix_setsockopt
unix_setuid
unix_shutdown
unix_sigpending
unix_sigprocmask
unix_sigsuspend
unix_sleep
unix_socket
unix_socketpair
unix_stat
unix_string_of_inet_addr
unix_symlink
unix_tcdrain
unix_tcflow
unix_tcflush
unix_tcgetattr
unix_tcsendbreak
unix_tcsetattr
unix_time
unix_times
unix_truncate
unix_umask
unix_unlink
unix_utimes
unix_wait
unix_waitpid
unix_write