Add --json and --json-file CLI args to Lfc

.github/actions/setup-ros2/action.yml

@@ -9,6 +9,6 @@ runs:
      # see https://github.com/ros-tooling/setup-ros/issues/80 and https://github.com/ros2/rmw_cyclonedds/pull/134
      run: sed -e 's/azure.archive.ubuntu.com/us.archive.ubuntu.com/g' -e t -e d /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/nonazure.list
    - name: Setup ROS2
-     uses: ros-tooling/setup-ros@0.6.1
+     uses: lhstrh/setup-ros@master
      with:
        required-ros-distributions: rolling

.github/scripts/test-lfc.sh

@@ -16,5 +16,54 @@ function test_with_links() {
 
 bin/lfc test/C/src/Minimal.lf
 
+# -c,--clean                         Clean before building.
+bin/lfc -c test/C/src/Minimal.lf
+bin/lfc --clean test/C/src/Minimal.lf
+
+#    --external-runtime-path <arg>   Specify an external runtime library to
+#                                    be used by the compiled binary.
+
+# -f,--federated                     Treat main reactor as federated.
+bin/lfc -f test/C/src/Minimal.lf
+bin/lfc --federated test/C/src/Minimal.lf
+
+# --rti                              Specify address of RTI.
+bin/lfc -f --rti rti test/C/src/Minimal.lf
+bin/lfc --federated --rti rti test/C/src/Minimal.lf
+
+# -h,--help                          Display this information.
+bin/lfc -h
+bin/lfc --help
+
+# -l, --lint                         Enable linting during build.
+bin/lfc -l test/Python/src/Minimal.lf
+bin/lfc --lint test/Python/src/Minimal.lf
+
+# -n,--no-compile                    Do not invoke target compiler.
+bin/lfc -n test/C/src/Minimal.lf
+bin/lfc --no-compile test/C/src/Minimal.lf
+
+# -o,--output-path <arg>             Specify the root output directory.
+bin/lfc -o . test/C/src/Minimal.lf
+bin/lfc --output-path . test/C/src/Minimal.lf
+
+#    --runtime-version <arg>         Specify the version of the runtime
+#                                    library used for compiling LF
+#                                    programs.
+bin/lfc --runtime-version f157be30bbeab0e2a991f29f9c7f388ca39681a7 test/Cpp/src/Minimal.lf
+
+# -w,--workers                       Specify the default number of worker threads.
+bin/lfc -w 2 test/C/src/Minimal.lf
+bin/lfc --workers 2 test/C/src/Minimal.lf
+bin/lfc --threading true test/C/src/Minimal.lf
+bin/lfc --threading false test/C/src/Minimal.lf
+
+#    --target-compiler <arg>         Target compiler to invoke.
+# (Added no-compile to avoid adding dependency.)
+bin/lfc --target-compiler gcc --no-compile test/C/src/Minimal.lf 
+
+# --version
+bin/lfc --version
+
 # Ensure that lfc is robust to symbolic links.
 test_with_links "lfc"

.github/workflows/c-zephyr-tests.yml

@@ -21,7 +21,7 @@ jobs:
   run:
     runs-on: ubuntu-latest
     container:
-      image: zephyrprojectrtos/zephyr-build:v0.24.13
+      image: zephyrprojectrtos/zephyr-build:latest
       options: -u root --entrypoint /bin/sh 
     steps:
       - name: Install Java 17, Maven and set JAVA_HOME
@@ -45,9 +45,7 @@ jobs:
           ref: ${{ inputs.compiler-ref }}
           fetch-depth: 0
       - name: Try to get around git safe issues
-        run: |
-          git config --global --add safe.directory '/__w/lingua-franca/lingua-franca'
-          git config --global --add safe.directory '/__w/reactor-c/reactor-c'
+        run: git config --global --add safe.directory /__w/lingua-franca/lingua-franca 
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
       - name: Check out specific ref of reactor-c

.github/workflows/ts-tests.yml

@@ -28,7 +28,7 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
       - name: Perform TypeScript tests
         run: |
-          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#master"
+          ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.*
       - name: Report to CodeCov
         uses: codecov/[email protected]
         with:

build.gradle

@@ -42,8 +42,9 @@ subprojects {
         implementation group: 'com.google.inject', name: 'guice', version: guiceVersion
         // https://picocli.info/
         implementation group: 'info.picocli', name: 'picocli', version: picocliVersion
-    }
-    dependencies {
+        // https://mvnrepository.com/artifact/com.google.code.gson/gson
+        implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+        // https://kotlinlang.org
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlinVersion
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion
     }

gradle.properties

@@ -3,10 +3,10 @@ group=org.lflang
 version=0.4.1-SNAPSHOT
 
 [versions]
-picocliVersion=4.7.0
 googleJavaFormatVersion=1.15.0
 guiceVersion=5.1.0
 jacocoVersion=0.8.7
+gsonVersion=2.10.1
 jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
 jUnitVersion=4.13.2
@@ -15,6 +15,7 @@ kotlinVersion=1.6.20
 lsp4jVersion=0.14.0
 mwe2LaunchVersion=2.12.2
 openTest4jVersion=1.2.0
+picocliVersion=4.7.0
 resourcesVersion=3.16.0
 shadowJarVersion=7.1.2
 spotlessVersion=6.11.0