RTimothyEdwards · dlmiles · Jul 22, 2026 · Jul 22, 2026 · Jul 22, 2026 · Jul 22, 2026
diff --git a/.gitattributes b/.gitattributes
@@ -6,3 +6,14 @@
 Makefile	filter=header
 
 *.gds		diff=gds
+
+# Keep build/shell scripts and makefiles LF even when checked out on Windows
+# (git core.autocrlf=true), or the shell and make reject CRLF.  .gitattributes
+# overrides core.autocrlf, so this is the authoritative fix and the WASM build
+# (npm/build.sh) no longer needs to strip CRs from the source tree.
+/configure	text eol=lf
+/scripts/**	text eol=lf
+*.sh		text eol=lf
+*.mak		text eol=lf
+*.mak.in	text eol=lf
+Makefile.in	text eol=lf
diff --git a/.github/workflows/canary-matrix.yml b/.github/workflows/canary-matrix.yml
@@ -15,7 +15,7 @@ jobs:
         os: [ubuntu-26.04, ubuntu-24.04, ubuntu-22.04]
         # Configure Options
         #                                                       X11          OGL    CAIRO
-        pkgs: [all, none, no_tk_tcl_rl, no_tk_tcl_brl, no_zlib, no_gc_gl_gu, no_gc, no_gl_gu]
+        pkgs: [all, none, no_tk_tcl_rl, no_zlib, no_gc_gl_gu, no_gc, no_gl_gu]
         # Toolchain:
         #  ubuntu-20.04 [gcc-9,  clang-10] # gcc-7  .. gcc-10 / clang-7  .. clang-12 + clang-18
         #  ubuntu-22.04 [gcc-11, clang-14] # gcc-9  .. gcc-12 / clang-11 .. clang-15
@@ -110,7 +110,6 @@ jobs:
           # z no.*_zl  zlib1g-dev
           # n no.*_nc  libncurses-dev
           # r no.*_rl  libreadline-dev
-          # R no.*_brl --enable-readline-bundled
           # c no.*_tcl tcl-dev
           # k no.*_tk  tk-dev
           # C no.*_gc  libcairo-dev
@@ -121,8 +120,6 @@ jobs:
             pkgs=$(echo -n "$pkgs" | sed -e 's#z##'); fi
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_nc"; then
             pkgs=$(echo -n "$pkgs" | sed -e 's#n##'); fi
-          if echo -n "$MATRIX_PKGS" | grep -q "^no.*_brl"; then
-            pkgs=$(echo -n "$pkgs" | sed -e 's#r#R#'); fi # replace
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_rl"; then
             pkgs=$(echo -n "$pkgs" | sed -e 's#r##'); fi
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_tcl"; then
@@ -153,10 +150,13 @@ jobs:
 
           #
           _configure_args=()
+          # "none" installs no dev packages (no libreadline-dev among them).  Since
+          # configure now requires system readline for a non-Tcl build (unless told
+          # otherwise), the minimal "none" build must pass --disable-readline.
+          if [ "${MATRIX_PKGS}" = "none" ]; then
+            _configure_args+=(--disable-readline); fi
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_zl"; then
             _configure_args+=(--disable-compression); fi
-          if echo -n "$MATRIX_PKGS" | grep -q "^no.*_brl"; then
-            _configure_args+=(--enable-readline-bundled); fi
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_rl"; then
             _configure_args+=(--disable-readline); fi
           if echo -n "$MATRIX_PKGS" | grep -q "^no.*_tcl"; then
@@ -285,7 +285,7 @@ jobs:
           #sed -e 's# -Werror=# -Wno-unused-local-typedefs -Werror=#' -i defs.mak
           #sed -e 's# -Werror=# -Wno-unused-label -Werror=#' -i defs.mak
           #sed -e 's# -Werror=# -Wno-unused-but-set-variable -Werror=#' -i defs.mak
-          make database/database.h
+          make prepare
           make -j$(nproc) 2>&1 | tee MAKE.LOG
 
       - name: Summary

diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml
@@ -15,9 +15,10 @@ jobs:
       - name: Get Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y tcl-dev tk-dev libcairo-dev
+          sudo apt-get install -y tcl-dev tk-dev libcairo-dev \
+            texlive-latex-base texlive-latex-recommended texlive-fonts-recommended
       - name: Build
         run: |
           ./configure
-          make database/database.h
+          make prepare
           make -j$(nproc)
diff --git a/.github/workflows/main-macos.yml b/.github/workflows/main-macos.yml
@@ -129,7 +129,7 @@ jobs:
           cat defs.mak
           echo "===== defs.mak ====="
 
-          make database/database.h
+          make prepare
           make -j$(sysctl -n hw.ncpu) 2>&1 | tee MAKE.LOG
 
       - name: Install
@@ -361,7 +361,7 @@ jobs:
           cat defs.mak
           echo "===== defs.mak ====="
 
-          make database/database.h
+          make prepare
           make -j$(sysctl -n hw.ncpu) 2>&1 | tee MAKE.LOG
 
       - name: Install

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,9 +13,43 @@ jobs:
       - name: Get Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y tcl-dev tk-dev libcairo-dev
+          # tcl/tk + cairo for the build; texlive (latex + dvips) so the default
+          # "make" also regenerates the PostScript documentation.  Docs are
+          # best-effort — a missing texlive package just falls back to the
+          # pre-built PostScript, it does not fail the build.
+          sudo apt-get install -y tcl-dev tk-dev libcairo-dev \
+            texlive-latex-base texlive-latex-recommended texlive-fonts-recommended
       - name: Build
         run: |
           ./configure
-          make database/database.h
+          make prepare
+          make -j$(nproc)
+      - name: Build Tcl auto-load modules
+        # These per-module Tcl shared libraries are real products but are not
+        # part of the default target (their modules are not in PROGRAMS), so
+        # build them explicitly to keep them from bit-rotting.
+        run: |
+          for m in lef plot router ext2spice ext2sim; do
+            make -C "$m" tcl-main
+          done
+
+  standard_build_linux:
+    # Non-Tcl "standard" configuration: native magic binary + system GNU
+    # readline.  Distinct code paths (MAGIC_WRAPPER off, readline) that the Tcl
+    # build above does not exercise.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get Dependencies
+        # X11 + cairo for graphics; readline (the non-Tcl line editor) + its
+        # ncurses dependency; texlive for the docs.  NB: package set not validated
+        # on the runner -- adjust if the build cannot find a library.
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libcairo-dev libreadline-dev libncurses-dev \
+            texlive-latex-base texlive-latex-recommended texlive-fonts-recommended
+      - name: Build (non-Tcl / standard)
+        run: |
+          ./configure --without-tcl --without-opengl
+          make prepare
           make -j$(nproc)
diff --git a/.gitignore b/.gitignore
@@ -6,18 +6,84 @@ config.log
 scripts/config.log
 scripts/config.status
 scripts/defs.mak
+# Generated at the build top (in-tree = source top): the top Makefile is now
+# produced from Makefile.in, and config.status runs in the build directory.
+/Makefile
+/config.status
+# Build-tree launch helpers (configure-generated) + the CAD_ROOT symlink tree they
+# stage; in-tree these land in the source root.
+/run_magic.sh
+/run_magicnull.sh
+/run_magic_gdb.sh
+/run_magic_valgrind.sh
+/magic_run_common.sh
+/CAD_DIR/
 install.log
 make.log
 reconfigure.sh
 
+# Generated per-directory Makefiles (Makefile.in migration).  POLICY: whenever a
+# module's Makefile becomes a configure-generated Makefile.in, add its
+# "<dir>/Makefile" here in the *same commit*, so an in-tree build never lets a
+# generated Makefile be committed.  (Top-level /Makefile is handled above.)
+# --- converted dirs below ---
+tiles/Makefile
+bplane/Makefile
+calma/Makefile
+cif/Makefile
+cmwind/Makefile
+dbwind/Makefile
+debug/Makefile
+drc/Makefile
+extflat/Makefile
+extract/Makefile
+garouter/Makefile
+gcr/Makefile
+grouter/Makefile
+irouter/Makefile
+mzrouter/Makefile
+netmenu/Makefile
+plow/Makefile
+resis/Makefile
+select/Makefile
+sim/Makefile
+textio/Makefile
+wiring/Makefile
+utils/Makefile
+windows/Makefile
+commands/Makefile
+database/Makefile
+lef/Makefile
+plot/Makefile
+router/Makefile
+ext2spice/Makefile
+ext2sim/Makefile
+extcheck/Makefile
+net2ir/Makefile
+graphics/Makefile
+oa/Makefile
+magic/Makefile
+tcltk/Makefile
+scmos/Makefile
+doc/Makefile
+lisp/Makefile
+scmos/cif_template/Makefile
+doc/man/Makefile
+doc/tutcells/Makefile
+doc/html/Makefile
+doc/latexfiles/Makefile
+
 # Compiled objects / libraries
 *.o
 *.a
 *.so
-*/Depend
-*/Depend*.tmp
+# Per-file dependency fragments (in-tree they land in each source module dir;
+# out-of-tree they are under the build dir).  Replaces the old */Depend files.
 .deps/
 database/database.h
