GitLab

at 2025-03-03T17:15:00-08:00

Modify how exports-errno.lisp is created.

To make it a little easier to read, we use `{...} >
src/code/exports-errno.lisp`.  Then we can more easily see the header
and the footer of the file and also the commands used to generate all
the exported symbols.

Update some comments in the generated file as well.

@@ -53,6 +53,7 @@ $LISP "$@" -noinit -nositeinit <<EOF
  (pushnew :no-clm *features*)
  (pushnew :no-hemlock *features*)
 +(load "target:code/exports-errno")
  (load "target:code/exports")
  (load "target:tools/setup" :if-source-newer :load-source)
  (comf "target:tools/setup" :load t)

@@ -82,7 +82,8 @@ if [ -n "$SHOW" ]; then
  fi
  # Now generate the defpackage form for the ERRNO package.
 -cat > src/code/exports-errno.lisp <<EOF
 +{
 +    cat  <<EOF
  ;;; -*- Log: C.Log -*-
  ;;;
  ;;; **********************************************************************
@@ -94,7 +95,11 @@ cat > src/code/exports-errno.lisp <<EOF
  ;;;
  ;;; **********************************************************************
  ;;;
 -;;; All the stuff necessary to export various symbols from various packages.
 +;;; Defines the ERRNO package and all the exported symbols.
 +;;;
 +;;; This file is auto-generated via bin/create-errno.sh.
 +;;;
 +;;; DO NOT EDIT!
  ;;;
  (in-package "LISP")
@@ -105,11 +110,20 @@ cat > src/code/exports-errno.lisp <<EOF
      (rename-package "ERRNO" "ERRNO" 'nil)
      (make-package "ERRNO" :nicknames 'nil :use nil))
 +(use-package '("LISP") "ERRNO")
++
  (defpackage "ERRNO"
    (:export
 -$(grep '(def-unix-error ' $ERRNO_FILE |
 -  cut -d ' ' -f2 |
 -  sed 's/\(.*\)/   "\1"/' |
 -  sort)
 +EOF
 +    # Get the def-unix-error forms from the ERRNO_FILE, extract out
 +    # the name, put double-quotes around them and then sort the result
 +    # to get all the exported symbols for the ERRNO package.
 +    grep '(def-unix-error ' $ERRNO_FILE |
 +	cut -d ' ' -f2 |
 +	sed 's/\(.*\)/   "\1"/' |
 +	sort
 +    # Close the defpackage form
 +    cat <<EOF
     ))
  EOF
 +} > src/code/exports-errno.lisp

@@ -136,7 +136,6 @@
  (use-package '("SYSTEM" "ALIEN-INTERNALS" "ALIEN" "LISP") "C-CALL")
  (use-package '("KERNEL" "EXTENSIONS" "LISP") "INSPECT")
  (use-package '("LISP" "KERNEL") "BIGNUM")
 -(use-package '("LISP") "ERRNO")
  (use-package '("LISP") "UNIX")
  (use-package '("KERNEL" "LISP" "EXTENSIONS") "FORMAT")
  (use-package '("EXTENSIONS" "SYSTEM" "DEBUG" "KERNEL" "BIGNUM") "LISP")

@@ -315,6 +315,7 @@
    (comf "target:code/multi-proc"))
  (comf "target:code/setf-funs")
 +(comf "target:code/exports-errno" :proceed t)
  (comf "target:code/exports" :proceed t)
  ;;; Compile basic macros that we assume are already in the compilation

@@ -78,6 +78,7 @@
  ;;; Make sure the package structure is correct.
  ;;;
 +(maybe-byte-load "code:exports-errno")
  (maybe-byte-load "code:exports")
  ;;; Load random code sources.

Raymond Toy pushed to branch issue-390-autogen-errno-package at cmucl / cmucl

Commits:

5 changed files:

Changes: