Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity
6143432e64
hush/Makefile.mk

162 lines
3.8 KiB
Makefile
Raw Normal View History

GNO Makefile updates 1) Rename to Makefile.mk 2) Use *.o rather than *.a for object files 3) Reduce stack size to 4096 (may reduce further later)
2014-12-15 22:35:18 +00:00
# The *_SRC variables are used to define segments; see the "%.o" recipe.
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
# shell/hush.c is divided into segments as specified within the file itself.
MAIN_SRC = shell/hush.c
SHELL_OTHER_SRC = \
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
shell/match.c \
shell/math.c \
shell/random.c \
Move all the source files to 15-character ProDOS-compatible file names. Dmake gets confused if you use over-15-character file names, so they needed to be shortened to get it to work. While I was at it, I also switched _ to . in the filenames so they're fully ProDOS compatible. The shell/hush_test directory (not needed to build the code) still uses ProDOS-incompatible file names.
2014-11-03 04:11:07 +00:00
shell/shell.common.c \
Add our own implementation of fnmatch (taken from NetBSD), because the one in GNO 2.0.6's libc is broken. The version in libc both matches things it shouldn't and doesn't match things it should, in (at least) cases where a pattern includes additional stuff beyond a *.
2014-11-19 02:51:04 +00:00
shell/glob.c \
shell/fnmatch.c
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
COREUTILS_SRC = \
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
coreutils/echo.c \
coreutils/test.c \
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
coreutils/test.ptr.hack.c
LIBBB_A_SRC = \
Handle globals more simply, declaring the "G" structure containing them directly in shell/hush.c. This allows the "G" struct to show up in the debugger, so it can easily be inspected.
2014-11-06 19:08:38 +00:00
libbb/lineedit.c
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
LIBBB_B_SRC = \
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
libbb/appletlib.c \
libbb/getopt32.c \
libbb/error.retval.c \
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
libbb/endofname.c \
Move all the source files to 15-character ProDOS-compatible file names. Dmake gets confused if you use over-15-character file names, so they needed to be shortened to get it to work. While I was at it, I also switched _ to . in the filenames so they're fully ProDOS compatible. The shell/hush_test directory (not needed to build the code) still uses ProDOS-incompatible file names.
2014-11-03 04:11:07 +00:00
libbb/bb.strtonum.c \
libbb/full.write.c \
libbb/bb.qsort.c \
libbb/get.line.c \
libbb/conc.pathfile.c \
libbb/last.char.is.c \
libbb/cmp.str.array.c \
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
libbb/llist.c \
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
libbb/escape.seq.c \
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
libbb/messages.c \
Move all the source files to 15-character ProDOS-compatible file names. Dmake gets confused if you use over-15-character file names, so they needed to be shortened to get it to work. While I was at it, I also switched _ to . in the filenames so they're fully ProDOS compatible. The shell/hush_test directory (not needed to build the code) still uses ProDOS-incompatible file names.
2014-11-03 04:11:07 +00:00
libbb/bb.basename.c \
Add our own version of execve for GNO, which can quote arguments and can remove variables from the environment if needed. Our versions of the execv* functions have been moved to their own file. They are now used for all the exec* calls in hush.
2014-11-22 22:53:59 +00:00
libbb/get.exec.path.c \
libbb/exec.gno.c
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
LIBBB_C_SRC = \
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
libbb/perror.msg.c \
libbb/signal.names.c \
libbb/safe.strncpy.c \
libbb/platform.c \
libbb/signals.c \
libbb/printable.str.c \
libbb/read.key.c \
libbb/safe.write.c \
libbb/read.c \
libbb/s.gethostname.c \
libbb/safe.poll.c \
libbb/parse.mode.c \
Fix our handling of process groups for job control, working around a couple GNO bugs. *Most significantly, we avoid using setpgid(), because it doesn't work and in fact corrupts the kernel's process group table. *Also, work around tctpgrp() returning garbage instead of 0 on success. This adds an implementation of tcsetpgrp that works by reading the process tables to find a process in the appropriate group. This isn't used for the main job control operations, though, since it might be relatively slow. At this point, basic job control seems to work.
2014-11-22 05:05:38 +00:00
libbb/poll.c \
Add our own version of qsort, because the one from ORCA/C is recursive and can use thousands of KB of stack space. The new version is a heap sort implementation adapted from musl libc.
2014-12-03 16:46:57 +00:00
libbb/pgrp.c \
Merge with BusyBox 1.24.0. There's really only one bug fix in here that should be significant for GNO hush. The other changes should be inconsequential, AFAIK.
2015-10-17 06:08:06 +00:00
libbb/qsort.c \
libbb/auto.string.c
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
LIBBB_D_SRC = \
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
libbb/xfuncs.printf.c \
libbb/xfuncs.c \
libbb/xgetcwd.c \
libbb/xatonum.c \
libbb/xfunc.die.c \
libbb/skip.whitespc.c \
libbb/wfopen.c \
libbb/verror.msg.c \
libbb/time.c \
libbb/xrealloc.vec.c \
libbb/unicode.c \
Add an emulation of waitpid that should be better than the one in libc. In particular, it will buffer information about children other than the one being waited for, so it isn't lost. It can also emulate a non-blocking wait by arranging to interrupt the wait with a signal.
2014-11-07 18:12:18 +00:00
libbb/vfork.and.run.c \
libbb/waitpid.emul.c
Update makefile, adding in functionality that was in extra scripts
2014-12-27 17:33:31 +00:00
HEADERS = \
include/NUM.APPLETS.h \
include/appltmetadata.h \
include/autoconf.h \
include/busybox.h \
include/libbb.h \
include/platform.h \
include/poll.h \
include/unicode.h \
include/xatonum.h \
shell/glob.h \
shell/match.h \
shell/math.h \
shell/random.h \
shell/shell.common.h \
libbb/xatonum.tmplt.c
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
SRCS = $(MAIN_SRC) $(SHELL_OTHER_SRC) $(COREUTILS_SRC) $(LIBBB_A_SRC) \
$(LIBBB_B_SRC) $(LIBBB_C_SRC) $(LIBBB_D_SRC)
GNO Makefile updates 1) Rename to Makefile.mk 2) Use *.o rather than *.a for object files 3) Reduce stack size to 4096 (may reduce further later)
2014-12-15 22:35:18 +00:00
OBJS = $(SRCS:.c=.o)
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
ROOT = $(MAIN_SRC:.c=.root)
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
SHELL_OTHER_SEG = -SSHELLOTHER
COREUTILS_SEG = -SCOREUTILS_
LIBBB_A_SEG = -SLIBBB_A___
LIBBB_C_SEG = -SLIBBB_C___
# We need more separate segments in debug mode because the code is bigger.
.IF $(DEBUG)
LIBBB_B_SEG = -SLIBBB_B___
LIBBB_D_SEG = -SLIBBB_D___
.ELSE
LIBBB_B_SEG = -SLIBBB_A___
LIBBB_D_SEG = -SLIBBB_C___
.END
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
INCLUDES = -I include -I shell -I libbb
DEFINES = -Dhush_main=main -DNDEBUG
Add our own implementation of fnmatch (taken from NetBSD), because the one in GNO 2.0.6's libc is broken. The version in libc both matches things it shouldn't and doesn't match things it should, in (at least) cases where a pattern includes additional stuff beyond a *.
2014-11-19 02:51:04 +00:00
# This should be the ltermcap from GNO 2.0.4. The one from 2.0.6 is broken
# (links to unimplemented functions), so don't use it.
# The 2.0.4 version is in the "lib.shk" file within
# ftp://ftp.gno.org/pub/apple2/gs.specific/gno/base/v204/gnodisk1.sdk
Add initial support for getting terminal information from termcap, instead of hard-coding vt100-style codes. This currently only supports output, and still doesn't quite display correctly in some cases.
2014-11-12 02:58:06 +00:00
LIBS = -l/usr/lib/libtermcap.204
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
# For correct handling of varargs methods and fork, we need
# optimize bit 3 set (no stack repair code).
# Optimize bit 6 breaks some standard-compliant varargs code,
# and bits 0, 4, and 5 have known bugs. Disable for now.
Enable a couple optimizations that aren't reported to be buggy.
2014-12-27 16:07:53 +00:00
CFLAGS = -i -w -a1 -O14
Reduce stack size to 3k. Hush uses recursion for (at least) parsing nested constructs like { ... }, so it's possible for pathological/malicious scripts to overflow the stack, but this should be enough for just about anything non-pathological (e.g. up to about 10 levels of nested { }).
2014-12-26 22:33:17 +00:00
STACKSIZE = 3072
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
.IF $(DEBUG)
CFLAGS += -g -DDEBUG
.END
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
PROG = hush
$(PROG): $(OBJS)
Add initial support for getting terminal information from termcap, instead of hard-coding vt100-style codes. This currently only supports output, and still doesn't quite display correctly in some cases.
2014-11-12 02:58:06 +00:00
$(CC) $(LIBS) $(OBJS) -o $@
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
Update makefile, adding in functionality that was in extra scripts
2014-12-27 17:33:31 +00:00
$(OBJS): $(HEADERS)
GNO Makefile updates 1) Rename to Makefile.mk 2) Use *.o rather than *.a for object files 3) Reduce stack size to 4096 (may reduce further later)
2014-12-15 22:35:18 +00:00
%.o: %.c
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
$(CC) $(INCLUDES) $(DEFINES) $(CFLAGS) -c $< -o $@ \
$(eq,$<,$(MAIN_SRC) -s$(STACKSIZE) -r) \
Set things up so hush can be build with debug code turned on. This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled. To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 17:42:17 +00:00
$(!eq,$(SHELL_OTHER_SRC:s/$<//),$(SHELL_OTHER_SRC) $(SHELL_OTHER_SEG)) \
$(!eq,$(COREUTILS_SRC:s/$<//),$(COREUTILS_SRC) $(COREUTILS_SEG)) \
$(!eq,$(LIBBB_A_SRC:s/$<//),$(LIBBB_A_SRC) $(LIBBB_A_SEG)) \
$(!eq,$(LIBBB_B_SRC:s/$<//),$(LIBBB_B_SRC) $(LIBBB_B_SEG)) \
$(!eq,$(LIBBB_C_SRC:s/$<//),$(LIBBB_C_SRC) $(LIBBB_C_SEG)) \
$(!eq,$(LIBBB_D_SRC:s/$<//),$(LIBBB_D_SRC) $(LIBBB_D_SEG))
Add makefile (which can be used on GNO or a modern system), and build scripts based on in.
2014-11-02 03:59:10 +00:00
.PHONY: clean
clean:
Define segments and make other adjustments in makefile. At this point, hush can successfully build and run, although it doesn't work correctly. The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-06 04:26:33 +00:00
$(RM) $(OBJS) $(ROOT) $(PROG)
Update makefile, adding in functionality that was in extra scripts
2014-12-27 17:33:31 +00:00
.PHONY: chtyp
chtyp:
chtyp -l cc include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h
Add sample startup scripts
2015-01-01 19:19:05 +00:00
chtyp -t txt LICENSE README* Makefile* notes/* etc/*
Update makefile, adding in functionality that was in extra scripts
2014-12-27 17:33:31 +00:00
.PHONY: build
.SEQUENTIAL: build
build: chtyp $(PROG)
.PHONY: texttogs
texttogs:
udl -g include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h \
LICENSE README* Makefile* notes/*
Reference in New Issue Copy Permalink