X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fcpp-wrapper%2Fconsumer%2FSConscript;h=f72933e2230f0ce77b94f391d2a3f1aadb94c57c;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=e47662368f8fe7a5148d582a5fa1dcca4294a4f3;hpb=b23ebaa7fb6716971cc13df2f9f70771a50e87d6;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/cpp-wrapper/consumer/SConscript b/service/notification/cpp-wrapper/consumer/SConscript
index e476623..f72933e 100755
--- a/service/notification/cpp-wrapper/consumer/SConscript
+++ b/service/notification/cpp-wrapper/consumer/SConscript
@@ -51,6 +51,7 @@ notification_env.AppendUnique(CPPPATH = ['../../src/common'])
 
 notification_env.PrependUnique(LIBS = [
 	'oc_logger',
+	'oc',
 	'notification_consumer'
 	])
 
@@ -69,25 +70,40 @@ if target_os == 'android':
     notification_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
     notification_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
-if not env.get('RELEASE'):
+if not env.get('RELEASE') and target_os not in ['ios']:
     notification_env.PrependUnique(LIBS = ['gcov'])
     notification_env.AppendUnique(CCFLAGS = ['--coverage'])
 
 if env.get('WITH_CLOUD') == True:
 	notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 
+with_mq = env.get('WITH_MQ')
+if 'SUB' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_SUBSCRIBER', 'WITH_MQ'])
+    print "MQ SUB support"
+
+if 'PUB' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_PUBLISHER', 'WITH_MQ'])
+    print "MQ PUB support"
+
+if 'BROKER' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_BROKER', 'WITH_MQ'])
+    print "MQ Broker support"
 ######################################################################
-# Source files and Targets
+# Source files and Targets for Consumer
 ######################################################################
+notification_jni_consumer_env = notification_env.Clone()
+
 Import('notificationCommonStaticObjs')
 Import('notificationCommonSharedObjs')
 
 notification_consumer_src = [
 	env.Glob('src/*.cpp'),notificationCommonSharedObjs]
 
-consumersdk = notification_env.SharedLibrary('notification_consumer_wrapper', notification_consumer_src)
-notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
-notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
+if target_os not in ['ios']:
+	consumersdk = notification_env.SharedLibrary('notification_consumer_wrapper', notification_consumer_src)
+	notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
+	notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
 
 notification_consumer_src = [
 	env.Glob('src/*.cpp'),notificationCommonStaticObjs]
@@ -95,3 +111,29 @@ notification_consumer_src = [
 consumersdk = notification_env.StaticLibrary('notification_consumer_wrapper', notification_consumer_src)
 notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
 notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
+
+notification_env.UserInstallTargetHeader("inc/NSProvider.h", 'service/notification', 'NSProvider.h')
+notification_env.UserInstallTargetHeader("inc/NSConsumerService.h", 'service/notification', 'NSConsumerService.h')
+
+######################################################################
+# Source files and Targets for Consumer Jni
+######################################################################
+if target_os == 'android':
+	Import('notificationJniCommonSharedObjs')
+
+	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../extlibs/boost/boost_1_58_0'])
+	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../android/android_api/base/jni'])
+	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/common'])
+	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/consumer'])
+
+	notification_jni_consumer_env.PrependUnique(LIBS = [
+		'notification_consumer_wrapper'
+		])
+
+	notification_consumer_jni_src = [
+		env.Glob('../../android/notification-service/src/main/jni/consumer/*.cpp'),
+		notificationJniCommonSharedObjs]
+
+	consumerJni = notification_jni_consumer_env.SharedLibrary('notification_consumer_jni', notification_consumer_jni_src)
+	notification_jni_consumer_env.InstallTarget(consumerJni, 'libnotification_consumer_jni')
+	notification_jni_consumer_env.UserInstallTargetLib(consumerJni, 'libnotification_consumer_jni')