Modify folder path with sconscript about memorycache.

our service use memorycache in service side only.
so, move related memorycache files to each of src folder.

second patch included
remove not required comment out in sconScript.

Change-Id: I20b85d824c6ecbd792ab961844d014053a3f4da0
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9961
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index ae1b111..e2ac640 100644 (file)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -49,15 +49,6 @@ notification_env.AppendUnique(CPPPATH = ['src/consumer'])
 notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/stack/include'])
 notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/connectivity/api'])
 
-if target_os == 'linux':
-    notification_env.AppendUnique(CPPPATH = ['src/provider/cache/linux'])
-    notification_env.AppendUnique(CPPPATH = ['src/consumer/cache/linux'])
-
-# [TO-DO] change to android DB. 
-if target_os == 'android': 
-    notification_env.AppendUnique(CPPPATH = ['src/provider/cache/linux'])
-    notification_env.AppendUnique(CPPPATH = ['src/consumer/cache/linux'])
-
 notification_env.PrependUnique(LIBS = [
        'octbstack',
        'oc_logger',
@@ -93,20 +84,10 @@ if env.get('WITH_CLOUD') == True:
 # Source files and Targets
 ######################################################################
 
-if target_os == 'linux':
-    PROVIDER_CACHE = File('src/provider/cache/linux/NSProviderMemoryCache.c')
-    CONSUMER_CACHE = File('src/consumer/cache/linux/NSConsumerMemoryCache.c')
-
-if target_os == 'android':
-    PROVIDER_CACHE = File('src/provider/cache/linux/NSProviderMemoryCache.c')
-    CONSUMER_CACHE = File('src/consumer/cache/linux/NSConsumerMemoryCache.c')
-
 notification_provider_src = [
-       env.Glob('src/provider/*.c'),
-       env.Glob('src/common/*.c'), PROVIDER_CACHE]
+       env.Glob('src/provider/*.c'), env.Glob('src/common/*.c')]
 notification_consumer_src = [
-       env.Glob('src/consumer/*.c'),
-       env.Glob('src/common/*.c'), CONSUMER_CACHE]
+       env.Glob('src/consumer/*.c'), env.Glob('src/common/*.c')]
 
 providersdk = notification_env.SharedLibrary('notification_provider', notification_provider_src)
 notification_env.InstallTarget(providersdk, 'libnotification_provider')

diff --git a/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c b/service/notification/src/consumer/NSConsumerMemoryCache.c
similarity index 100%
rename from service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c
rename to service/notification/src/consumer/NSConsumerMemoryCache.c

diff --git a/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.h b/service/notification/src/consumer/NSConsumerMemoryCache.h
similarity index 100%
rename from service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.h
rename to service/notification/src/consumer/NSConsumerMemoryCache.h

diff --git a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/notification/src/provider/cache/linux/NSProviderMemoryCache.c
rename to service/notification/src/provider/NSProviderMemoryCache.c

diff --git a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/notification/src/provider/cache/linux/NSProviderMemoryCache.h
rename to service/notification/src/provider/NSProviderMemoryCache.h