Use jq for reading app name from manifest (#414)

johan-hultberg-work · GHakansson · web-flow · commit 05abf1a7b4fd · 2025-09-09T14:49:48.000+02:00
Co-authored-by: GHakansson &lt;175003894+GHakansson@users.noreply.github.com&gt;
diff --git a/audio-capture/app/Makefile b/audio-capture/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= audiocapture
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/audio-playback/app/Makefile b/audio-playback/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= audioplayback
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/axevent/send_event/app/Makefile b/axevent/send_event/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= send_event
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axevent/subscribe_to_event/app/Makefile b/axevent/subscribe_to_event/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= subscribe_to_event
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axevent/subscribe_to_events/app/Makefile b/axevent/subscribe_to_events/app/Makefile
@@ -1,4 +1,4 @@
-PROG	= subscribe_to_events
+PROG	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 
 PKGS = glib-2.0 axevent
 CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
diff --git a/axoverlay/app/Makefile b/axoverlay/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axoverlay
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axparameter/app/Makefile b/axparameter/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axparameter
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axserialport/app/Makefile b/axserialport/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axserialport
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/axstorage/app/Makefile b/axstorage/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= axstorage
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/bounding-box/app/Makefile b/bounding-box/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = bounding_box_example
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 DEBUG_DIR = debug
diff --git a/curl-openssl/app/Makefile b/curl-openssl/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= curl_openssl
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/hello-world/app/Makefile b/hello-world/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= hello_world
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/licensekey/app/Makefile b/licensekey/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= licensekey_handler
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/message-broker/consume-scene-metadata/app/Makefile b/message-broker/consume-scene-metadata/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= consume_scene_metadata
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/object-detection-cv25/app/Makefile b/object-detection-cv25/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c imgutils.c postprocessing.c
 PROGS	= $(PROG1)
 LIBDIR = lib
diff --git a/object-detection-yolov5/app/Makefile b/object-detection-yolov5/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection_yolov5
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c model.c panic.c labelparse.c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/object-detection/app/Makefile b/object-detection/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= object_detection
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c argparse.c imgprovider.c imgutils.c
 PROGS	= $(PROG1)
 LIBDIR = lib
diff --git a/remote-debug-example/Dockerfile b/remote-debug-example/Dockerfile
@@ -18,7 +18,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
 
 # Build GDB server
 ARG GDB_VERSION=9.2
-ARG GDB_REPOSITORY=https://ftp.gnu.org/gnu/gdb
 ARG GDB_ARCHIVE=gdb-${GDB_VERSION}.tar.gz
 ARG GDB_BASE_DIR=/opt/build/gdb
 ARG GDB_SOURCE_DIR=$GDB_BASE_DIR/src
@@ -29,7 +28,10 @@ ARG GDB_INSTALL_DIR=${GDB_BASE_DIR}
 ARG GDB_SERVER_BIN_DIR=${GDB_BASE_DIR}/bin
 
 WORKDIR $GDB_BASE_DIR
-RUN curl -sSL -O $GDB_REPOSITORY/$GDB_ARCHIVE
+
+# Download GDB with mirror fallback
+RUN curl -sSL -O https://sourceware.org/pub/gdb/releases/$GDB_ARCHIVE || \
+    curl -sSL -O https://ftp.gnu.org/gnu/gdb/$GDB_ARCHIVE
 
 WORKDIR $GDB_SOURCE_DIR
 RUN tar -xf $GDB_BASE_DIR/$GDB_ARCHIVE -C $GDB_SOURCE_DIR --strip-components=1
diff --git a/remote-debug-example/app/Makefile b/remote-debug-example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = remote_debug
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 DEBUG_DIR = debug
 
diff --git a/reproducible-package/app/Makefile b/reproducible-package/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= reproducible_package
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 DEBUG_DIR = debug
 
diff --git a/using-opencv/app/Makefile b/using-opencv/app/Makefile
@@ -1,4 +1,4 @@
-PROGS = opencv_app
+PROGS = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJECTS = $(wildcard *.cpp)
 DEBUG_DIR = debug
 
diff --git a/utility-libraries/custom_lib_example/app/Makefile b/utility-libraries/custom_lib_example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= customlib_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/utility-libraries/openssl_curl_example/app/Makefile b/utility-libraries/openssl_curl_example/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= openssl_curl_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vapix/app/Makefile b/vapix/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vapix_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdo-larod/app/Makefile b/vdo-larod/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vdo_larod
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c imgprovider.c panic.c model.c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdo-opencl-filtering/app/Makefile b/vdo-opencl-filtering/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = vdo_cl_filter_demo
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 DEBUG_DIR = debug
diff --git a/vdostream/app/Makefile b/vdostream/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= vdoencodeclient
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 PROGS	= $(PROG1)
 DEBUG_DIR = debug
diff --git a/web-server-using-fastcgi/app/Makefile b/web-server-using-fastcgi/app/Makefile
@@ -1,4 +1,4 @@
-PROG1	= fastcgi_example
+PROG1	= $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1	= $(PROG1).c
 
 PROGS	= $(PROG1)
diff --git a/web-server/app/Makefile b/web-server/app/Makefile
@@ -1,4 +1,4 @@
-PROG1 = web_server_rev_proxy
+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)
 OBJS1 = $(PROG1).c
 PROGS = $(PROG1)
 LIBDIR = lib

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = audiocapture`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`	`PROGS = $(PROG1)`
`4`	`4`	`DEBUG_DIR = debug`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = audioplayback`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`	`PROGS = $(PROG1)`
`4`	`4`	`DEBUG_DIR = debug`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = send_event`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = subscribe_to_event`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG = subscribe_to_events`
	`1`	`+PROG = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`
`3`	`3`	`PKGS = glib-2.0 axevent`
`4`	`4`	`CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = axoverlay`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = axparameter`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = axserialport`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = axstorage`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`
`4`	`4`	`PROGS = $(PROG1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PROG1 = bounding_box_example`
	`1`	`+PROG1 = $(shell jq -r '.acapPackageConf.setup.appName' manifest.json)`
`2`	`2`	`OBJS1 = $(PROG1).c`
`3`	`3`	`PROGS = $(PROG1)`
`4`	`4`	`DEBUG_DIR = debug`