diff --git a/.envrc b/.envrc index 5aff3d4..012d0ea 100644 --- a/.envrc +++ b/.envrc @@ -7,8 +7,8 @@ if has asdf; then use asdf fi -# Load Guix shell if guix.scm exists -if has guix && [ -f guix.scm ]; then +# Load Guix shell if build/guix.scm exists +if has guix && [ -f build/guix.scm ]; then use guix fi diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc deleted file mode 100644 index 7e4430a..0000000 --- a/CONTRIBUTING.adoc +++ /dev/null @@ -1,55 +0,0 @@ -== Contributing to PseudoScript - -This is a *brand-surface repo*. The compiler, type checker, borrow -checker, codegen, and face transformer all live in -https://github.com/hyperpolymath/affinescript[affinescript]. - -=== Where to file what - -[width="100%",cols="50%,50%",options="header",] -|=== -|Issue |Repo -|The face transformer mangles my code -|https://github.com/hyperpolymath/affinescript/issues[affinescript] - -|The error message uses the wrong vocabulary for this face -|https://github.com/hyperpolymath/affinescript/issues[affinescript] — -the face vocabulary lives in `+lib/face.ml+` - -|New language feature needed (extern types, dependent types, etc.) -|https://github.com/hyperpolymath/affinescript/issues[affinescript] - -|Brand README is unclear / wrong |this repo - -|Example program doesn’t compile |this repo (and probably also -affinescript if it’s a transformer bug) - -|Tutorial / migration guide additions |this repo - -|Add this face to my IDE / build tool |this repo, but expect it to -depend on affinescript work first -|=== - -=== Local workflow - -[source,bash] ----- -opam install affinescript # installs the compiler -git clone https://github.com/hyperpolymath/pseudoscript -cd pseudoscript -just hello # smoke-test the example -just check examples/hello.affine -just preview examples/hello.affine ----- - -=== Pull requests - -* SPDX header on every new file (`+AGPL-3.0-or-later+`). -* Run `+just hello+` and any other examples added before opening the PR. -* If you’re touching the face transformer, open the PR against -https://github.com/hyperpolymath/affinescript[affinescript], not here. - -=== Code of conduct - -See `+CODE_OF_CONDUCT.md+` (TBD; for now follow the affinescript code of -conduct). diff --git a/Justfile b/Justfile index bf6f178..78547e2 100644 --- a/Justfile +++ b/Justfile @@ -476,8 +476,8 @@ self-assess: echo " → KEEP if others might build with Nix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1187,11 +1187,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Nix development shell (fallback) nix-shell: diff --git a/QUICKSTART-MAINTAINER.adoc b/QUICKSTART-MAINTAINER.adoc index cf57924..d5ba9fd 100644 --- a/QUICKSTART-MAINTAINER.adoc +++ b/QUICKSTART-MAINTAINER.adoc @@ -32,7 +32,7 @@ Output: `{{BUILD_OUTPUT_PATH}}` [source,bash] ---- -guix build -f guix.scm +guix build -f build/guix.scm ---- === Nix diff --git a/docs/RSR_OUTLINE.adoc b/docs/RSR_OUTLINE.adoc index 35c620c..e2ca149 100644 --- a/docs/RSR_OUTLINE.adoc +++ b/docs/RSR_OUTLINE.adoc @@ -37,7 +37,7 @@ git init just init # Enter development environment -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Validate compliance just validate-rsr diff --git a/guix.scm b/guix.scm deleted file mode 100644 index 6887279..0000000 --- a/guix.scm +++ /dev/null @@ -1,28 +0,0 @@ -;; SPDX-License-Identifier: MPL-2.0 -;; Guix development environment. -;; Usage: guix shell -D -f guix.scm - -(use-modules (guix packages) - (guix build-system gnu) - (guix licenses) - (gnu packages base) - (gnu packages bash) - (gnu packages base) - (gnu packages java) - (gnu packages rust) - (gnu packages cmake) - (gnu packages zig) - (gnu packages golang) - (gnu packages node) - (gnu packages python)) - -(package - (name "pseudoscript") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash make openjdk rust cmake zig go node python)) - (synopsis "pseudoscript") - (description "pseudoscript — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/pseudoscript") - (license ((@@ (guix licenses) license) "MPL-2.0" "https://github.com/hyperpolymath/palimpsest-license")))