Move unittest file to test folder to sync with existing folder structure

[platform/upstream/iotivity.git] / resource / csdk / SConscript

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index d218c26..c32cca0 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -1,3 +1,23 @@
+#******************************************************************
+#
+# Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 ##
 # liboctbstack (share library) build script
 ##
@@ -21,15 +41,13 @@ if target_os == 'arduino':
 ######################################################################
 liboctbstack_env.PrependUnique(CPPPATH = [
                '../../extlibs/cjson/',
-               'ocsocket/include',
                'logger/include',
                'ocrandom/include',
                'ocmalloc/include',
-               'libcoap',
-               'occoap/include',
                'stack/include',
                'stack/include/internal',
                '../oc_logger/include',
+               'connectivity/lib/libcoap-4.1.1',
                'connectivity/inc',
                'connectivity/api',
                'security/include',
@@ -46,6 +64,8 @@ if target_os not in ['windows', 'winrt']:
 liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
 
+liboctbstack_env.AppendUnique(CPPDEFINES = ['CA_SEC_MERGE_WORKAROUND'])
+
 if target_os == 'arduino':
        liboctbstack_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO'])
 else:
@@ -56,27 +76,26 @@ if target_os in ['darwin', 'ios']:
        liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
        liboctbstack_env.AppendUnique(LIBS = ['coap'])
 
-if not env.get('RELEASE'):
+if env.get('LOGGING'):
        liboctbstack_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-liboctbstack_env.AppendUnique(CPPDEFINES = ['CA_INT'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################
 OCTBSTACK_SRC = 'stack/src/'
 liboctbstack_src = [
        '../../extlibs/cjson/cJSON.c',
-       'occoap/src/occoap.c',
-       'occoap/src/occoaphelper.c',
        OCTBSTACK_SRC + 'ocstack.c',
        OCTBSTACK_SRC + 'occlientcb.c',
        OCTBSTACK_SRC + 'ocresource.c',
        OCTBSTACK_SRC + 'ocobserve.c',
-    OCTBSTACK_SRC + 'ocserverrequest.c',
+       OCTBSTACK_SRC + 'ocserverrequest.c',
        OCTBSTACK_SRC + 'occollection.c',
        OCTBSTACK_SRC + 'oicgroup.c',
-       'security/src/ocsecurity.c'
+       'security/src/ocsecurity.c',
+       'logger/src/logger.c',
+       'ocrandom/src/ocrandom.c',
+       'ocmalloc/src/ocmalloc.c'
        ]
 if target_os == 'arduino':
        liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src)
@@ -84,3 +103,4 @@ else:
        liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src)
 
 liboctbstack_env.InstallTarget(liboctbstack, 'liboctbstack')
+