Merge dev-1.0.0 to start the beta

.github/packaging/postinstall_macos

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Enable zsh completion for specs by making sure /etc/zshrc loads the
+# completion functions installed under /usr/local/share/zsh/site-functions.
+#
+# This script is used both by the macOS .pkg installer (as its postinstall
+# script) and by the local "make install" target, so the behaviour stays
+# identical between the two installation paths.
+#
+# It is idempotent: the whole block is wrapped in sentinel markers and is only
+# appended when those markers are not already present, so running it any number
+# of times never produces duplicate fpath entries or duplicate compinit calls.
+set -e
+
+ZSHRC="/etc/zshrc"
+MARKER="# >>> specs completion >>>"
+
+if ! grep -qF "$MARKER" "$ZSHRC" 2>/dev/null; then
+    cat >> "$ZSHRC" <<'EOF'
+
+# >>> specs completion >>>
+typeset -U fpath
+fpath=(/usr/local/share/zsh/site-functions $fpath)
+
+autoload -Uz compinit
+compinit
+# <<< specs completion <<<
+EOF
+    echo "Enabling auto-complete on this machine. Restarting the terminal many be required."
+fi
+
+exit 0

.github/packaging/postuninstall_macos

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Disable the zsh completion for specs that was enabled by postinstall_macos.
+#
+# This script is the counterpart of postinstall_macos. It is used by the local
+# "make uninstall" target to undo the change postinstall_macos made to
+# /etc/zshrc, so the behaviour stays symmetric with installation.
+#
+# It is idempotent: the sentinel-wrapped block is only removed when the markers
+# are present, so running it any number of times never fails or touches an
+# /etc/zshrc that we never modified.
+set -e
+
+ZSHRC="/etc/zshrc"
+MARKER="# >>> specs completion >>>"
+END_MARKER="# <<< specs completion <<<"
+
+if grep -qF "$MARKER" "$ZSHRC" 2>/dev/null; then
+    tmp="$(mktemp)"
+    # Drop the sentinel-wrapped block as well as any blank line(s) that
+    # immediately precede it (postinstall_macos inserts one before the block).
+    awk -v start="$MARKER" -v end="$END_MARKER" '
+        $0 == start { blanks = ""; inblock = 1; next }
+        inblock     { if ($0 == end) inblock = 0; next }
+        /^[[:space:]]*$/ { blanks = blanks $0 "\n"; next }
+        { printf "%s", blanks; blanks = ""; print }
+        END { printf "%s", blanks }
+    ' "$ZSHRC" > "$tmp"
+    cat "$tmp" > "$ZSHRC"
+    /bin/rm -f "$tmp"
+    echo "Disabling auto-complete on this machine"
+fi
+
+exit 0

.github/packaging/specs-completion.bash

@@ -0,0 +1,2 @@
+# bash completion for specs, provided by the specs-autocomplete helper.
+complete -o bashdefault -o default -o nospace -C specs-autocomplete specs

.github/packaging/specs-completion.zsh

@@ -0,0 +1,17 @@
+#compdef specs
+
+_specs() {
+  local cur prev
+  local -a completions
+
+  cur="${words[CURRENT]}"
+  prev="${words[CURRENT-1]}"
+
+  # Call specs-autocomplete and capture newline-separated results
+  completions=("${(@f)$(specs-autocomplete specs "$cur" "$prev")}")
+
+  compadd -- $completions
+}
+
+_specs "$@"
+

.github/packaging/specs-python.wxs.in

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="specs (Python 3.12)"
+           Version="@VERSION@.0"
+           Manufacturer="Yoav Nir"
+           UpgradeCode="A1B2C3D4-E5F6-7890-ABCD-EF1234567891"
+           Scope="perMachine">
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of specs (Python 3.12) is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+    <Property Id="ARPCONTACT" Value="Yoav Nir" />
+    <Property Id="ARPCOMMENTS" Value="A re-writing of the specs pipeline stage from CMS, only changed quite a bit (with Python 3.12 support)" />
+    <Property Id="ARPDISPLAYVERSION" Value="@DISPLAY_VERSION@" />
+
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" Name="specs" />
+    </StandardDirectory>
+
+    <!-- The main executable; carries the PATH environment entry. -->
+    <ComponentGroup Id="MainExecutable" Directory="INSTALLFOLDER">
+      <Component Guid="B2C3D4E5-F6A7-8901-BCDE-F12345678902">
+        <File Id="SpecsExe" Source="msi-stage\specs.exe" KeyPath="yes" />
+        <Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]"
+                     Permanent="no" Part="last" Action="set" System="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- The bundled Python runtime: pythonXY.dll, the C extension modules in
+         DLLs\, and the standard library in Lib\. specs.exe loads the DLL from
+         its own directory and points Python's home there at runtime, so no
+         system Python installation is required. This component group is harvested
+         by heat from the msi-stage directory. -->
+
+    <Feature Id="MainFeature" Title="specs (Python 3.12)" Level="1">
+      <ComponentGroupRef Id="MainExecutable" />
+      <ComponentGroupRef Id="PythonRuntime" />
+    </Feature>
+  </Package>
+</Wix>

