Skip to content

Commit 90977fc

Browse files
sharma-nidhisharma-nidhi
committed
Finish JSON_Format
1 parent 1d9e860 commit 90977fc

83 files changed

Lines changed: 5845 additions & 4176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/c-cpp.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,16 @@ jobs:
7676
echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
7777
7878
- name: Make buildjsonc.sh executable
79-
run: chmod +x Make/buildjsonc.sh
79+
run: |
80+
chmod +x Make/buildjsonc.sh
81+
chmod +x subprojects/opensea-jsonformat/Make/buildjsonc.sh
8082
8183
- name: make
8284
working-directory: ${{ matrix.config.builddir }}
8385
env:
8486
MAKEFILE_NAME: ${{ matrix.config.makefile }}
8587
run: |
86-
make release -f "$MAKEFILE_NAME"
88+
make release JSONOUTPUTSUPPORT=1 -f "$MAKEFILE_NAME"
8789
8890
- name: Packing release
8991
env:

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
[submodule "wingetopt"]
1212
path = subprojects/wingetopt
1313
url = https://github.com/Seagate/wingetopt.git
14-
[submodule "subprojects/opensea-jsonformat"]
15-
path = subprojects/opensea-jsonformat
16-
url = https://github.com/Seagate/opensea-jsonformat.git
1714
[submodule "subprojects/json-c"]
1815
path = subprojects/json-c
1916
url = https://github.com/json-c/json-c.git
17+
[submodule "subprojects/opensea-jsonformat"]
18+
path = subprojects/opensea-jsonformat
19+
url = https://github.com/Seagate/opensea-jsonformat.git

‎Make/VS.2017/OpenSeaChest.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ EndProject
3232
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Sample", "OpenSeaChest_Sample\OpenSeaChest_Sample.vcxproj", "{03588254-A97A-44A4-8670-65FBA5B60CBD}"
3333
ProjectSection(ProjectDependencies) = postProject
3434
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
35+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
3536
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
3637
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
3738
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -40,6 +41,7 @@ EndProject
4041
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Basics", "OpenSeaChest_Basics\OpenSeaChest_Basics.vcxproj", "{5794F5B0-B7C5-40F0-9C2E-6D1B224F1060}"
4142
ProjectSection(ProjectDependencies) = postProject
4243
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
44+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
4345
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
4446
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
4547
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -57,6 +59,7 @@ EndProject
5759
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Erase", "OpenSeaChest_Erase\OpenSeaChest_Erase.vcxproj", "{609A2F5E-363B-41CA-8BE5-455832C4DB29}"
5860
ProjectSection(ProjectDependencies) = postProject
5961
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
62+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
6063
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
6164
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
6265
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -65,6 +68,7 @@ EndProject
6568
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Firmware", "OpenSeaChest_Firmware\OpenSeaChest_Firmware.vcxproj", "{205622FC-74B8-4801-9CCB-21D2EC769992}"
6669
ProjectSection(ProjectDependencies) = postProject
6770
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
71+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
6872
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
6973
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
7074
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -73,6 +77,7 @@ EndProject
7377
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Format", "OpenSeaChest_Format\OpenSeaChest_Format.vcxproj", "{065695AE-87D9-4BA3-A758-6D05BE2C32D8}"
7478
ProjectSection(ProjectDependencies) = postProject
7579
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
80+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
7681
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
7782
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
7883
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -81,6 +86,7 @@ EndProject
8186
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_GenericTests", "OpenSeaChest_GenericTests\OpenSeaChest_GenericTests.vcxproj", "{E9EFA15F-B003-4A57-B6CF-D2BB0CFEF711}"
8287
ProjectSection(ProjectDependencies) = postProject
8388
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
89+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
8490
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
8591
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
8692
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -98,6 +104,7 @@ EndProject
98104
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_PowerControl", "OpenSeaChest_PowerControl\OpenSeaChest_PowerControl.vcxproj", "{A298F477-CB54-454E-8231-2490B12A137A}"
99105
ProjectSection(ProjectDependencies) = postProject
100106
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
107+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
101108
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
102109
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
103110
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -106,6 +113,7 @@ EndProject
106113
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_SMART", "OpenSeaChest_SMART\OpenSeaChest_SMART.vcxproj", "{1C6E7DEA-F554-46BA-85F8-CDEA738CD1B1}"
107114
ProjectSection(ProjectDependencies) = postProject
108115
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
116+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
109117
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
110118
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
111119
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -114,6 +122,7 @@ EndProject
114122
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_ZBD", "OpenSeaChest_ZBD\OpenSeaChest_ZBD.vcxproj", "{BA02E703-CDB7-4FD6-8986-C5DBAAEE6062}"
115123
ProjectSection(ProjectDependencies) = postProject
116124
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
125+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
117126
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
118127
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
119128
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -122,6 +131,7 @@ EndProject
122131
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Logs", "OpenSeaChest_Logs\OpenSeaChest_Logs.vcxproj", "{79FF5FB4-358D-4A8C-A053-54AB6707E879}"
123132
ProjectSection(ProjectDependencies) = postProject
124133
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
134+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
125135
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
126136
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
127137
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -130,6 +140,7 @@ EndProject
130140
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_NVMe", "OpenSeaChest_NVMe\OpenSeaChest_NVMe.vcxproj", "{582757F6-595F-4014-8D72-264597FC9434}"
131141
ProjectSection(ProjectDependencies) = postProject
132142
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
143+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
133144
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
134145
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
135146
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -138,6 +149,7 @@ EndProject
138149
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_PassthroughTest", "OpenSeaChest_PassthroughTest\OpenSeaChest_PassthroughTest.vcxproj", "{E93481C6-7D47-4DEB-9505-71CB8AC98112}"
139150
ProjectSection(ProjectDependencies) = postProject
140151
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
152+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
141153
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
142154
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
143155
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -146,6 +158,7 @@ EndProject
146158
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Security", "OpenSeaChest_Security\OpenSeaChest_Security.vcxproj", "{6D1D0047-48D8-4637-AFC2-BBAAE99962A6}"
147159
ProjectSection(ProjectDependencies) = postProject
148160
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
161+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
149162
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
150163
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
151164
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}
@@ -154,6 +167,7 @@ EndProject
154167
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenSeaChest_Reservations", "OpenSeaChest_Reservations\OpenSeaChest_Reservations.vcxproj", "{926C8C5D-B6E6-4516-836F-70F9488378A1}"
155168
ProjectSection(ProjectDependencies) = postProject
156169
{7DAC7F63-E808-47FD-BEEB-33E4A870008B} = {7DAC7F63-E808-47FD-BEEB-33E4A870008B}
170+
{A319438D-D2E5-4CA2-91C4-12769AA9A2EB} = {A319438D-D2E5-4CA2-91C4-12769AA9A2EB}
157171
{A0771494-8717-48AB-A0E5-49191252FF2C} = {A0771494-8717-48AB-A0E5-49191252FF2C}
158172
{621B44CE-B314-4E05-B214-5DC70F2B4798} = {621B44CE-B314-4E05-B214-5DC70F2B4798}
159173
{FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF} = {FBCBA2F1-3BF8-4A25-B815-E228E1AEDCFF}

0 commit comments

Comments
 (0)