replace the path of octypes.h with upper path.

Change-Id: I1134a850cd25f13435dc3ef68b8537ddd7f5a675
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/cloud/samples/client/SConscript b/cloud/samples/client/SConscript
index 3f9ae58..61c91b7 100644 (file)
--- a/cloud/samples/client/SConscript
+++ b/cloud/samples/client/SConscript
@@ -34,6 +34,7 @@ cc_sample_app_env = lib_env.Clone()
 cc_sample_app_env.AppendUnique(CPPPATH = [
         '../../../resource/include/',
         '../../../resource/csdk/resource-directory/include',
+        '../../../resource/csdk/include',
         '../../../resource/csdk/stack/include',
         '../../../resource/c_common/ocrandom/include',
         '../../../resource/csdk/logger/include',

diff --git a/examples/OICMiddle/SConscript b/examples/OICMiddle/SConscript
index 95a09f2..9592e9f 100644 (file)
--- a/examples/OICMiddle/SConscript
+++ b/examples/OICMiddle/SConscript
@@ -32,6 +32,7 @@ examples_env = lib_env.Clone()
 ######################################################################
 examples_env.AppendUnique(CPPPATH = [
                '../../resource/include/',
+               '../../resource/csdk/include',
                '../../resource/csdk/stack/include',
                '../../resource/c_common/ocrandom/include',
                '../../resource/csdk/logger/include',

diff --git a/java/jni/SConscript b/java/jni/SConscript
index 9b8c61b..152ee81 100644 (file)
--- a/java/jni/SConscript
+++ b/java/jni/SConscript
@@ -37,6 +37,7 @@ jni_env.AppendUnique(CPPPATH = [
                env.get('SRC_DIR') + '/resource/c_common',
                env.get('SRC_DIR') + '/resource/c_common/oic_string/include',
                env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
+               env.get('SRC_DIR') + '/resource/csdk/include',
                env.get('SRC_DIR') + '/resource/csdk/stack/include',
                env.get('SRC_DIR') + '/resource/csdk/ocsocket/include',
                env.get('SRC_DIR') + '/resource/csdk/resource-directory/include',

diff --git a/plugins/samples/linux/SConscript b/plugins/samples/linux/SConscript
index 1db50ba..091c790 100644 (file)
--- a/plugins/samples/linux/SConscript
+++ b/plugins/samples/linux/SConscript
@@ -33,6 +33,7 @@ pi_dir = os.path.join(src_dir, 'plugins')
 samples_env.PrependUnique(CPPPATH = [
                os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
                os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+               os.path.join(src_dir, 'resource', 'csdk', 'include'),
                os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
                 os.path.join(pi_dir, 'include')
                 ])

diff --git a/plugins/src/SConscript b/plugins/src/SConscript
index 1cca407..6cd7097 100644 (file)
--- a/plugins/src/SConscript
+++ b/plugins/src/SConscript
@@ -47,7 +47,8 @@ env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'resource', 'c_common', 'oic
                               os.path.join(src_dir, 'resource', 'c_common', 'oic_time', 'include'),
                               os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
                               os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include')
+                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
+                              os.path.join(src_dir, 'resource', 'csdk', 'include')
                             ])
 env.AppendUnique(CPPPATH = [ os.path.join(pi_path, 'include'),
                              os.path.join(pi_path, 'include', 'internal'),

diff --git a/plugins/zigbee_wrapper/src/SConscript b/plugins/zigbee_wrapper/src/SConscript
index 0c49c79..21b1bf2 100644 (file)
--- a/plugins/zigbee_wrapper/src/SConscript
+++ b/plugins/zigbee_wrapper/src/SConscript
@@ -40,6 +40,7 @@ env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'resource', 'c_common', 'oic
                               os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
                               os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
                               os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+                              os.path.join(src_dir, 'resource', 'csdk', 'include'),
                               os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
                               ])
 env.AppendUnique(CPPPATH = [ os.path.join(zw_path, 'include'),

diff --git a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
index 077d21f..b2d71b0 100644 (file)
--- a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
+++ b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
@@ -38,6 +38,7 @@ print"Reading Telegesis Wrapper (TW) script"
 env.AppendUnique(CPPPATH = [ os.path.join(tw_path, 'include'),
                              os.path.join(tw_path, 'include', 'internal'),
                              os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
+                             os.path.join(src_dir, 'resource', 'csdk', 'include'),
                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
                              os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
                              os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 120829d..6110bfc 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -54,6 +54,7 @@ else:
 liboctbstack_env.PrependUnique(CPPPATH = [
                '../../extlibs/timer/',
                'logger/include',
+               'include',
                'stack/include',
                'stack/include/internal',
                '../oc_logger/include',
@@ -212,5 +213,5 @@ liboctbstack_env.InstallTarget(octbstack_libs, 'octbstack')
 liboctbstack_env.UserInstallTargetLib(octbstack_libs, 'octbstack')
 
 liboctbstack_env.UserInstallTargetHeader('stack/include/ocstackconfig.h', 'resource', 'ocstackconfig.h')
-liboctbstack_env.UserInstallTargetHeader('stack/include/octypes.h', 'resource', 'octypes.h')
+liboctbstack_env.UserInstallTargetHeader('include/octypes.h', 'resource', 'octypes.h')
 liboctbstack_env.UserInstallTargetHeader('stack/include/ocpayload.h', 'resource', 'ocpayload.h')

diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript
index 1378e61..61af3b5 100644 (file)
--- a/resource/csdk/connectivity/test/SConscript
+++ b/resource/csdk/connectivity/test/SConscript
@@ -35,6 +35,7 @@ rd_mode = catest_env.get('RD_MODE')
 ######################################################################
 catest_env.PrependUnique(CPPPATH = [
                 '../../logger/include',
+                '../../include',
                 '../../stack/include',
                 '../../../oc_logger/include',
                ])

diff --git a/resource/csdk/doc/Doxyfile b/resource/csdk/doc/Doxyfile
index 5b6b38b..56e3682 100644 (file)
--- a/resource/csdk/doc/Doxyfile
+++ b/resource/csdk/doc/Doxyfile
@@ -660,6 +660,7 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = . \
+                                                ../include \
                                                 ../stack/include \
                                                 ../ocsocket/include \
                                                 ../../c_common/ocrandom/include \

diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/include/octypes.h
similarity index 100%
rename from resource/csdk/stack/include/octypes.h
rename to resource/csdk/include/octypes.h

diff --git a/resource/csdk/resource-directory/SConscript b/resource/csdk/resource-directory/SConscript
index b79455f..51f6fd6 100755 (executable)
--- a/resource/csdk/resource-directory/SConscript
+++ b/resource/csdk/resource-directory/SConscript
@@ -37,6 +37,7 @@ rd_mode = env.get('RD_MODE')
 ######################################################################
 rd_env.AppendUnique(CPPPATH = ['include',
                                 'src/internal',
+                                '../include',
                                 '../stack/include',
                                 '../../include',
                                 '../logger/include',

diff --git a/resource/csdk/resource-directory/samples/SConscript b/resource/csdk/resource-directory/samples/SConscript
index 3b870ca..02baefe 100644 (file)
--- a/resource/csdk/resource-directory/samples/SConscript
+++ b/resource/csdk/resource-directory/samples/SConscript
@@ -36,6 +36,7 @@ src_dir = env.get('SRC_DIR')
 ######################################################################
 rd_sample_app_env.AppendUnique(CPPPATH = ['../include',
                                           '../src/internal',
+                                          src_dir + '/resource/csdk/include',
                                           src_dir + '/resource/csdk/stack/include',
                                           src_dir + '/resource/include',
                                           src_dir + '/resource/oc_logger/include',])

diff --git a/resource/csdk/resource-directory/unittests/SConscript b/resource/csdk/resource-directory/unittests/SConscript
index 9cdeb24..9616f72 100644 (file)
--- a/resource/csdk/resource-directory/unittests/SConscript
+++ b/resource/csdk/resource-directory/unittests/SConscript
@@ -60,6 +60,7 @@ rd_test_env.AppendUnique(
                 src_dir + '/extlibs/hippomocks-master',
                 '../include',
                 src_dir + '/resource/include',
+                src_dir + '/resource/csdk/include',
                 src_dir + '/resource/csdk/stack/include',
                 src_dir + '/resource/csdk/stack/test/',
                 src_dir + '/resource/oc_logger/include',])

diff --git a/resource/csdk/routing/SConscript b/resource/csdk/routing/SConscript
index cf18ade..d02dd3f 100644 (file)
--- a/resource/csdk/routing/SConscript
+++ b/resource/csdk/routing/SConscript
@@ -14,6 +14,7 @@ local_env = env.Clone()
 
 if env.get('ROUTING') == 'GW':
        local_env.AppendUnique(CPPPATH = [
+                               os.path.join(Dir('.').abspath, './../include'),
                                os.path.join(Dir('.').abspath, './../stack/include'),
                                os.path.join(Dir('.').abspath, './../stack/include/internal'),
                                os.path.join(Dir('.').abspath, './../logger'),
@@ -26,6 +27,7 @@ if env.get('ROUTING') == 'GW':
                        ])
 elif env.get('ROUTING') == 'EP':
        local_env.AppendUnique(CPPPATH = [
+                               os.path.join(Dir('.').abspath, './../include'),
                                os.path.join(Dir('.').abspath, './../stack/include'),
                                os.path.join(Dir('.').abspath, './../stack/include/internal'),
                                os.path.join(Dir('.').abspath, './../logger'),

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index b6cdc62..4648d2f 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -51,6 +51,7 @@ libocsrm_env.PrependUnique(CPPPATH = [
                '../../../extlibs/tinydtls/',
                '../logger/include',
                '../../c_common/ocrandom/include',
+               '../include',
                '../stack/include',
                '../stack/include/internal',
                '../../oc_logger/include',

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 4b941c7..7c3a43b 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -36,6 +36,7 @@ else:
        provisioning_env.AppendUnique(CPPPATH = ['../../connectivity/lib/libcoap-4.1.1/include'])
 
 provisioning_env.AppendUnique(CPPPATH = [
+               '../../include',
                '../../stack/include',
                '../../stack/include/internal',
                '../../../c_common/ocrandom/include',

diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript
index f816c1f..5d8ef9a 100644 (file)
--- a/resource/csdk/security/provisioning/sample/SConscript
+++ b/resource/csdk/security/provisioning/sample/SConscript
@@ -37,7 +37,7 @@ else:
        provisioning_env.AppendUnique(CPPPATH = ['../../../connectivity/lib/libcoap-4.1.1/include'])
 
 provisioning_env.AppendUnique(CPPPATH = [
-               '../../../stack/include',
+               '../../../include',
                '../../../ocrandom/include',
                '../../../logger/include',
                '../../../stack/include',

diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript
index cac1df6..264ce6f 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/SConscript
+++ b/resource/csdk/security/provisioning/unittest/SConscript
@@ -45,7 +45,7 @@ sptest_env.PrependUnique(CPPPATH = [
                '../include',
                '../../include',
                '../include/internal',
-               '../../../stack/include',
+               '../../../include',
                '../../../ocrandom/include',
                '../../../logger/include',
                '../../../stack/include',

diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript
index 5ce1bc4..ce844d1 100644 (file)
--- a/resource/csdk/security/tool/SConscript
+++ b/resource/csdk/security/tool/SConscript
@@ -36,6 +36,7 @@ else:
     tools_env.AppendUnique(CPPPATH = ['../../connectivity/lib/libcoap-4.1.1/include'])
 
 tools_env.PrependUnique(CPPPATH = ['../../../../extlibs/cjson',
+                                  '../../include',
                                   '../../stack/include',
                                   '../../stack/include/internal',
                                   '../../logger/include',

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index d124322..8a79bc6 100644 (file)
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -49,6 +49,7 @@ srmtest_env.PrependUnique(CPPPATH = [
                '../../connectivity/external/inc',
                '../include/internal',
                '../../logger/include',
+               '../../include',
                '../../stack/include',
                '../../stack/include/internal',
                '../../../oc_logger/include',

diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
index 829ce52..2c2a75b 100644 (file)
--- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
+++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
@@ -28,6 +28,7 @@ arduino_simplecs_env = env.Clone()
 ######################################################################
 arduino_simplecs_env.PrependUnique(CPPPATH = [
                '../../../../../logger/include',
+               '../../../../../include',
                '../../../../../stack/include',
                '../../../../../../oc_logger/include'
                ])

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index 283108c..8e6a94a 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -36,6 +36,7 @@ else:
 
 samples_env.PrependUnique(CPPPATH = [
                '../../../../logger/include',
+               '../../../../include',
                '../../../../stack/include',
                '../../../../security/include',
                '../../../../../../extlibs/boost/boost',

diff --git a/resource/csdk/stack/samples/linux/secure/SConscript b/resource/csdk/stack/samples/linux/secure/SConscript
index 5cabeca..37f3b08 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/SConscript
+++ b/resource/csdk/stack/samples/linux/secure/SConscript
@@ -26,6 +26,7 @@ samples_env = env.Clone()
 ######################################################################
 samples_env.PrependUnique(CPPPATH = [
                '../../../../logger/include',
+               '../../../../include',
                '../../../../stack/include',
                '../../../../security/include',
                '../../../../../../extlibs/tinydtls',

diff --git a/resource/csdk/stack/samples/tizen/build/SConscript b/resource/csdk/stack/samples/tizen/build/SConscript
index aa9c4ae..933dd89 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/SConscript
+++ b/resource/csdk/stack/samples/tizen/build/SConscript
@@ -27,6 +27,7 @@ else:
 
 env.PrependUnique(CPPPATH = [
                '../../../../logger/include',
+               '../../../../include',
                '../../../../stack/include',
                '../../../../../oc_logger/include'
                ])

diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
index 54e24ef..4cd6d9a 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
+++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
@@ -88,7 +88,7 @@ cp -rf %{ROOTDIR}/resource/csdk/stack/include/ocstack.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/resource/csdk/security/include/securevirtualresourcetypes.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/resource/c_common/byte_array.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/resource/csdk/stack/include/ocstackconfig.h* %{DEST_INC_DIR}/
-cp -rf %{ROOTDIR}/resource/csdk/stack/include/octypes.h* %{DEST_INC_DIR}/
+cp -rf %{ROOTDIR}/resource/csdk/include/octypes.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/resource/csdk/logger/include/logger.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/resource/csdk/logger/include/logger_types.h* %{DEST_INC_DIR}/
 cp resource/oc_logger/include/oc_logger.hpp %{DEST_INC_DIR}/

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index 3e8ac94..5517b08 100644 (file)
--- a/resource/csdk/stack/test/SConscript
+++ b/resource/csdk/stack/test/SConscript
@@ -37,6 +37,7 @@ stacktest_env.PrependUnique(CPPPATH = [
                '../../ocsocket/include',
                '../../logger/include',
                '../../../c_common/ocrandom/include',
+               '../../include',
                '../../stack/include',
                '../../stack/include/internal',
                '../../connectivity/api',

diff --git a/resource/csdk/stack/test/linux/SConscript b/resource/csdk/stack/test/linux/SConscript
index 158bda0..12cd587 100644 (file)
--- a/resource/csdk/stack/test/linux/SConscript
+++ b/resource/csdk/stack/test/linux/SConscript
@@ -25,6 +25,7 @@ csdktest_env = env.Clone()
 # Build flags
 ######################################################################
 csdktest_env.PrependUnique(CPPPATH = [
+    '../../../include',
     '../../../stack/include',
 ])
 

diff --git a/resource/examples/SConscript b/resource/examples/SConscript
index 57d989b..f8b3999 100644 (file)
--- a/resource/examples/SConscript
+++ b/resource/examples/SConscript
@@ -34,6 +34,7 @@ target_os = examples_env.get('TARGET_OS')
 ######################################################################
 examples_env.AppendUnique(CPPPATH = [
                '../include/',
+               '../csdk/include',
                '../csdk/stack/include',
                '../c_common/ocrandom/include',
                '../csdk/logger/include',

diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index 499cf9c..5f73770 100644 (file)
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -35,6 +35,7 @@ else:
 
 ocprovision_env.AppendUnique(CPPPATH = [
                '../include/',
+               '../csdk/include',
                '../csdk/stack/include',
                '../csdk/logger/include',
                '../oc_logger/include',

diff --git a/resource/provisioning/examples/SConscript b/resource/provisioning/examples/SConscript
index ed677ea..c153316 100644 (file)
--- a/resource/provisioning/examples/SConscript
+++ b/resource/provisioning/examples/SConscript
@@ -38,6 +38,7 @@ examples_env = lib_env.Clone()
 ######################################################################
 examples_env.AppendUnique(CPPPATH = [
         '../../include/',
+        '../../csdk/include',
         '../../csdk/stack/include',
         '../../csdk/logger/include',
         '../../oc_logger/include',

diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript
index 6917d52..b77da02 100755 (executable)
--- a/resource/provisioning/unittests/SConscript
+++ b/resource/provisioning/unittests/SConscript
@@ -37,6 +37,7 @@ with_ra_ibb = provisiontests_env.get('WITH_RA_IBB')
 provisiontests_env.PrependUnique(CPPPATH = [
                '../../include',
                '../../oc_logger/include',
+               '../../csdk/include',
                '../../csdk/stack/include',
                '../../csdk/security/include',
                '../../csdk/security/provisioning/include',

diff --git a/resource/src/SConscript b/resource/src/SConscript
index 58c0d2a..6545707 100644 (file)
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -47,6 +47,7 @@ else:
 
 oclib_env.AppendUnique(CPPPATH = [
                '../include/',
+               '../csdk/include',
                '../csdk/stack/include',
                '../c_common/ocrandom/include',
                '../csdk/logger/include',

diff --git a/resource/unittests/SConscript b/resource/unittests/SConscript
index 4b15fdd..11fc02c 100644 (file)
--- a/resource/unittests/SConscript
+++ b/resource/unittests/SConscript
@@ -36,6 +36,7 @@ with_mq = unittests_env.get('WITH_MQ')
 unittests_env.PrependUnique(CPPPATH = [
                '../include',
                '../oc_logger/include',
+               '../csdk/include',
                '../csdk/stack/include',
                '../csdk/security/include',
                '../csdk/stack/include/internal',

diff --git a/service/coap-http-proxy/SConscript b/service/coap-http-proxy/SConscript
index 6f9817c..194c6de 100644 (file)
--- a/service/coap-http-proxy/SConscript
+++ b/service/coap-http-proxy/SConscript
@@ -41,6 +41,7 @@ src_dir = env.get('SRC_DIR')
 # Build flags
 ######################################################################
 local_env.AppendUnique(CPPPATH = ['include',
+                        os.path.join(src_dir, 'resource/csdk/include'),
                         os.path.join(src_dir, 'resource/csdk/stack/include'),
                         os.path.join(src_dir, 'resource/csdk/connectivity/common/inc/'),
                         os.path.join(src_dir, 'extlibs/cjson'),

diff --git a/service/coap-http-proxy/unittests/SConscript b/service/coap-http-proxy/unittests/SConscript
index e5677bc..dc011c2 100644 (file)
--- a/service/coap-http-proxy/unittests/SConscript
+++ b/service/coap-http-proxy/unittests/SConscript
@@ -64,6 +64,7 @@ if not CoAP_test_env.get('RELEASE'):
 
 CoAP_test_env.AppendUnique(CPPPATH = [src_dir + '/extlibs/hippomocks-master',
                         '../include',
+                        os.path.join(src_dir, 'resource/csdk/include'),
                         os.path.join(src_dir, 'resource/csdk/stack/include'),
                         os.path.join(src_dir, 'resource/csdk/connectivity/common/inc/'),
                         os.path.join(src_dir, 'resource/csdk/connectivity/lib/libcoap-4.1.1'),

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index b80fc90..3f4c89c 100644 (file)
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -43,6 +43,7 @@ enrollee_env.PrependUnique(CPPPATH = [
                enrollee_env.get('SRC_DIR') + '/resource/include',
                enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
                enrollee_env.get('SRC_DIR') + '/resource/oc_logger/include',
+               enrollee_env.get('SRC_DIR') + '/resource/csdk/include',
                 enrollee_env.get('SRC_DIR') + '/resource/csdk/stack/include',
                 enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
                enrollee_env.get('SRC_DIR') + '/resource/csdk/security/include',

diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript
index e201b2b..1d91138 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -90,6 +90,7 @@ if target_os in ['android','linux']:
                env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
                env.get('SRC_DIR') + '/resource/include',
                env.get('SRC_DIR') + '/resource/csdk/logger/include',
+               env.get('SRC_DIR') + '/resource/csdk/include',
                env.get('SRC_DIR') + '/resource/csdk/stack/include',
                env.get('SRC_DIR') + '/resource/csdk/logger/include',
                env.get('SRC_DIR') + '/resource/csdk/security/include',

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
index 46f6f50..e158ce8 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
@@ -76,6 +76,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/oc_logger/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/c_common/oic_malloc/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/connectivity/api \
+                                       $(LOCAL_PATH)/../../../../../../../../../resource/csdk/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/stack/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/logger/include \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/include \

diff --git a/service/easy-setup/sampleapp/enrollee/arduino/SConscript b/service/easy-setup/sampleapp/enrollee/arduino/SConscript
index 57b2d04..33a16fc 100755 (executable)
--- a/service/easy-setup/sampleapp/enrollee/arduino/SConscript
+++ b/service/easy-setup/sampleapp/enrollee/arduino/SConscript
@@ -33,6 +33,7 @@ transport = enrollee_env.get('TARGET_TRANSPORT')
 enrollee_env.PrependUnique(CPPPATH = [
         env.get('SRC_DIR') + '/resource/oc_logger/include',
         env.get('SRC_DIR') + '/resource/csdk/logger/include',
+        env.get('SRC_DIR') + '/resource/csdk/include',
         env.get('SRC_DIR') + '/resource/csdk/stack/include',
                env.get('SRC_DIR') + '/extlibs/cjson',
                env.get('SRC_DIR') + '/service/easy-setup/inc',

diff --git a/service/easy-setup/sampleapp/enrollee/linux/SConscript b/service/easy-setup/sampleapp/enrollee/linux/SConscript
index e647c22..8b35700 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/linux/SConscript
+++ b/service/easy-setup/sampleapp/enrollee/linux/SConscript
@@ -48,6 +48,7 @@ enrollee_env.PrependUnique(CPPPATH = [
                env.get('SRC_DIR') + '/resource/include',
         env.get('SRC_DIR') + '/resource/oc_logger/include',
         env.get('SRC_DIR') + '/resource/csdk/logger/include',
+        env.get('SRC_DIR') + '/resource/csdk/include',
         env.get('SRC_DIR') + '/resource/csdk/stack/include',
         env.get('SRC_DIR') + '/extlibs/cjson',
         env.get('SRC_DIR') + '/service/easy-setup/inc',

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
index ccbc795..f8cfc76 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
@@ -47,6 +47,7 @@ mediator_env.PrependUnique(CPPPATH = [
             env.get('SRC_DIR') + '/resource/include',
             env.get('SRC_DIR') + '/resource/oc_logger/include',
                        env.get('SRC_DIR') + '/resource/c_common/oic_malloc/include',
+                       env.get('SRC_DIR') + '/resource/csdk/include',
                        env.get('SRC_DIR') + '/resource/csdk/stack/include',
                        env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include',
                        env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',

diff --git a/service/notification/SConscript b/service/notification/SConscript
index 1b96d47..e5297e6 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -46,6 +46,7 @@ notification_env.AppendUnique(CPPPATH = ['include'])
 notification_env.AppendUnique(CPPPATH = ['src/common'])
 notification_env.AppendUnique(CPPPATH = ['src/provider'])
 notification_env.AppendUnique(CPPPATH = ['src/consumer'])
+notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/include'])
 notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/stack/include'])
 notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/resource-directory/include'])
 notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/connectivity/api'])

diff --git a/service/notification/android/notification-service/src/main/jni/Android.mk b/service/notification/android/notification-service/src/main/jni/Android.mk
index 515878d..8ae8e6b 100755 (executable)
--- a/service/notification/android/notification-service/src/main/jni/Android.mk
+++ b/service/notification/android/notification-service/src/main/jni/Android.mk
@@ -1,16 +1,19 @@
 LOCAL_PATH := $(call my-dir)
 
 ROOT_PATH := ../../../../../../..
+OIC_SRC_DIR := ../../../../../..
 
 include $(CLEAR_VARS)
 OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := notification_consumer
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_consumer.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := notification_consumer_wrapper
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_consumer_wrapper.so
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -35,9 +38,8 @@ LOCAL_SHARED_LIBRARIES += android-ocstack
 LOCAL_SHARED_LIBRARIES += notification_consumer
 LOCAL_SHARED_LIBRARIES += notification_consumer_wrapper
 
-OIC_SRC_DIR := ../../../../../..
-
-LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/stack/include
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
@@ -61,12 +63,14 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := notification_provider_wrapper
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_provider_wrapper.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 OIC_LIB_PATH := $(ROOT_PATH)/out/android/$(TARGET_ARCH_ABI)/$(APP_OPTIM)
 LOCAL_MODULE := notification_provider
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libnotification_provider.so
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -87,7 +91,8 @@ LOCAL_SHARED_LIBRARIES += notification_provider_wrapper
 
 OIC_SRC_DIR := ../../../../../..
 
-LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/stack/include
+LOCAL_C_INCLUDES := $(OIC_SRC_DIR)/resource/csdk/include
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common

diff --git a/service/notification/cpp-wrapper/examples/linux/SConscript b/service/notification/cpp-wrapper/examples/linux/SConscript
index 8daaa7b..054cafd 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/SConscript
+++ b/service/notification/cpp-wrapper/examples/linux/SConscript
@@ -36,6 +36,7 @@ notification_sample_env.AppendUnique(CPPPATH = ['../../../include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../provider/inc'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../consumer/inc'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../common'])
+notification_sample_env.AppendUnique(CPPPATH = ['../../../../../resource/csdk/include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../../../resource/csdk/stack/include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../../../resource/csdk/connectivity/api'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../src/common'])

diff --git a/service/notification/examples/linux/SConscript b/service/notification/examples/linux/SConscript
index 1368366..65ef34e 100644 (file)
--- a/service/notification/examples/linux/SConscript
+++ b/service/notification/examples/linux/SConscript
@@ -15,6 +15,7 @@ target_os = env.get('TARGET_OS')
 notification_sample_env.AppendUnique(CPPPATH = ['../../include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../src/common'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../src/provider'])
+notification_sample_env.AppendUnique(CPPPATH = ['../../../../resource/csdk/include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../../resource/csdk/stack/include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../../resource/csdk/resource-directory/include'])
 notification_sample_env.AppendUnique(CPPPATH = ['../../../../resource/csdk/connectivity/api'])

diff --git a/service/resource-container/android/resource-container/src/main/jni/Android.mk b/service/resource-container/android/resource-container/src/main/jni/Android.mk
index d5620f6..5317f88 100644 (file)
--- a/service/resource-container/android/resource-container/src/main/jni/Android.mk
+++ b/service/resource-container/android/resource-container/src/main/jni/Android.mk
@@ -33,6 +33,7 @@ LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-container/bundle-api/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-container/src
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-encapsulation/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-encapsulation/src/serverBuilder/include
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/logger/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/oc_logger/include

diff --git a/service/resource-encapsulation/android/service/src/main/jni/Android.mk b/service/resource-encapsulation/android/service/src/main/jni/Android.mk
index 9ab9118..8b4dd86 100644 (file)
--- a/service/resource-encapsulation/android/service/src/main/jni/Android.mk
+++ b/service/resource-encapsulation/android/service/src/main/jni/Android.mk
@@ -25,6 +25,7 @@ LOCAL_MODULE := rcs_jni
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/util
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/c_common
+LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/resource/csdk/stack/include
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/extlibs/boost/boost_1_58_0
 LOCAL_C_INCLUDES += $(OIC_SRC_DIR)/service/resource-encapsulation/include

diff --git a/service/simulator/SConscript b/service/simulator/SConscript
index 8a03a54..4ddeb0c 100755 (executable)
--- a/service/simulator/SConscript
+++ b/service/simulator/SConscript
@@ -40,6 +40,7 @@ target_os = env.get('TARGET_OS')
 simulator_env.AppendUnique(CPPPATH = ['inc', 'src/client', 'src/server', 'src/common'])
 simulator_env.AppendUnique(CPPPATH = [
                '../../resource/include/',
+               '../../resource/csdk/include',
                '../../resource/csdk/stack/include',
                '../../resource/c_common/ocrandom/include',
                '../../resource/csdk/logger/include',

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index c757bb9..66f2f84 100644 (file)
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -66,6 +66,7 @@ lib_env.AppendUnique(CPPPATH = [
                resource_path ,
                resource_path + '/include' ,
                resource_path + '/oc_logger/include',
+               resource_path + '/csdk/include',
                resource_path + '/csdk/stack/include',
                resource_path + '/c_common/ocrandom/include',
                resource_path + '/csdk/logger/include'

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index f52cbee..4665a41 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -259,6 +259,7 @@ cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
 %endif
 
 cp resource/c_common/*.h %{buildroot}%{_includedir}
+cp resource/csdk/include/*.h %{buildroot}%{_includedir}
 cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
 cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir}