Add version number

aws-greengrass · Dec 3, 2024 · 9085c6d · 9085c6d
1 parent b90f8f0
commit 9085c6d
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -184,6 +184,10 @@ if(GGL_IPC_AUTH_DISABLE)
   add_compile_definitions(GGL_IPC_AUTH_DISABLE)
 endif()
 
+file(READ version GGL_VERSION)
+string(STRIP "${GGL_VERSION}" GGL_VERSION)
+add_compile_definitions("GGL_VERSION=\"${GGL_VERSION}\"")
+
 add_link_options($<$<NOT:$<CONFIG:Debug>>:-pie>)
 
 add_link_options(

diff --git a/fleet-provisioning/bin/fleet-provisioning.c b/fleet-provisioning/bin/fleet-provisioning.c
@@ -6,8 +6,12 @@
 #include <argp.h>
 #include <ggl/error.h>
 #include <ggl/log.h>
+#include <ggl/version.h>
 #include <string.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char doc[] = "fleet provisioner -- Executable to automatically "
                     "provision the device to AWS IOT core";
 static const char COMPONENT_NAME[] = "fleet-provisioning";

diff --git a/ggconfigd/bin/ggconfigd.c b/ggconfigd/bin/ggconfigd.c
@@ -6,8 +6,12 @@
 #include <argp.h>
 #include <ggl/buffer.h>
 #include <ggl/object.h>
+#include <ggl/version.h>
 #include <stdlib.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char doc[] = "ggconfigd -- Greengrass Nucleus Lite configuration daemon";
 
 static struct argp_option opts[] = {

diff --git a/ggdeploymentd/bin/ggdeploymentd.c b/ggdeploymentd/bin/ggdeploymentd.c
@@ -7,10 +7,14 @@
 #include <ggl/buffer.h>
 #include <ggl/error.h>
 #include <ggl/vector.h>
+#include <ggl/version.h>
 #include <limits.h>
 #include <string.h>
 #include <stdbool.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char doc[]
     = "ggdeploymentd -- Greengrass Nucleus Lite deployment daemon";
 

diff --git a/gghealthd/bin/gghealthd.c b/gghealthd/bin/gghealthd.c
@@ -4,6 +4,10 @@
 
 #include "bus_server.h"
 #include <ggl/error.h>
+#include <ggl/version.h>
+
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
 
 int main(void) {
     GglError ret = run_gghealthd();

diff --git a/ggipcd/bin/ggipcd.c b/ggipcd/bin/ggipcd.c
@@ -5,6 +5,10 @@
 #include "ggipcd.h"
 #include <argp.h>
 #include <ggl/error.h>
+#include <ggl/version.h>
+
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
 
 static char doc[] = "ggipcd -- Greengrass IPC server for Nucleus Lite";
 

diff --git a/ggl-cli/bin/ggl-cli.c b/ggl-cli/bin/ggl-cli.c
@@ -12,13 +12,17 @@
 #include <ggl/log.h>
 #include <ggl/object.h>
 #include <ggl/vector.h>
+#include <ggl/version.h>
 #include <limits.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 char *command = NULL;
 char *recipe_dir = NULL;
 char *artifacts_dir = NULL;

diff --git a/ggl-config-init/bin/ggl-config-init.c b/ggl-config-init/bin/ggl-config-init.c
@@ -10,10 +10,14 @@
 #include <ggl/file.h>
 #include <ggl/log.h>
 #include <ggl/object.h>
+#include <ggl/version.h>
 #include <ggl/yaml_decode.h>
 #include <stddef.h>
 #include <stdint.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char *config_path = NULL;
 
 static char doc[]

diff --git a/ggl-lib/include/ggl/version.h b/ggl-lib/include/ggl/version.h
@@ -0,0 +1,17 @@
+// aws-greengrass-lite - AWS IoT Greengrass runtime for constrained devices
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// IWYU removes this since GGL_VERSION is provided on the command line
+// IWYU pragma: always_keep
+
+#ifndef GGL_VERSION_H
+#define GGL_VERSION_H
+
+//! Greengrass Lite version number
+
+#ifndef GGL_VERSION
+#define GGL_VERSION "0.0.0"
+#endif
+
+#endif
diff --git a/ggpubsubd/bin/ggpubsubd.c b/ggpubsubd/bin/ggpubsubd.c
@@ -5,8 +5,12 @@
 #include "ggpubsubd.h"
 #include <argp.h>
 #include <ggl/error.h>
+#include <ggl/version.h>
 #include <stdlib.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char doc[] = "ggpubsubd -- Greengrass Publish/Subscribe daemon";
 
 static struct argp_option opts[] = {

diff --git a/iotcored/bin/iotcored.c b/iotcored/bin/iotcored.c
@@ -5,6 +5,10 @@
 #include "iotcored.h"
 #include <argp.h>
 #include <ggl/error.h>
+#include <ggl/version.h>
+
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
 
 static char doc[] = "iotcored -- MQTT spooler for AWS IoT Core";
 

diff --git a/nix/withOverlays.nix b/nix/withOverlays.nix
@@ -20,6 +20,7 @@ in
           ".clang-tidy"
           "CMakeLists.txt"
           "fc_deps.json"
+          "version"
           "run_nucleus"
           "recipe.yml"
           "greengrass-lite.target"

diff --git a/recipe-runner/bin/recipe-runner.c b/recipe-runner/bin/recipe-runner.c
@@ -5,8 +5,12 @@
 #include "recipe-runner.h"
 #include <argp.h>
 #include <ggl/error.h>
+#include <ggl/version.h>
 #include <stdlib.h>
 
+__attribute__((visibility("default"))) const char *argp_program_version
+    = GGL_VERSION;
+
 static char doc[] = "recipe-runner -- Launch a Greengrass recipe file";
 
 static struct argp_option opts[] = {

diff --git a/recipe-runner/src/runner.c b/recipe-runner/src/runner.c
@@ -15,6 +15,7 @@
 #include <ggl/log.h>
 #include <ggl/object.h>
 #include <ggl/vector.h>
+#include <ggl/version.h>
 #include <limits.h>
 #include <unistd.h>
 #include <stdbool.h>
@@ -419,7 +420,7 @@ GglError runner(const RecipeRunnerArgs *args) {
         }
     }
 
-    sys_ret = setenv("GGC_VERSION", "0.0.1", true);
+    sys_ret = setenv("GGC_VERSION", GGL_VERSION, true);
     if (sys_ret != 0) {
         GGL_LOGE("setenv failed: %d.", errno);
     }

diff --git a/version b/version
@@ -0,0 +1 @@
+0.1.0