Merge pull request #325 from davidgiven/dtrg-ab

Replace the build system to use ab.

Author: davidgiven

.github/workflows/ccpp.yml

@@ -8,11 +8,11 @@ on: [push, pull_request]
 
 jobs:
   build-linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: apt
-      run: sudo apt update && sudo apt install bison flex ninja-build lua5.3
+      run: sudo apt update && sudo apt install bison flex lua5.3
     - name: make
       run: make
 
@@ -21,10 +21,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: brew
-      run: brew install ninja [email protected]
+      run: brew install python [email protected] coreutils make
     - name: make
       run: |
-        make
+        gmake
 
   build-windows:
     runs-on: windows-latest
@@ -41,15 +41,16 @@ jobs:
           mingw-w64-ucrt-x86_64-gcc
           mingw-w64-ucrt-x86_64-lua
           mingw-w64-ucrt-x86_64-nsis
-          ninja
+          mingw-w64-ucrt-x86_64-pkg-config
+          mingw-w64-ucrt-x86_64-python
           bison
           flex
           zip
           git
     - uses: actions/checkout@v3
     - name: build
       run: |
-        make LDFLAGS="-s -static" CFLAGS="-g -Os"
+        make LDFLAGS="-s -static"
     - name: package
       run: |
         make ack-setup.exe

Makefile

@@ -7,6 +7,12 @@
 
 DEFAULT_PLATFORM ?= pc86
 