+# autoconf config header, generated by ./configure (in-tree location; out-of-tree
+# it lives under the build dir's include/ and is covered by the build-dir rules).
+magic/autoconf/config.h
 
 # Editor / OS cruft
 .*.swp
@@ -57,16 +123,31 @@ magic/magic.js.symbols
 magic/magic.symbols
 magic/magic.wasm
 build-tcl-wasm/
+# Out-of-source WASM build directories created by npm/build.sh (one per variant;
+# fixed names build-wasm-<tcl|notcl>).  Disposable, recreated each run.
+build-wasm-tcl/
+build-wasm-notcl/
 net2ir/net2ir
 net2ir/net2ir.js
 net2ir/net2ir.wasm
 
 # Generated test output
 npm/examples/output/
+npm/examples/output-tcl/
 
 # AI stuff
 .claude/
 .claude_agent/
 .claudeignore
 CLAUDE.md
 CLAUDE.local.md
+# LaTeX documentation build artifacts (an in-tree "make" regenerates the
+# PostScript here when latex+dvips are installed; out-of-tree these live in the
+# build dir instead).  The pre-built PostScript under doc/psfiles/ stays tracked.
+doc/latexfiles/psfiles/
+doc/latexfiles/*.dvi
+doc/latexfiles/*.aux
+doc/latexfiles/*.log
+
+# Out-of-tree build directory (generated; was accidentally committed in e7fd0e90)
+/build-alt/
diff --git a/INSTALL b/INSTALL
@@ -53,6 +53,33 @@ Autoconf Capsule Summary:
 			.mag files.  Normally enabled, if the zlib
 			development package is installed.
 
+	--disable-magic-builddate
+			Omit the build date/time from the binary.  The date
+			is normally baked in (reported by "magic --version"
+			and written into some output files); omitting it makes
+			the build reproducible -- two builds of the same commit
+			then produce byte-identical objects and binaries, with
+			no dependence on when they were built.  (It also keeps
+			ccache fully effective during development, since the
+			date is the one compile input that changes every
+			second.)  Normally enabled.
+
+	--disable-ccache
+			Do not use ccache even if it is installed.  When
+			ccache is found on PATH it is auto-detected and used
+			to speed up recompiles (the build date is isolated to
+			one object so it does not spoil the cache); this
+			turns that off.
+
+	--enable-ccache-prefix-map
+			Relativize the source paths embedded in compiled
+			objects so a ccache cache can be shared across
+			different checkouts / build directories.  Off by
+			default (it makes debugger source paths relative, so
+			gdb needs "set substitute-path .  <srcdir>").  Only
+			meaningful with ccache, and cross-tree cache hits also
+			need CCACHE_BASEDIR=<build dir> set in the environment.
+
 Notes to Magic maintainers:
 --------------------------
 

diff --git a/INSTALL_MacOS.md b/INSTALL_MacOS.md
@@ -7,11 +7,16 @@ brew install cairo tcl-tk@8 python3 gnu-sed
 brew install --cask xquartz
 ./scripts/configure_mac
 # If you have both TCL8 and TCL9 installed you may need to verify which was selected.
-make database/database.h
+make prepare
 make -j$(sysctl -n hw.ncpu)
 make install # may need sudo depending on your setup
 ```
 
+> Optional: `coreutils` (for GNU `gdate`) is **not required** — reproducible
+> `SOURCE_DATE_EPOCH` builds work with the native BSD `date` too, and `configure`
+> auto-detects either. Install it (`brew install coreutils`) only if you prefer
+> GNU `date`.
+
 ## Without Brew
 Get [XQuartz](https://github.com/XQuartz/XQuartz)