Fixes to generated J2735 from asn1c updates

.github/workflows/ci.yml

@@ -144,6 +144,7 @@ jobs:
           sonar.sourceEncoding=UTF-8
           EOF
       - name:  SonarScanner
+        if: github.event.pull_request.base.repo.owner.login == 'usdot-jpo-ode'
         uses: usdot-fhwa-stol/actions/sonar-scanner@main
         with:
           sonar-properties-path: /tmp/sonar-scanner.properties

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/zeux/pugixml.git
 [submodule "usdot-asn1c"]
 	path = usdot-asn1c
-	url = https://github.com/usdot-fhwa-stol/usdot-asn1c
+	url = https://github.com/usdot-fhwa-stol/usdot-asn1c.git

CMakeLists.txt

@@ -44,7 +44,9 @@ link_directories("/usr/local/lib")
 
 # CPP Preprocessor variable PDU is used in the asn1-j2735-lib.h file to build a variable to a ASN.1 parsing structure.
 # This variable may need changing if we are parsing some other type of ASN.1 schema.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPDU=MessageFrame")
+# Define HAVE_TM_GMTOFF to allow compiling the generated code for GeneralizedTime types in Alpine
+# Define ASN_PDU_COLLECTION to compile all PDUs that were generated.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_TM_GMTOFF -DASN_PDU_COLLECTION")
 
 # Currently using boost/asio, not standalone asio.
 # If it were desired to use standalone asio, uncomment the following:

README.md

@@ -34,8 +34,8 @@ consumers and producers do not run in this mode.
 **Other Documents**
 1. [Installation](docs/installation.md)
 2. [Configuration and Operation](docs/configuration.md)
-2. [Interface](docs/interface.md)
-3. [Testing](docs/testing.md)
+3. [Interface](docs/interface.md)
+4. [Testing](docs/testing.md)
 
 ## Release Notes
 The current version and release history of the asn1_codec: [asn1_codec Release Notes](<docs/Release_notes.md>)

asn1c_combined/doIt.sh

@@ -13,15 +13,21 @@ else
     year=$J2735_YEAR
 fi
 
-# Copy generated files to for specified year to asn1c_combined & extract
+# Copy generated files for specified year to asn1c_combined & extract
 echo "Extracting & copying generated files for $year"
 tar -xzf ./generated-files/$year.tar.gz
 cp ./generated-files/$year/* .
 
 # Compile example
 echo "Compiling example"
-sed -i 's/\(-DASN_PDU_COLLECTION\)/-DPDU=MessageFrame \1/' ./converter-example.mk
-make -f ./converter-example.mk
+
+# The HAVE_TM_GMTOFF flag needs to be set to compile GeneralizedTime.c on platforms including Alpine.
+# Add it to ASN_MODULE_CFLAGS which gets added to CFLAGS in converter-example.mk
+make ASN_MODULE_CFLAGS="-DHAVE_TM_GMTOFF" -f ./converter-example.mk
+
+# Verify that the converter example executable compiled and can run
+./converter-example -p list
+
 
 # Clean up
 echo "Cleaning up"

asn1c_combined/generate-files.sh

@@ -24,53 +24,24 @@ if [ ! -d "./generated-files/$year" ]; then
     mkdir ./generated-files/$year
 fi
 
-# If 2024, apply .ASN file edits
-if [ "$year" == "2024" ]; then
-    echo "Applying J2735 ASN Edits"
-    patch --binary --backup --forward --reject-file="-" \
-        ./j2735-asn-files/2024/J2945-3-RoadWeatherMessage-2024-rel-v2.1.asn \
-        ./j2735-asn-files/2024/asn-edits/RoadWeatherMessage.patch
-    patch --binary --backup --forward --reject-file="-" \
-        ./j2735-asn-files/2024/J3217-R-RoadUserChargingReportMsg-2024-rel-v1.1.asn \
-        ./j2735-asn-files/2024/asn-edits/RoadUserChargingReportMessage.patch
-    patch --binary --backup --forward --reject-file="-" \
-        ./j2735-asn-files/2024/J3217-TollUsageMsg-2024-rel-v1.1.asn \
-        ./j2735-asn-files/2024/asn-edits/TollUsageMessage.patch
 
-    # Verify that the patches were applied correctly
-    if ! grep -q RwmSnapShot ./j2735-asn-files/2024/J2945-3-RoadWeatherMessage-2024-rel-v2.1.asn; then
-        echo "The patch for the Road Weather Message ASN file was not applied correctly."
-        exit 1
-    fi
-
-    if ! grep -q TumVehicleId ./j2735-asn-files/2024/J3217-R-RoadUserChargingReportMsg-2024-rel-v1.1.asn; then
-        echo "The patch for the Road User Charging Report Message ASN file was not applied correctly."
-        exit 1
-    fi
+# Patches to the ASN.1 files aren't needed.
+# If any ASN.1 file edits are needed in the future, do them here.
 
-    if ! grep -q TumVehicleId ./j2735-asn-files/2024/J3217-TollUsageMsg-2024-rel-v1.1.asn; then
-        echo "The patch for the Toll Usage Message ASN file was not applied correctly."
-        exit 1
-    fi
 
-fi
-
-
-asn1c -fcompound-names -gen-OER -fincludes-quoted -no-gen-JER -pdu=all \
+# - Use -fno-included-deps to avoid issue with circular references.
+# - Use -fcase-insensitive-filenames for compiling the 2024 specification to work in case-insensitive filesystems such as
+# Windows WSL.
+asn1c -fno-include-deps -fcompound-names -fcase-insensitive-filenames -gen-OER -fincludes-quoted -no-gen-JER -pdu=all \
     ./scms-asn-files/*.asn \
     ./j2735-asn-files/$year/*.asn \
     ./semi-asn-files/$year/SEMI*.asn \
     -D ./generated-files/$year \
     2>&1 | tee compile.out
 
-
 
-# if 2020 or 2024, copy overrides
-if [ "$year" == "2020" ] || [ "$year" = "2024" ]; then
-    echo "Copying overrides for $year"
-    cp ./j2735-asn-files/$year/overrides/*.h ./generated-files/$year
-    cp ./j2735-asn-files/$year/overrides/*.c ./generated-files/$year
-fi
+# C code overrides aren't needed.
+# If any overrides are needed in the future, copy them to the generated code them here.
 
 
 # tar generated files and delete originals

asn1c_combined/j2735-asn-files/2024/.gitignore

@@ -1,4 +1,4 @@
 **/*.asn
 **/*.ASN
 **/*.asn.orig
-**/*.asn.EDITED
+**/*.asn.edited