Fix default macro values regarding version and socket path

[Version] 0.3.3

Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/meson.build b/meson.build
index cf2e6b6..31b5f2d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ message('libdir_path[' + libdir_path + ']')
 
 message('================ common options ================')
 
-conf_data.set('ESPP_SERVICE_VERSION', get_option('version'))
+conf_data.set('ESPP_SERVICE_VERSION', espp_service_version)
 conf_data.set('ESPP_SERVICE_SOCK_PATH', get_option('sock-path'))
 
 if get_option('dlog')

diff --git a/meson_options.txt b/meson_options.txt
index dbb53c2..e4d898a 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('version', type: 'string', value: '0.3.2', description: 'ESPP service version')
 option('sock-path', type: 'string', value: '/tmp/espp_service.sock', description: 'ESPP service socket path')
 option('dlog', type: 'boolean', value: true, description: 'Use dlog')
 option('service-app', type: 'boolean', value: false, description: 'Daemon is launched as Tizen service app')

diff --git a/packaging/espp-service.spec b/packaging/espp-service.spec
index da712c6..ded8870 100644 (file)
--- a/packaging/espp-service.spec
+++ b/packaging/espp-service.spec
@@ -1,6 +1,6 @@
 Name:       espp-service
 Summary:    ESPP service package which contains client lib. and daemon binary
-Version:    0.3.2
+Version:    0.3.3
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -50,7 +50,6 @@ meson setup --auto-features=disabled \
   --prefix=/usr \
   --libdir=%{_lib_dir} \
   --datadir=%{_datadir} \
-  -Dversion=%{version} \
   -Dsock-path=/tmp/espp_service.sock \
 %if "%{use_service_app}" == "1"
   -Dservice-app=true \

diff --git a/project_def.prop b/project_def.prop
index 1bcfd66..d8e94f0 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ./src/daemon/*.c ./src/common/*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.2" ESPP_SERVICE_SOCK_PATH=/tmp/espp_service.sock
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.3"
 
 # User Includes
 USER_INC_DIRS = ./src/daemon ./src/common ./inc ./inc/esplusplayer_capi

diff --git a/src/common/espp_service_common.h b/src/common/espp_service_common.h
index 1332d97..4ff18e8 100644 (file)
--- a/src/common/espp_service_common.h
+++ b/src/common/espp_service_common.h
@@ -30,13 +30,15 @@
 #define GET_STRING(x) #x
 #define TO_STRING(x) GET_STRING(x)
 #ifndef ESPP_SERVICE_VERSION
-#define ESPP_SERVICE_VERSION "unknown"
+#define ESPP_SVC_VERSION "unknown"
+#else
+#define ESPP_SVC_VERSION TO_STRING(ESPP_SERVICE_VERSION)
 #endif
 #ifndef ESPP_SERVICE_SOCK_PATH
-#define ESPP_SERVICE_SOCK_PATH "/tmp/espp_service.sock"
-#endif
-#define ESPP_SVC_VERSION TO_STRING(ESPP_SERVICE_VERSION)
+#define ESPP_SVC_SOCK_PATH "/tmp/espp_service.sock"
+#else
 #define ESPP_SVC_SOCK_PATH TO_STRING(ESPP_SERVICE_SOCK_PATH)
+#endif
 
 #ifdef __cplusplus
 extern "C" {