.github/workflows/build-test.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/native-build.yml

@@ -49,7 +49,7 @@ on:
         type: boolean
 jobs:
   build-jars:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     name: "Build Standard JARs"
     steps:
       - name: "Checkout repository"
@@ -64,7 +64,7 @@ jobs:
           ${{ inputs.build }} ${{ inputs.output-directory }}
         shell: bash
       - name: "Archiving JARs package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-jar
           path: ${{ inputs.output-directory }}/*
@@ -80,7 +80,7 @@ jobs:
           ${{ inputs.test }}
           echo -e "Trace output files:\n$( find ${{ inputs.trace-directory }} -name *.json )"
       - name: "Archiving Tracing"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jar-traces
           path: ${{ inputs.trace-directory }}/*.json
@@ -90,7 +90,7 @@ jobs:
     outputs:
       native: ${{ steps.set-matrix.outputs.native }}
       tags: ${{ steps.set-matrix.outputs.tags }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - id: set-matrix
         shell: python
@@ -101,13 +101,13 @@ jobs:
           matrix = {
             "run": [
               {
-                "runner": "macos-12",
-                "tag": "macosx_12_0_universal2"
+                "runner": "macos-13",
+                "tag": "macosx_13_0_universal2"
               },
               {
-                "runner": "ubuntu-latest",
-                "tag": "manylinux2014_x86_64",
-                "container": "quay.io/pypa/manylinux2014_x86_64"
+                "runner": "ubuntu-22.04",
+                "tag": "manylinux_2_28_x86_64",
+                "container": "quay.io/pypa/manylinux_2_28_x86_64"
               }
             ]
           }
@@ -131,27 +131,20 @@ jobs:
     container:
       image:  ${{ matrix.run.container || '' }}
     steps:
-      - name: "Fix environment"
-        run: |
-          # https://github.com/actions/checkout/issues/1809
-          # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
-          echo "ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION=node16" >> $GITHUB_ENV
-          echo "ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION=node16" >> $GITHUB_ENV
-          echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
       - name: "Checkout repository"
         uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: "Setup Native Image Tools"
         uses: fprime-community/native-images-action@main
       - name: "Download JARs"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-jar
           path:  ${{ inputs.output-directory }}
       - if: ${{ inputs.trace }}
         name: "Download Tracing"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: jar-traces
           path: ${{ inputs.trace-directory }}
@@ -162,7 +155,7 @@ jobs:
           $NATIVE_IMAGE_TOOLS_PATH/native-images ${{ inputs.output-directory }} ${{ inputs.tools }}
         shell: bash
       - name: "Archive Native Images"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.run.tag }}
           path:  ${{ inputs.output-directory }}/*
@@ -174,7 +167,7 @@ jobs:
           ${{ inputs.test }}
   build-wheels:
     needs: [build-jars, build-native-images, generate-run-matricies]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix: ${{ fromJson(needs.generate-run-matricies.outputs.tags) }}
     steps:
@@ -183,7 +176,7 @@ jobs:
         with:
           submodules: recursive
       - name: "Download Package"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-${{ matrix.tag }}
           path: ${{ inputs.output-directory }}
@@ -205,7 +198,7 @@ jobs:
           fprime-native-packager ${{ inputs.output-directory }} ${FLAGS}
         shell: bash
       - name: "Archiving Wheels"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-${{ matrix.tag }}
           path: packages/dist/*
@@ -220,12 +213,12 @@ jobs:
       - name: "Setup Native Image Tools"
         uses: fprime-community/native-images-action@main
       - name: "Download Native Wheels"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wheels-${{ matrix.run.tag }}
           path: ${{ inputs.output-directory }}/native
       - name: "Download JAR Wheels"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wheels-jar
           path: ${{ inputs.output-directory }}/jars
@@ -242,12 +235,12 @@ jobs:
   publish-wheels:
     if: ${{ github.event_name == 'release' }}
     needs: [test-wheels, generate-run-matricies]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix: ${{ fromJson(needs.generate-run-matricies.outputs.tags) }}
     steps:
       - name: "Download Package"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wheels-${{ matrix.tag }}
           path: dist

.github/workflows/odroid-keepalive.yml

@@ -0,0 +1,23 @@
+# The purpose of this workflow is to prevent the Odroid (self-hosted) runner 
+# from being de-registered by GitHub due to inactivity.
+# We only use the Odroid on FPP releases, but runners get de-registered after 14 days 
+# of idling.
+# See https://github.com/orgs/community/discussions/58146
+# https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/removing-self-hosted-runners#removing-a-runner-from-a-repository
+
+
+name: Odroid Keepalive
+
+on:
+  # workflow_dispatch allows for manual trigger in the repo 'Actions' tab
+  workflow_dispatch:
+  # run every Monday 8am
+  schedule:
+    - cron: '0 8 * * 1'
+
+jobs:
+  keepAlive:
+    runs-on: odroid
+    steps:
+      - name: Echo a message
+        run: echo I am still alive!

README.adoc

@@ -3,7 +3,7 @@
 This repository contains the code and documentation for F Prime Prime (FPP for 
 short).
 FPP is a modeling language for the
-https://nasa.github.io/fprime/[F Prime flight software framework].
+https://fprime.jpl.nasa.gov[F Prime flight software framework].
 
 == Contents
 
@@ -21,10 +21,10 @@ There is also an FPP plugin available within Visual Studio Code.
 
 See `compiler/README.adoc`.
 To use or develop FPP in a standalone mode, you should install these tools.
-To use FPP as part of F Prime development, you can install the F Prime tool set,
-which includes FPP.
+To use FPP as part of F Prime development, you can install the F Prime tool
+set, which includes FPP.
 See the F Prime installation instructions
-https://github.com/nasa/fprime/blob/master/docs/INSTALL.md[here].
+https://fprime.jpl.nasa.gov/latest/docs/getting-started/installing-fprime/[here].
 
 === Spec and User's Guide
 

compiler/.jvmopts

@@ -0,0 +1,2 @@
+-XX:+CMSClassUnloadingEnabled
+-Xss2M

compiler/README.adoc

@@ -34,8 +34,9 @@ That way you can run the tools from anywhere.
 * `fpp-locate-uses`
 * `fpp-syntax`
 * `fpp-to-cpp`
-* `fpp-to-xml`
 * `fpp-to-dict`
+* `fpp-to-layout`
+* `fpp-to-xml`
 
 See https://github.com/fprime-community/fpp/wiki/Tools for more information.
 
@@ -154,10 +155,25 @@ To do that, use the following procedure:
 . Run `./install-trace` to install JVM versions of the FPP tools with
 tracing enabled in the `bin` directory.
 
+. Edit the file
+`compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json`
+so that it contains a pair of square brackets `[]` and nothing else.
+This will clear out any old trace information.
+
 . Run `./test` to use the installed tools to run the unit tests.
-This will run the tracing agent and update the trace files.
+This step will run the tracing agent and update the trace files.
+All the tests should pass.
+If the tests go haywire with failures, the likely cause
+is an errant `.lock` file left behind by the tracing agent.
+Run `find . -name .lock` in this directory to find the file;
+then delete it and retry.
 
 . Commit the updated trace files to the repository.
 
-Remember to run `./install` to install the standard version
-of the tools if you no longer want to run the tracing agent.
+. Run `./install` to reinstall the standard version
+of the tools.
+
+. If you wish, run `./release` to build the native
+image files with the new trace files and run the unit tests.
+All the tests should pass.
+Alternatively you can let CI on `nasa/fpp` do this step.

compiler/build.sbt

@@ -9,7 +9,7 @@ lazy val settings = Seq(
     "-deprecation",
     "-unchecked",
     "-Xfatal-warnings",
-    "-Xmax-inlines:200"
+    "-Xmax-inlines:100"
   ),
   libraryDependencies ++= dependencies, 
   Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-oNCXELOPQRM"),
@@ -40,7 +40,8 @@ lazy val root = (project in file("."))
     fpp_to_cpp,
     fpp_to_json,
     fpp_to_xml,
-    fpp_to_dict
+    fpp_to_dict,
+    fpp_to_layout
   )
 
 lazy val lib = project
@@ -106,3 +107,7 @@ lazy val fpp_to_dict = (project in file("tools/fpp-to-dict"))
   .dependsOn(lib)
   .enablePlugins(AssemblyPlugin)
 
+lazy val fpp_to_layout = (project in file("tools/fpp-to-layout"))
+  .settings(settings)
+  .dependsOn(lib)
+  .enablePlugins(AssemblyPlugin)

compiler/install

@@ -64,6 +64,7 @@ fpp-to-cpp
 fpp-to-json
 fpp-to-xml
 fpp-to-dict
+fpp-to-layout
 "
 
 if git describe --tags --always > /dev/null 2>&1
@@ -76,7 +77,7 @@ else
 fi
 util=lib/src/main/scala/util
 echo "Updating version to $version"
-sed -i.bak -e "s/val v = .*/val v = \"$version\"/" \
+sed -i.update.bak -e "s/val v = .*/val v = \"$version\"/" \
   $util/Version.scala
 
 echo "Building jar files"
@@ -85,7 +86,8 @@ echo $cmd
 $cmd
 
 echo "Restoring Version.scala"
-cp $util/Version.scala.bak $util/Version.scala
+sed -i.restore.bak -e "s/val v = .*/val v = \"[unknown version]\"/" \
+  $util/Version.scala
 
 mkdir -p $dest
 

compiler/lib/src/main/resources/META-INF/native-image/jni-config.json

@@ -11,6 +11,10 @@
   "name":"fpp.compiler.FPPToDict",
   "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
 },
+{
+  "name":"fpp.compiler.FPPToLayout",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+},
 {
   "name":"fpp.compiler.FPPtoJson",
   "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]