.github/packaging/specs.spec.in

@@ -6,7 +6,7 @@ License:        MIT
 URL:            https://github.com/yoavnir/specs2016
 Source0:        specs-%{version}.tar.gz
 
-# Disable automatic dependency detection since Python is statically linked
+# Disable automatic dependency detection since Python is bundled
 AutoReqProv: no
 
 %description
@@ -20,10 +20,15 @@ multiple lines into single lines or vice versa.
 %install
 mkdir -p %{buildroot}/usr/local/bin
 mkdir -p %{buildroot}/usr/share/specs
+mkdir -p %{buildroot}/usr/share/doc/specs
 mkdir -p %{buildroot}/usr/lib/specs
+mkdir -p %{buildroot}/etc/bash_completion.d
 install -m 755 specs %{buildroot}/usr/local/bin/specs
 install -m 755 specs-autocomplete %{buildroot}/usr/local/bin/specs-autocomplete
 install -m 644 specs.1.gz %{buildroot}/usr/share/specs/specs.1.gz
+install -m 644 specs-completion.bash %{buildroot}/etc/bash_completion.d/specs
+install -m 644 docs/LICENSE %{buildroot}/usr/share/doc/specs/LICENSE
+install -m 644 docs/PYTHON_LICENSE %{buildroot}/usr/share/doc/specs/PYTHON_LICENSE
 cp -r python %{buildroot}/usr/lib/specs/
 
 %post
@@ -91,4 +96,7 @@ fi
 /usr/local/bin/specs
 /usr/local/bin/specs-autocomplete
 /usr/share/specs/specs.1.gz
+/etc/bash_completion.d/specs
+/usr/share/doc/specs/LICENSE
+/usr/share/doc/specs/PYTHON_LICENSE
 /usr/lib/specs/python

.github/workflows/c-cpp.yml

@@ -2,19 +2,23 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ dev, stable, dev-0.9.9, dev-1.0.0, dev-packaging]
+    branches: [ dev, stable, dev-1.0.0, dev-1.1.0]
   pull_request:
-    branches: [ dev, stable, dev-0.9.9, dev-1.0.0, dev-packaging]
+    branches: [ dev, stable, dev-1.0.0, dev-1.1.0]
 
 env:
   SPECS_BRANCH: ${{ github.event.pull_request.base.ref || github.ref_name }}
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  SPECS_BUILD_SOURCE: github
+  SPECS_BUILD_RUNID: ${{ github.run_id }}
+  SPECS_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
   build-linux:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -25,19 +29,21 @@ jobs:
         echo "Event: ${{ github.event_name }}, Ref: ${{ github.ref }}, SPECS_BRANCH: ${SPECS_BRANCH}"
         echo "$PR_EVENT"
 
-    - name: Install Python dev headers
-      run: sudo apt-get install -y python3-dev
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.12'
 
     - name: configure
       working-directory: specs/src
-      run: python3 setup.py --branch ${SPECS_BRANCH} --python python3 
+      run: python3.12 setup.py --branch ${SPECS_BRANCH} --python python3.12 
 
     - name: make
       working-directory: specs/src
       run: make all
 
     - name: Test specs executable
-      run:  specs/exe/specs "@version" WRITE "@platform"
+      run:  specs/exe/specs "Version:" 1 "@version" WRITE "Platform:" 1 "@platform" WRITE "Build info:" 1 "@build-info" WRITE "Build URL:" 1 "@build-url"
 
     - name: make check
       working-directory: specs/src
@@ -47,20 +53,25 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.12'
+
     - name: configure
       working-directory: specs/src
-      run: python3 setup.py -c CLANG --branch ${SPECS_BRANCH} --python python3
+      run: python3.12 setup.py -c CLANG --branch ${SPECS_BRANCH} --python python3.12
 
     - name: make
       working-directory: specs/src
       run: make all
 
     - name: Test specs executable
-      run:  specs/exe/specs "@version" WRITE "@platform"
+      run:  specs/exe/specs "Version:" 1 "@version" WRITE "Platform:" 1 "@platform" WRITE "Build info:" 1 "@build-info"
 
     - name: make check
       working-directory: specs/src
@@ -70,12 +81,12 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v3
 
     - name: Build specs (Debug)
       run: msbuild specs/specs.sln /p:Configuration=Debug /p:Platform=x64
@@ -84,4 +95,26 @@ jobs:
       run: msbuild specs/specs.sln /p:Configuration=Release /p:Platform=x64
 
     - name: Test specs executable
-      run: specs/bin/Release/specs.exe "@version" WRITE "@platform"
+      run: specs/bin/Release/specs.exe "Version:" 1 "@version" WRITE "Platform:" 1 "@platform" WRITE "Build info:" 1 "@build-info"
+
+  build-windows-python:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.12'
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v3
+
+    - name: Build specs with Python (Release)
+      run: msbuild specs/specs.sln /p:Configuration=Release /p:Platform=x64 /p:EnablePython=true
+
+    - name: Test specs executable
+      run: specs/bin/Release/specs.exe "Version:" 1 "@version" WRITE "Platform:" 1 "@platform" WRITE "Build info:" 1 "@build-info"