mpw-config.in: Remove.
* mpw-config.in: Remove. * mpw-make.sed: Remove. * mpw.c: Remove. * Makefile.in (CFILES): Remove pex-mpw.c. (CONFIGURED_OFILES): Remove pex-mpw.o. (mpw.o, pex-mpw.o): Remove targets. * maint-tool (undoc): Remove reference to mpw.c. From-SVN: r96043
This commit is contained in:
Ian Lance Taylor
Ian Lance Taylor
parent
7f8b151be7
commit
c80d391c3e
|
|
@ -1,3 +1,13 @@
|
|||
2005-03-07 Ian Lance Taylor <ian@airs.com>
|
||||
|
||||
* mpw-config.in: Remove.
|
||||
* mpw-make.sed: Remove.
|
||||
* mpw.c: Remove.
|
||||
* Makefile.in (CFILES): Remove pex-mpw.c.
|
||||
(CONFIGURED_OFILES): Remove pex-mpw.o.
|
||||
(mpw.o, pex-mpw.o): Remove targets.
|
||||
* maint-tool (undoc): Remove reference to mpw.c.
|
||||
|
||||
2005-03-06 DJ Delorie <dj@redhat.com>
|
||||
|
||||
* configure.ac (target_header_dir): vfork is a stub under djgpp.
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
|
|||
mempcpy.c memset.c mkstemps.c \
|
||||
objalloc.c obstack.c \
|
||||
partition.c \
|
||||
pex-djgpp.c pex-mpw.c pex-msdos.c pex-os2.c \
|
||||
pex-djgpp.c pex-msdos.c pex-os2.c \
|
||||
pex-unix.c pex-win32.c \
|
||||
physmem.c putenv.c \
|
||||
random.c regex.c rename.c rindex.c \
|
||||
|
|
@ -188,7 +188,7 @@ CONFIGURED_OFILES = ./asprintf.o ./atexit.o \
|
|||
./index.o ./insque.o \
|
||||
./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o \
|
||||
./memset.o ./mkstemps.o \
|
||||
./pex-djgpp.o ./pex-mpw.o ./pex-msdos.o ./pex-os2.o \
|
||||
./pex-djgpp.o ./pex-msdos.o ./pex-os2.o \
|
||||
./pex-unix.o ./pex-win32.o \
|
||||
./putenv.o \
|
||||
./random.o ./rename.o ./rindex.o \
|
||||
|
|
@ -717,12 +717,6 @@ $(CONFIGURED_OFILES): stamp-picdir
|
|||
else true; fi
|
||||
$(COMPILE.c) $(srcdir)/mkstemps.c $(OUTPUT_OPTION)
|
||||
|
||||
./mpw.o: $(srcdir)/mpw.c
|
||||
if [ x"$(PICFLAG)" != x ]; then \
|
||||
$(COMPILE.c) $(PICFLAG) $(srcdir)/mpw.c -o pic/$@; \
|
||||
else true; fi
|
||||
$(COMPILE.c) $(srcdir)/mpw.c $(OUTPUT_OPTION)
|
||||
|
||||
./msdos.o: $(srcdir)/msdos.c
|
||||
if [ x"$(PICFLAG)" != x ]; then \
|
||||
$(COMPILE.c) $(PICFLAG) $(srcdir)/msdos.c -o pic/$@; \
|
||||
|
|
@ -756,13 +750,6 @@ $(CONFIGURED_OFILES): stamp-picdir
|
|||
else true; fi
|
||||
$(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION)
|
||||
|
||||
./pex-mpw.o: $(srcdir)/pex-mpw.c config.h $(INCDIR)/ansidecl.h \
|
||||
$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
|
||||
if [ x"$(PICFLAG)" != x ]; then \
|
||||
$(COMPILE.c) $(PICFLAG) $(srcdir)/pex-mpw.c -o pic/$@; \
|
||||
else true; fi
|
||||
$(COMPILE.c) $(srcdir)/pex-mpw.c $(OUTPUT_OPTION)
|
||||
|
||||
./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \
|
||||
$(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
|
||||
$(INCDIR)/safe-ctype.h
|
||||
|
|
|
|||
|
|
@ -145,7 +145,6 @@ sub undoc {
|
|||
next unless /^\# *define/;
|
||||
s/\# *define *//;
|
||||
}
|
||||
next if $filename =~ /mpw\.c/;
|
||||
|
||||
s/ VPARAMS//;
|
||||
s/ *\177.*//;
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
# MPW configuration fragment for libiberty.
|
||||
|
||||
Echo '/* config.h. Generated by mpw-configure. */' > "{o}"config.new
|
||||
|
||||
MoveIfChange "{o}"config.new "{o}"config.h
|
||||
|
||||
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
# Sed commands to finish translating libiberty's Unix makefile to MPW syntax.
|
||||
|
||||
# Comment out a useless thing.
|
||||
/^\.always\./s/^/#/
|
||||
|
||||
# Replace the auto-generated list with the list of what we know we need.
|
||||
s/`cat needed-list`/"{o}"alloca.c.o "{o}"bcopy.c.o "{o}"getpagesize.c.o "{o}"insque.c.o "{o}"mpw.c.o "{o}"strcasecmp.c.o "{o}"strdup.c.o "{o}"strncasecmp.c.o/
|
||||
|
||||
# Paste in some desirable definitions.
|
||||
# The default rule here completely replaces the tricky stuff in the Unix
|
||||
# Makefile.in.
|
||||
/^###$/a\
|
||||
\
|
||||
HDEFINES = -d NEED_sys_siglist -d NEED_sys_errlist -d NEED_basename -d NEED_strcasecmp -d NEED_strncasecmp\
|
||||
INCLUDES = -i : -i {INCDIR}: -i {INCDIR}:mpw: -i ::extra-include: -i "{s}"\
|
||||
\
|
||||
.c.o \\Option-f .c\
|
||||
{CC} @DASH_C_FLAG@ {DepDir}{Default}.c {LIBCFLAGS} {INCLUDES} {HDEFINES} @SEGMENT_FLAG({Default})@ -o {TargDir}{Default}.c.o\
|
||||
|
||||
# Remove dependency on needed-list, which we don't use.
|
||||
/DO_ALSO =/s/needed-list//
|
||||
|
||||
/INCDIR=/s/"{srcdir}"{MULTISRCTOP}::/"{topsrcdir}"/
|
||||
|
||||
# Whack out the COMPILE.c trickiness.
|
||||
/^COMPILE.c /,/^$/d
|
||||
|
||||
# Remove the multido trickiness from the "all" target.
|
||||
/^all \\Option-f/,/^$/c\
|
||||
all \\Option-f {TARGETLIB}\
|
||||
|
||||
|
||||
# Remove the RULE1/RULE2 crud.
|
||||
/if \[/,/fi/d
|
||||
/^RULE1 =/,/RULE2 =/d
|
||||
/RULE2/s/RULE2/TARGETLIB/
|
||||
|
||||
# Don't want fdmatch ever.
|
||||
s/ "{o}"fdmatch.c.o//
|
||||
|
||||
# Fix paths to generated files.
|
||||
/config.h/s/"{s}"config.h/"{o}"config.h/
|
||||
|
||||
# Whack out config rebuild rules.
|
||||
/^"{o}"config.h \\Option-f/,/^$/d
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1010
libiberty/mpw.c
1010
libiberty/mpw.c
File diff suppressed because it is too large
Load Diff
|
|
@ -1,161 +0,0 @@
|
|||
/* Utilities to execute a program in a subprocess (possibly linked by pipes
|
||||
with other subprocesses), and wait for it. MPW specialization.
|
||||
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of the libiberty library.
|
||||
Libiberty is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
Libiberty is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with libiberty; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "pex-common.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
/* MPW pexecute doesn't actually run anything; instead, it writes out
|
||||
script commands that, when run, will do the actual executing.
|
||||
|
||||
For example, in GCC's case, GCC will write out several script commands:
|
||||
|
||||
cpp ...
|
||||
cc1 ...
|
||||
as ...
|
||||
ld ...
|
||||
|
||||
and then exit. None of the above programs will have run yet. The task
|
||||
that called GCC will then execute the script and cause cpp,etc. to run.
|
||||
The caller must invoke pfinish before calling exit. This adds
|
||||
the finishing touches to the generated script. */
|
||||
|
||||
static int first_time = 1;
|
||||
|
||||
extern void mpwify_filename PARAMS ((const char *, char *));
|
||||
|
||||
int
|
||||
pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
|
||||
const char *program;
|
||||
char * const *argv;
|
||||
const char *this_pname;
|
||||
const char *temp_base;
|
||||
char **errmsg_fmt, **errmsg_arg;
|
||||
int flags;
|
||||
{
|
||||
char tmpprogram[255];
|
||||
char *cp, *tmpname;
|
||||
int i;
|
||||
|
||||
mpwify_filename (program, tmpprogram);
|
||||
if (first_time)
|
||||
{
|
||||
printf ("Set Failed 0\n");
|
||||
first_time = 0;
|
||||
}
|
||||
|
||||
fputs ("If {Failed} == 0\n", stdout);
|
||||
/* If being verbose, output a copy of the command. It should be
|
||||
accurate enough and escaped enough to be "clickable". */
|
||||
if (flags & PEXECUTE_VERBOSE)
|
||||
{
|
||||
fputs ("\tEcho ", stdout);
|
||||
fputc ('\'', stdout);
|
||||
fputs (tmpprogram, stdout);
|
||||
fputc ('\'', stdout);
|
||||
fputc (' ', stdout);
|
||||
for (i=1; argv[i]; i++)
|
||||
{
|
||||
fputc ('\'', stdout);
|
||||
/* See if we have an argument that needs fixing. */
|
||||
if (strchr(argv[i], '/'))
|
||||
{
|
||||
tmpname = (char *) xmalloc (256);
|
||||
mpwify_filename (argv[i], tmpname);
|
||||
argv[i] = tmpname;
|
||||
}
|
||||
for (cp = argv[i]; *cp; cp++)
|
||||
{
|
||||
/* Write an Option-d escape char in front of special chars. */
|
||||
if (strchr("'+", *cp))
|
||||
fputc ('\266', stdout);
|
||||
fputc (*cp, stdout);
|
||||
}
|
||||
fputc ('\'', stdout);
|
||||
fputc (' ', stdout);
|
||||
}
|
||||
fputs ("\n", stdout);
|
||||
}
|
||||
fputs ("\t", stdout);
|
||||
fputs (tmpprogram, stdout);
|
||||
fputc (' ', stdout);
|
||||
|
||||
for (i=1; argv[i]; i++)
|
||||
{
|
||||
/* See if we have an argument that needs fixing. */
|
||||
if (strchr(argv[i], '/'))
|
||||
{
|
||||
tmpname = (char *) xmalloc (256);
|
||||
mpwify_filename (argv[i], tmpname);
|
||||
argv[i] = tmpname;
|
||||
}
|
||||
if (strchr (argv[i], ' '))
|
||||
fputc ('\'', stdout);
|
||||
for (cp = argv[i]; *cp; cp++)
|
||||
{
|
||||
/* Write an Option-d escape char in front of special chars. */
|
||||
if (strchr("'+", *cp))
|
||||
fputc ('\266', stdout);
|
||||
fputc (*cp, stdout);
|
||||
}
|
||||
if (strchr (argv[i], ' '))
|
||||
fputc ('\'', stdout);
|
||||
fputc (' ', stdout);
|
||||
}
|
||||
|
||||
fputs ("\n", stdout);
|
||||
|
||||
/* Output commands that arrange to clean up and exit if a failure occurs.
|
||||
We have to be careful to collect the status from the program that was
|
||||
run, rather than some other script command. Also, we don't exit
|
||||
immediately, since necessary cleanups are at the end of the script. */
|
||||
fputs ("\tSet TmpStatus {Status}\n", stdout);
|
||||
fputs ("\tIf {TmpStatus} != 0\n", stdout);
|
||||
fputs ("\t\tSet Failed {TmpStatus}\n", stdout);
|
||||
fputs ("\tEnd\n", stdout);
|
||||
fputs ("End\n", stdout);
|
||||
|
||||
/* We're just composing a script, can't fail here. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
pwait (pid, status, flags)
|
||||
int pid;
|
||||
int *status;
|
||||
int flags;
|
||||
{
|
||||
*status = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Write out commands that will exit with the correct error code
|
||||
if something in the script failed. */
|
||||
|
||||
void
|
||||
pfinish ()
|
||||
{
|
||||
printf ("\tExit \"{Failed}\"\n");
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue