DG-23: Process Grove Version based on the value set in VERSION file u…

VERSION

@@ -1,2 +1 @@
 1.2.0
-

scripts/Dockerfile.alpine-3.9

@@ -4,6 +4,7 @@ RUN apk add --update --no-cache build-base git gcc cmake make linux-headers yaml
 
 COPY scripts /device-grove/scripts
 COPY src /device-grove/src/
+COPY VERSION /device-grove
 RUN mkdir -p /device-grove/build
 
 WORKDIR /device-grove
@@ -23,7 +24,6 @@ COPY --from=builder /usr/local/include/mraa.h /usr/local/include/
 COPY --from=builder /usr/local/lib/libmraa.so* /usr/local/lib/
 COPY --from=builder /usr/local/lib64/libcbor.so* /usr/local/lib64/
 
-COPY VERSION /.
 COPY LICENSE /.
 COPY Attribution.txt /.
 COPY res /res

src/c/CMakeLists.txt

@@ -4,6 +4,9 @@ project(device_grove LANGUAGES C)
 # Package support
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
+# Versioning
+file (STRINGS ${CMAKE_SOURCE_DIR}/../../VERSION GROVE_DOT_VERSION)
+
 find_package (LibMRAA REQUIRED)
 if (NOT LIBMRAA_FOUND)
   message (WARNING "mraa library or header not found")
@@ -32,6 +35,7 @@ file (GLOB C_FILES *.c)
 find_library(EDGEX_CSDK_RELEASE_LIB NAMES csdk)
 find_library(LIBMRAA_LIB NAMES mraa)
 add_executable(device-grove ${C_FILES})
+target_compile_definitions(device-grove PRIVATE GROVE_VERSION="${GROVE_DOT_VERSION}")
 target_include_directories (device-grove PRIVATE .)
 target_link_libraries (device-grove PUBLIC m PRIVATE ${LIBMRAA_LIB} ${EDGEX_CSDK_RELEASE_LIB})
-install(TARGETS device-grove DESTINATION bin)
+install(TARGETS device-grove DESTINATION bin)

src/c/device_grove.h

@@ -37,7 +37,6 @@ extern "C" {
 #define GROVE_ADC_REF 5
 
 #define GROVE_SVC "Device-Grove"
-#define GROVE_VERSION "1.1.0"
 
 typedef enum
 {

src/c/main.c

@@ -722,7 +722,7 @@ static void grove_stop (void *impl, bool force)
 
 int main (int argc, char *argv[])
 {
-  edgex_device_svcparams params = { GROVE_SVC, "", NULL, "" };
+  edgex_device_svcparams params = { GROVE_SVC, NULL, NULL, NULL };
 
   grove_pidriver_t *implObject = malloc (sizeof (grove_pidriver_t));
   memset (implObject, 0, sizeof (grove_pidriver_t));