diff --git a/VERSION b/VERSION index cb7e5f6..26aaba0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ 1.2.0 - diff --git a/scripts/Dockerfile.alpine-3.9 b/scripts/Dockerfile.alpine-3.9 index ff2b689..56971a5 100644 --- a/scripts/Dockerfile.alpine-3.9 +++ b/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 diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt index 96055ed..8e33c7f 100644 --- a/src/c/CMakeLists.txt +++ b/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) \ No newline at end of file +install(TARGETS device-grove DESTINATION bin) diff --git a/src/c/device_grove.h b/src/c/device_grove.h index e9c41b7..2e1a56b 100644 --- a/src/c/device_grove.h +++ b/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 { diff --git a/src/c/main.c b/src/c/main.c index b60ff77..3530037 100644 --- a/src/c/main.c +++ b/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));