Skip to content

Commit 624c602

Browse files
committed
Quick : enable JSON format support.
1 parent 5870d9f commit 624c602

File tree

55 files changed

+855
-835
lines changed

Some content is hidden

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

55 files changed

+855
-835
lines changed

.github/workflows/c-cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: make
6363
working-directory: ${{ matrix.config.builddir }}
6464
run: |
65-
make release -f ${{ matrix.config.makefile }}
65+
make release JSONOUTPUTSUPPORT=1 -f ${{ matrix.config.makefile }}
6666
6767
- name: Packing release
6868
env:

.github/workflows/meson.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ jobs:
542542
- name: Install Meson and Ninja and Build (MUSL container)
543543
if: matrix.config.image != '' && matrix.config.vm_actions == false
544544
run: |
545-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
545+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
546546
meson install -C build
547547
548548
@@ -553,7 +553,7 @@ jobs:
553553
CXX: ${{ matrix.config.cxx }}
554554
run: |
555555
pip install meson ninja
556-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
556+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
557557
meson install -C build
558558
559559
- name: Install Meson and Ninja and Build (VMActions OmniOS)
@@ -574,7 +574,7 @@ jobs:
574574
575575
python3 -m pip install --upgrade pip setuptools wheel --root-user-action=ignore
576576
python3 -m pip install meson --root-user-action=ignore
577-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
577+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
578578
meson install -C build
579579
580580
- name: Install Meson and Ninja and Build (VMActions OpenIndiana)
@@ -595,7 +595,7 @@ jobs:
595595
596596
python3 -m pip install --upgrade pip setuptools wheel --root-user-action=ignore
597597
python3 -m pip install meson --root-user-action=ignore
598-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
598+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
599599
meson install -C build
600600
601601
- name: Install Meson and Ninja and Build (VMActions Solaris)
@@ -615,7 +615,7 @@ jobs:
615615
run: |
616616
pkg install --accept developer/build/meson
617617
618-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
618+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
619619
meson install -C build
620620
621621
- name: Install Meson and Ninja and Build (VMActions FreeBSD)
@@ -635,7 +635,7 @@ jobs:
635635
run: |
636636
pkg install -y meson
637637
638-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
638+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
639639
meson install -C build
640640
641641
- name: Install Meson and Ninja and Build (VMActions DragonFlyBSD)
@@ -654,7 +654,7 @@ jobs:
654654
run: |
655655
pkg install -y meson
656656
657-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
657+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
658658
meson install -C build
659659
660660
- name: Install Meson and Ninja and Build (VMActions OpenBSD)
@@ -675,7 +675,7 @@ jobs:
675675
run: |
676676
pkg_add meson
677677
678-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
678+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
679679
meson install -C build
680680
681681
- name: Install Meson and Ninja and Build (VMActions NetBSD)
@@ -696,7 +696,7 @@ jobs:
696696
run: |
697697
/usr/sbin/pkg_add meson
698698
699-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
699+
meson setup build -Djson_outputformat=true -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
700700
meson install -C build
701701
702702

Make/VS.2017/OpenSeaChest_Basics/OpenSeaChest_Basics.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Configure/OpenSeaChest_Configure.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Erase/OpenSeaChest_Erase.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Firmware/OpenSeaChest_Firmware.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Format/OpenSeaChest_Format.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_GenericTests/OpenSeaChest_GenericTests.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Info/OpenSeaChest_Info.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Make/VS.2017/OpenSeaChest_Logs/OpenSeaChest_Logs.vcxproj

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)