Add CDL support

.cirrus.yml

@@ -8,7 +8,7 @@ task:
       image_family: freebsd-14-2
       image_family: freebsd-13-5
       image_family: freebsd-13-4
-  install_script: pkg install -y git meson ntp
+  install_script: pkg install -y git meson cmake ntp
   submodules_script: git submodule update --init --recursive --progress
   release_script: |
     branchName=$(printf '%s' "$CIRRUS_BRANCH" | tr '/' '-')

.gitattributes

@@ -1,14 +1,194 @@
 # SPDX-License-Identifier: MPL-2.0
-#this file specifies some rules on specific files for line endings and more.
-#it also has a section on which files should NOT be part of an export (git archive) command.
-
-#List of files to NOT export:
-.git		export-ignore
-.github		export-ignore
-.cirrus.yml	export-ignore
-.whitesource	export-ignore
-.vscode		export-ignore
-.travis.yml	export-ignore
-
-#force specific line endings:
-*.sh	eol=lf
+
+# Auto detect text files and perform LF normalization
+*          text=auto
+
+#
+# The above will handle all files NOT found below
+#
+
+# Sources
+*.c     text diff=cpp
+*.cc    text diff=cpp
+*.cxx   text diff=cpp
+*.cpp   text diff=cpp
+*.cpi   text diff=cpp
+*.c++   text diff=cpp
+*.hpp   text diff=cpp
+*.h     text diff=cpp
+*.h++   text diff=cpp
+*.hh    text diff=cpp
+# Python Scripts
+*.pxd    text diff=python
+*.py     text diff=python
+*.py3    text diff=python
+*.pyw    text diff=python
+*.pyx    text diff=python
+*.pyz    text diff=python
+*.pyi    text diff=python
+
+# Compiled Object files
+*.slo   binary
+*.lo    binary
+*.o     binary
+*.obj   binary
+
+# Precompiled Headers
+*.gch   binary
+*.pch   binary
+
+# Compiled Dynamic libraries
+*.so    binary
+*.dylib binary
+*.dll   binary
+
+# Compiled Static libraries
+*.lai   binary
+*.la    binary
+*.a     binary
+*.lib   binary
+
+# Executables
+*.exe   binary
+*.out   binary
+*.app   binary
+
+# Binary files (Python related)
+*.db     binary
+*.p      binary
+*.pkl    binary
+*.pickle binary
+*.pyc    binary export-ignore
+*.pyo    binary export-ignore
+*.pyd    binary
+
+# Jupyter notebook
+*.ipynb  text eol=lf
+
+# Documents
+*.bibtex   text diff=bibtex
+*.doc      diff=astextplain
+*.DOC      diff=astextplain
+*.docx     diff=astextplain
+*.DOCX     diff=astextplain
+*.dot      diff=astextplain
+*.DOT      diff=astextplain
+*.pdf      diff=astextplain
+*.PDF      diff=astextplain
+*.rtf      diff=astextplain
+*.RTF      diff=astextplain
+*.md       text diff=markdown
+*.mdx      text diff=markdown
+*.tex      text diff=tex
+*.adoc     text
+*.textile  text
+*.mustache text
+*.csv      text eol=crlf
+*.tab      text
+*.tsv      text
+*.txt      text
+*.sql      text
+*.epub     diff=astextplain
+
+# Graphics
+*.png      binary
+*.jpg      binary
+*.jpeg     binary
+*.gif      binary
+*.tif      binary
+*.tiff     binary
+*.ico      binary
+# SVG treated as text by default.
+*.svg      text
+# If you want to treat it as binary,
+# use the following line instead.
+# *.svg    binary
+*.eps      binary
+
+# Scripts
+*.bash     text eol=lf
+*.fish     text eol=lf
+*.ksh      text eol=lf
+*.sh       text eol=lf
+*.zsh      text eol=lf
+# These are explicitly windows files and should use crlf
+*.bat      text eol=crlf
+*.cmd      text eol=crlf
+*.ps1      text eol=crlf
+*.ps1x     text eol=crlf
+*.psm1     text eol=crlf
+*.psd1     text eol=crlf
+*.ps1xml   text eol=crlf
+*.pssc     text eol=crlf
+*.psrc     text eol=crlf
+*.cdxml    text eol=crlf
+# Meson build files
+meson.build       text
+meson_options.txt text
+
+# Visual Studio Files
+*.sln        text eol=crlf
+*.csproj     text eol=crlf
+*.vbproj     text eol=crlf
+*.vcxproj    text eol=crlf
+*.vcproj     text eol=crlf
+*.dbproj     text eol=crlf
+*.fsproj     text eol=crlf
+*.lsproj     text eol=crlf
+*.wixproj    text eol=crlf
+*.modelproj  text eol=crlf
+*.sqlproj    text eol=crlf
+*.wwaproj    text eol=crlf
+
+*.xproj      text eol=crlf
+*.props      text eol=crlf
+*.filters    text eol=crlf
+*.vcxitems   text eol=crlf
+
+# VSCode
+# Fix syntax highlighting on GitHub to allow comments
+.vscode/*.json linguist-language=JSON-with-Comments
+
+# Serialization
+*.json     text
+*.toml     text
+*.xml      text
+*.yaml     text
+*.yml      text
+
+# Archives
+*.7z       binary
+*.bz       binary
+*.bz2      binary
+*.bzip2    binary
+*.gz       binary
+*.lz       binary
+*.lzma     binary
+*.rar      binary
+*.tar      binary
+*.taz      binary
+*.tbz      binary
+*.tbz2     binary
+*.tgz      binary
+*.tlz      binary
+*.txz      binary
+*.xz       binary
+*.Z        binary
+*.zip      binary
+*.zst      binary
+
+# Text files where line endings should be preserved
+*.patch    -text
+
+#
+# Exclude files from exporting
+#
+
+.gitattributes export-ignore
+.gitignore     export-ignore
+.gitkeep       export-ignore
+.git		   export-ignore
+.github		   export-ignore
+.cirrus.yml	   export-ignore
+.whitesource   export-ignore
+.vscode	       export-ignore

.github/workflows/c-cpp.yml

@@ -56,6 +56,9 @@ jobs:
       run: |
         echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
 
+    - name: Make buildjsonc.sh executable
+      run: chmod +x Make/buildjsonc.sh
+
     - name: make
       working-directory: ${{ matrix.config.builddir }}
       run: |

.github/workflows/msbuild.yml

@@ -15,7 +15,7 @@ on:
 
 env:
   # Path to the solution file relative to the root of the project.
-  SOLUTION_FILE_PATH: Make/VS.2019
+  SOLUTION_FILE_PATH: Make/VS.2022
 
   # Configuration type to build.
   # You can convert this to a build matrix if you need coverage of multiple configuration types.

.github/workflows/vmactions.yml

@@ -22,7 +22,7 @@ jobs:
           pkg install socat
 
         run: |
-          pkg install bison build-essential flex ninja pkg-config
+          pkg install bison build-essential flex ninja pkg-config cmake
 
           python3 -m pip install --upgrade pip setuptools wheel
           python3 -m pip install meson
@@ -50,6 +50,8 @@ jobs:
 
         run: |
           pkg install --accept developer/build/meson
+          # Cmake appears to already be available in the version with gcc pre-installed.
+          # pkg install --accept developer/build/cmake
 
           meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ --buildtype=release
           meson install -C build
@@ -94,7 +96,7 @@ jobs:
           ntpdate -u pool.ntp.org
 
         run: |
-          pkg install -y meson
+          pkg install -y meson cmake
 
           meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ --buildtype=release
           meson install -C build
@@ -117,7 +119,7 @@ jobs:
           /usr/sbin/dntpd -s
 
         run: |
-          pkg install -y meson
+          pkg install -y meson cmake
 
           meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ --buildtype=release
           meson install -C build
@@ -144,7 +146,7 @@ jobs:
 
 
         run: |
-          pkg_add meson
+          pkg_add meson cmake
 
           meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ --buildtype=release
           meson install -C build
@@ -171,7 +173,7 @@ jobs:
           # /usr/pkg/sbin/ntpd -gq
 
         run: |
-          /usr/sbin/pkg_add meson
+          /usr/sbin/pkg_add meson cmake
 
           meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ --buildtype=release
           meson install -C build

.gitmodules

@@ -11,3 +11,9 @@
 [submodule "wingetopt"]
 	path = subprojects/wingetopt
 	url = https://github.com/Seagate/wingetopt.git
+[submodule "subprojects/opensea-jsonformat"]
+	path = subprojects/opensea-jsonformat
+	url = https://github.com/Seagate/opensea-jsonformat.git
+[submodule "subprojects/json-c"]
+	path = subprojects/json-c
+	url = https://github.com/json-c/json-c.git

Make/VS.2017/OpenSeaChest.sln

@@ -48,6 +48,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Configure", "OpenSeaChest_Configure\OpenSeaChest_Configure.vcxproj", "{C8E9CA68-8233-4C84-92D7-7476596D1BBC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
 		{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
 		{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
 		{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -88,6 +89,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Info", "OpenSeaChest_Info\OpenSeaChest_Info.vcxproj", "{6E349242-B6C9-417F-AC21-AC547B8E79F0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
 		{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
 		{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
 		{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -157,6 +159,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Reservations",
 		{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensea-jsonformat", "..\..\subprojects\opensea-jsonformat\Make\VS.2017\opensea-jsonformat\opensea-jsonformat\opensea-jsonformat.vcxproj", "{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
+		{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
+		{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -865,6 +874,38 @@ Global
 		{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x64.Build.0 = Static-Release|x64
 		{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.ActiveCfg = Release|Win32
 		{926C8C5D-B6E6-4516-836F-70F9488378A1}.Static-Release|x86.Build.0 = Release|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|ARM.ActiveCfg = Debug|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|ARM.Build.0 = Debug|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|x64.ActiveCfg = Debug|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|x64.Build.0 = Debug|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|x86.ActiveCfg = Debug|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Debug|x86.Build.0 = Debug|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|ARM.ActiveCfg = Release|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|ARM.Build.0 = Release|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|ARM64.Build.0 = Release|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|x64.ActiveCfg = Release|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|x64.Build.0 = Release|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|x86.ActiveCfg = Release|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Release|x86.Build.0 = Release|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|ARM.ActiveCfg = Static-Debug|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|ARM.Build.0 = Static-Debug|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|ARM64.ActiveCfg = Static-Debug|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|ARM64.Build.0 = Static-Debug|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|x64.ActiveCfg = Static-Debug|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|x64.Build.0 = Static-Debug|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|x86.ActiveCfg = Static-Debug|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Debug|x86.Build.0 = Static-Debug|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|ARM.ActiveCfg = Static-Release|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|ARM.Build.0 = Static-Release|ARM
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|ARM64.ActiveCfg = Static-Release|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|ARM64.Build.0 = Static-Release|ARM64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|x64.ActiveCfg = Static-Release|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|x64.Build.0 = Static-Release|x64
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|x86.ActiveCfg = Static-Release|Win32
+		{A319438D-D2E5-4CA2-91C4-12769AA9A2EB}.Static-Release|x86.Build.0 = Static-Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE