Fix service build error

1. fix protocol-plugin service build error
2. disable the building of the services which aren't updated

Change-Id: Ic9ff2c76610c236811de5c71cb98f03ae63b1db0
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>

diff --git a/service/SConscript b/service/SConscript
index 28c0d38..4b69d4a 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -11,12 +11,15 @@ if target_os != 'arduino':
        SConscript('things-manager/SConscript')
 
        # Build soft sensor manager project
-       SConscript('soft-sensor-manager/SConscript')
+#      SConscript('soft-sensor-manager/SConscript')
 
        # Build protocol plugin project
-       SConscript('protocol-plugin/SConscript')
+       # protocol-plugin uses 'inotify' feature, which isn't supported by
+       # MAC OSX and IOS
+       if target_os not in ['darwin', 'ios']:
+               SConscript('protocol-plugin/SConscript')
 
        # Build notification manager project
 #      SConscript('notification-manager/SConscript')
-else:
-       SConscript('notification-manager/SampleApp/arduino/SConscript')
+#else:
+#      SConscript('notification-manager/SampleApp/arduino/SConscript')

diff --git a/service/protocol-plugin/lib/cpluff/SConscript b/service/protocol-plugin/lib/cpluff/SConscript
index b7ea4df..0dc1b9f 100644 (file)
--- a/service/protocol-plugin/lib/cpluff/SConscript
+++ b/service/protocol-plugin/lib/cpluff/SConscript
@@ -12,7 +12,9 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-cpluff_env.AppendUnique(CPPDEFINES = ['CP_C_API=CP_EXPORT',
+cpluff_env.AppendUnique(CPPPATH= ['libcpluff/'])
+if target_os not in ['windows', 'winrt']:
+       cpluff_env.AppendUnique(CPPDEFINES = ['CP_C_API=CP_EXPORT',
                                        'CP_HOST=\"\\"'+env.get('TARGET_OS')+'\\"\"',
                                        'CP_DATADIR=\"\\\"/usr/local/share\\\"\"',
                                        'DLOPEN_POSIX',
@@ -22,8 +24,9 @@ cpluff_env.AppendUnique(CPPDEFINES = ['CP_C_API=CP_EXPORT',
                                        'CP_FNAMESEP_CHAR=\"\'/\'\"',
                                        'CP_FNAMESEP_STR=\"\\\"/\\"\"',
                                        'PACKAGE=\"\\\"cpluff\\\"\"'])
-cpluff_env.AppendUnique(LIBS = ['dl'])
-cpluff_env.PrependUnique(CCFLAGS = ['-fPIC'])
+       cpluff_env.AppendUnique(LIBS = ['dl'])
+       cpluff_env.PrependUnique(CCFLAGS = ['-fPIC'])
+
 ######################################################################
 # Source files and Targets
 ######################################################################
@@ -31,4 +34,4 @@ cpluff_src = [f for f in env.Glob('libcpluff/*.c') if os.path.basename(f.path) n
 cpluff_src.extend(env.Glob('kazlib/*.c'))
 
 cpluff = cpluff_env.StaticLibrary('cpluff', cpluff_src)
-cpluff_env.InstallTarget(cpluff, 'libcpluff')
\ No newline at end of file
+cpluff_env.InstallTarget(cpluff, 'libcpluff')