+# Which architectures should get built?
+
+$(if $(PLATS), $(error Don't set PLATS on the command line, because reasons. Edit the Makefile instead.))
+PLATS = all
+# PLATS = linux386 linuxppc linuxmips
+
 # Where should the ACK put its temporary files?
 
 ifeq ($(TMPDIR),)
@@ -15,142 +21,48 @@ else
 ACK_TEMP_DIR ?= $(TMPDIR)
 endif
 
+INSDIR = $(OBJ)/staging
+
 # Where is the ACK going to be installed, eventually? If you don't want to
 # install it and just want to run the ACK from the build directory
 # ($(TMPDIR)/ack-build/staging, by default), leave this as $(INSDIR).
 
 ifeq ($(OS),Windows_NT)
 PREFIX ?= c:/ack
 else
-PREFIX ?= /usr/local
+PREFIX ?= /opt/pkg/ack
 #PREFIX = $(INSDIR)
 endif
 
-# Where do you want to put the object files used when building?
-
-BUILDDIR ?= $(ACK_TEMP_DIR)/ack-build
-
 # What build flags do you want to use for native code?
 
-CFLAGS ?= -g \
+CFLAGS ?= -g -Os \
 	-Werror=return-type \
 	-Werror=implicit-function-declaration \
-	-Werror=strict-prototypes
+	-Werror=strict-prototypes \
+	-DUNREACHABLE_CODE='__builtin_unreachable()' \
+	-DNORETURN=_Noreturn
+
+HOSTCFLAGS = $(CFLAGS)
+ACKCFLAGS = -O
 
 LDFLAGS ?= -g
 
 # Various commands.
 
-AR ?= ar
-CC ?= gcc
 LUA ?= lua
 
-# Which build system to use; use 'ninja' or 'make' (in lower case). Leave
-# blank to autodetect.
-
-BUILDSYSTEM ?=
+.PHONY: all
+all: +all
 
-# Build flags for ninja.
+# Custom rule to build the installer.
 
-NINJAFLAGS ?=
-
-# Build flags for make.
-
-MAKEFLAGS ?= 
-
-# ======================================================================= #
-#                         END OF CONFIGURATION                            #
-# ======================================================================= #
-
-# You shouldn't need to change anything below this point unless you are
-# actually developing ACK.
-
-OBJDIR = $(abspath $(BUILDDIR)/obj)
-BINDIR = $(abspath $(BUILDDIR)/bin)
-LIBDIR = $(abspath $(BUILDDIR)/lib)
-INCDIR = $(abspath $(BUILDDIR)/include)
-INSDIR = $(abspath $(BUILDDIR)/staging)
+ack-setup.exe: etc/windows-installer.nsi all
+	makensis -dBUILDDIR="$$(realpath $(INSDIR))" -dOUTFILE="$$(realpath $@)" $<
 
 PLATIND = $(INSDIR)/share/ack
 PLATDEP = $(INSDIR)/lib/ack
+export PLATS
 
-MANDATORYCFLAGS = \
-	-DUNREACHABLE_CODE='__builtin_unreachable()' \
-	-DNORETURN=_Noreturn
-
-MANDATORYLDFLAGS =
-
-.NOTPARALLEL:
-
-ifeq ($(BUILDSYSTEM),)
-  ifneq ($(shell which ninja),)
-BUILDSYSTEM = ninja
-  else
-BUILDSYSTEM = make
-  endif
-endif
-
-build-file = $(BUILDDIR)/build.$(BUILDSYSTEM)
-lua-files = $(shell find . -name 'build*.lua')
-our-lua = $(BUILDDIR)/lua
-
-# GNU make sets MAKECMDGOALS to the list of targets from the command
-# line.  We look for targets with '+' and forward them to BUILDSYSTEM.
-# This handles commands like
-#     $ make util/opt+pkg util/ego+pkg
-
-all-goals = +ack +tests
-plus-goals := $(patsubst all,$(all-goals),$(or $(MAKECMDGOALS),all))
-plus-goals := $(foreach g,$(plus-goals),$(if $(findstring +,$(g)),$(g),))
-
-# @true silences extra message, "make: Nothing to be done..."
-
-all: build-plus-goals
-	@true
-
-ifneq ($(plus-goals),)
-$(plus-goals): build-plus-goals
-	@true
-endif
-
-build-plus-goals: $(build-file)
-ifeq ($(BUILDSYSTEM),ninja)
-	@ninja $(NINJAFLAGS) -f $(build-file) $(plus-goals)
-else ifeq ($(BUILDSYSTEM),make)
-# GNU make passes MAKEFLAGS in environment.
-	@$(MAKE) -f $(build-file) $(plus-goals)
-else
-$(error unknown BUILDSYSTEM = $(BUILDSYSTEM))
-endif
-
-$(build-file): first/ackbuilder.lua Makefile $(lua-files)
-	@mkdir -p $(BUILDDIR)
-	@$(LUA) first/ackbuilder.lua \
-		first/build.lua build.lua \
-		--$(BUILDSYSTEM) \
-		LUA=$(LUA) \
-		DEFAULT_PLATFORM=$(DEFAULT_PLATFORM) \
-		OBJDIR=$(OBJDIR) \
-		BINDIR=$(BINDIR) \
-		LIBDIR=$(LIBDIR) \
-		INCDIR=$(INCDIR) \
-		INSDIR=$(INSDIR) \
-		PLATIND=$(PLATIND) \
-		PLATDEP=$(PLATDEP) \
-		PREFIX="$(PREFIX)" \
-		AR=$(AR) \
-		CC=$(CC) \
-		CFLAGS="$(MANDATORYCFLAGS) $(CFLAGS)" \
-		LDFLAGS="$(MANDATORYLDFLAGS) $(LDFLAGS)" \
-		> $(build-file)
-
-ack-setup.exe: etc/windows-installer.nsi
-	makensis -dBUILDDIR=$(BUILDDIR)/staging -dOUTFILE="$$(realpath $@)" $<
-
-install:
-	mkdir -p $(PREFIX)
-	tar cf - -C $(INSDIR) . | tar xvf - -C $(PREFIX)
-
-clean:
-	rm -rf $(BUILDDIR)
-
+AB_ENABLE_PROGRESS_INFO = false
+include build/ab.mk

README

@@ -1,8 +1,8 @@
-                     THE AMSTERDAM COMPILER KIT V6.1pre1
-                     ===================================
+                      THE AMSTERDAM COMPILER KIT V6.2+
+                      ================================
 
                   © 1987-2005 Vrije Universiteit, Amsterdam
-                                2022-08-19
+                                2025-04-17
 
 
 INTRODUCTION
@@ -13,42 +13,40 @@ front end compilers for a number of different languages, code generators,
 support libraries, and all the tools necessary to go from source code to
 executable on any of the platforms it supports.
 
-This is an early prerelease of the apocryphal version 6.1 release. Not a
-lot is supported, the build mechanism needs work, and a lot of things are
-probably broken. However, what's there should be sufficient to get things
-done and to evaluate how the full 6.1 release should work. 
-
 
 
 SUPPORT
 =======
 
 Languages:
 
-ANSI C, B, Pascal, Modula 2, Basic. K&R is supported via the ANSI C compiler.
+ANSI C, Pascal, Modula 2, Basic. K&R is supported via the ANSI C compiler.
 
 Platforms:
 
-pc86          produces bootable floppy disk images for 8086 PCs
+cpm           produces i80 CP/M .COM files
+em22          produces EM22 bytecode files
 linux386      produces ELF executables for PC Linux systems
 linux68k      produces ELF executables for m68020 Linux systems
-linuxppc      produces ELF executables for PowerPC Linux systems
 linuxmips     produces ELF executables for little-endian MIPS32r2 Linux systems
+linuxppc      produces ELF executables for PowerPC Linux systems
 minix68k      produces Minix executables for m68000 Minix systems
-cpm           produces i80 CP/M .COM files
-rpi           produces Raspberry Pi GPU binaries
-pdpv7         produces PDP/11 V7 Unix binaries
-msdos86       produces i86 MS-DOS .COM files
 msdos386      produces i386 MS-DOS 32-bit DPMI .EXE files
+msdos86       produces i86 MS-DOS .COM files
+osx386        produces i386 OSX MachO executables
+osxppc        produces PowerPC OSX MachO executables
+pc86          produces bootable floppy disk images for 8086 PCs
+pdpv7         produces PDP/11 V7 Unix binaries
+rpi           produces Raspberry Pi GPU binaries
 
 
 
 INSTALLATION
 ============
 
-The version 5.0 build mechanism has been completely rewritten. Installation
-ought to be fairly straightforward. It will build on Unixishes including Linux,
-OSX, and Windows using MSYS2 and mingw32.
+The version 5.0 build mechanism has been completely rewritten (twice).
+Installation ought to be fairly straightforward. It will build on Unixishes
+including Linux, OSX, and Windows using MSYS2 and mingw32.
 
 Requirements:
 
@@ -61,32 +59,25 @@ Requirements:
 
 - Lua (any version) with the lua-posix library installed.
 
-- (optionally) ninja; if you've got this, this will be autodetected and give
-  you faster builds.
-
-- about 115MB free in /tmp (or some other temporary directory).
+- Python 3.4 or above.
 
-- about 15MB in the target directory.
+- about 1GB in the target directory.
 
 Instructions:
 
 - edit the Makefile. There's a small section at the top where you can change
   the configuration. Probably the only one you may want to edit is PREFIX,
-  which changes where the ACK installs to.
+  which changes where the ACK installs to, and PLATS, which changes which
+  architectures are built. Look in `plat/*` to see what plats there are.
 
 - Run:
 
     make
 
   ...from the command line. This will do the build.
 
-  The make system is fully parallelisable. If you have a multicore system,
-  install ninja and it'll use all your cores. If you don't have ninja, you
-  can still use make for parallel builds with:
-
-    make -r -j8   # or however many cores you have
-
-  ...but frankly, I recommend ninja.
+  The make system is fully parallelisable by default, but does take a while
+  to start up.
 
 - Run:
 
@@ -192,4 +183,4 @@ Please enjoy.
 
 David Given (davidgiven on Github)
 [email protected]
-2018-09-18
+2025-04-17