Add unitest and change invalid function name.

[platform/upstream/iotivity.git] / service / notification / SConscript

diff --git a/service/notification/SConscript b/service/notification/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index 2459bcd..4ec3d60
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -45,16 +45,10 @@ target_os = env.get('TARGET_OS')
 notification_env.AppendUnique(CPPPATH = ['include'])
 notification_env.AppendUnique(CPPPATH = ['src/common'])
 notification_env.AppendUnique(CPPPATH = ['src/provider'])
-notification_env.AppendUnique(CPPPATH = ['src/provider/cache/linux'])
+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'])
-
-if target_os == 'android':
-    notification_env.AppendUnique(CPPPATH = ['src/provider/cache/android'])
-
 notification_env.PrependUnique(LIBS = [
        'octbstack',
        'oc_logger',
@@ -74,7 +68,6 @@ if target_os == 'linux':
 if target_os == 'android':
        notification_env.AppendUnique(CCFLAGS = ['-frtti', '-fexceptions'])
        notification_env.AppendUnique(LIBS = ['gnustl_shared','log'])
-        notification_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libnotification_provider.so'])
 
        if not env.get('RELEASE'):
                notification_env.AppendUnique(LIBS = ['log'])
@@ -83,22 +76,20 @@ if not env.get('RELEASE'):
     notification_env.PrependUnique(LIBS = ['gcov'])
     notification_env.AppendUnique(CCFLAGS = ['--coverage'])
 
+if 'CLIENT' in notification_env.get('RD_MODE'):
+        notification_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
+    
+if env.get('WITH_CLOUD') == True:      
+       notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])    
+
 ######################################################################
 # Source files and Targets
 ######################################################################
 
-if target_os == 'linux':
-    PROVIDER_CACHE = File('src/provider/cache/linux/NSProviderMemoryCache.c')
-
-if target_os == 'android':
-    PROVIDER_CACHE = File('src/provider/cache/linux/NSProviderMemoryCache.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/common/*.c'),
-       env.Glob('src/consumer/*.c')]
+       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')
@@ -116,14 +107,14 @@ consumersdk = notification_env.StaticLibrary('notification_consumer', notificati
 notification_env.InstallTarget(consumersdk, 'libnotification_consumer')
 notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer')
 
-notification_env.UserInstallTargetHeader('include/NSProviderIngerface.h',\
+notification_env.UserInstallTargetHeader('include/NSProviderInterface.h',\
        'service/notification', 'NSProviderInterface.h')
-notification_env.UserInstallTargetHeader('include/NSConsumerIngerface.h',\
+notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
        'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
 if target_os == 'linux':
-       SConscript('unittest/SConscript')
+    SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')
@@ -131,3 +122,6 @@ SConscript('examples/SConscript')
 # Go to build jni
 if target_os == 'android':
     SConscript('android/SConscript')
+
+# Go to build c++ wrapper
+#SConscript('cpp-wrapper/SConscript')