Merge remote-tracking branch 'origin/main' into tumbar-type-aliases-1

.github/workflows/native-build.yml

@@ -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
@@ -138,13 +138,13 @@ jobs:
       - 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 }}
@@ -155,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 }}/*
@@ -176,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 }}
@@ -198,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/*
@@ -213,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
@@ -240,7 +240,7 @@ jobs:
       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

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
 
@@ -24,7 +24,7 @@ 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.
 See the F Prime installation instructions
-https://github.com/nasa/fprime/blob/master/docs/INSTALL.md[here].
+https://fprime.jpl.nasa.gov/latest/getting-started/installing-fprime/[here].
 
 === Spec and User's Guide
 

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

@@ -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

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[]"] }]