Scons Script Changes for disabling debug for release mode

Scripts also changed to take current Iotivity structure changes

Change-Id: I589082e9675d99aa9dd6cc1bace26e11b1210510
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/178
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>

diff --git a/build_common/linux/SConscript b/build_common/linux/SConscript
index 1b02847..4db665d 100644 (file)
--- a/build_common/linux/SConscript
+++ b/build_common/linux/SConscript
@@ -10,11 +10,11 @@ print "Reading linux configuration script"
 if env.get('RELEASE'):
        env.AppendUnique(CCFLAGS = ['-Os'])
        env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-       env.AppendUnique(LINKFLAGS = ['-s'])
 else:
        env.AppendUnique(CCFLAGS = ['-g'])
-
-env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__LINUX__','-DTB_LOG'])
+       env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+       
+env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__linux__'])
 env.AppendUnique(CCFLAGS = ['-Wall', '-fPIC','`pkg-config','--cflags','glib-2.0`'])
 env.AppendUnique(LINKFLAGS = ['-ldl', '-lpthread', '-lglib-2.0', '-lgthread-2.0'])
 

diff --git a/resource/csdk/connectivity/SConscript b/resource/csdk/connectivity/SConscript
index 5f0f882..f3abb72 100644 (file)
--- a/resource/csdk/connectivity/SConscript
+++ b/resource/csdk/connectivity/SConscript
@@ -4,85 +4,5 @@
 
 Import('env')
 
-ca_os = env.get('TARGET_OS')
-ca_transport = env.get('TARGET_TRANSPORT')
-secured = env.get('SECURED')
-root_dir = './'
-ca_path = './src/'
-build_dir = env.get('BUILD_DIR')
-
-#####################################################################
-# Source files and Target(s)
-######################################################################
-
-print"Reading ca script %s"%ca_transport
-
-env.PrependUnique(CPPPATH = [root_dir + '/api/'])
-env.AppendUnique(CPPPATH = [root_dir + '/inc/'])
-env.AppendUnique(CPPPATH = [root_dir + '/lib/libcoap-4.1.1/'])
-env.AppendUnique(CPPPATH = [root_dir + '/common/inc/'])
-
-#Getting common source files
-env.SConscript('./common/SConscript')
-
-
-env.AppendUnique(CA_SRC=[ca_path+'adapter_util/caadapterutils.c'])
-env.AppendUnique(CA_SRC=[ca_path+'adapter_util/camsgparser.c'])
-if env.get('SECURED') == '1':
-       env.AppendUnique(CA_SRC=[ca_path+'adapter_util/caadapternetdtls.c'])
-       env.AppendUnique(CPPPATH = [root_dir + '/external/inc/'])
-
-if ca_os == 'arduino':
-       ca_common_src = [
-               ca_path + 'caconnectivitymanager_singlethread.c',
-               ca_path + 'cainterfacecontroller_singlethread.c',
-               ca_path + 'camessagehandler_singlethread.c',
-               ca_path + 'canetworkconfigurator_singlethread.c',
-               ca_path + 'caprotocolmessage_singlethread.c',
-               ca_path + 'caremotehandler.c',
-               ca_path + 'caretransmission_singlethread.cpp',
-               ]
-else:
-       ca_common_src = [
-               ca_path + 'caconnectivitymanager.c',
-               ca_path + 'cainterfacecontroller.c',
-               ca_path + 'camessagehandler.c',
-               ca_path + 'canetworkconfigurator.c',
-               ca_path + 'caprotocolmessage.c',
-               ca_path + 'caqueueingthread.c',
-               ca_path + 'caremotehandler.c',
-               ca_path + 'caretransmission.c',
-               ]
-       if secured == '1':
-               env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
-               env.AppendUnique(CPPPATH = [root_dir + '/lib/tinydtls'])
-env.AppendUnique(CA_SRC = ca_common_src)
-
-
-
-if 'ALL' in ca_transport:
-       env.SConscript(ca_path + 'ethernet_adapter/SConscript')
-       env.SConscript(ca_path + 'wifi_adapter/SConscript')
-       env.SConscript(ca_path + 'bt_edr_adapter/SConscript')
-       env.SConscript(ca_path + 'bt_le_adapter/SConscript')
-
-if 'WIFI' in ca_transport:
-       env.SConscript(ca_path + 'wifi_adapter/SConscript')
-
-if 'ETHERNET' in ca_transport:
-       env.SConscript(ca_path + 'ethernet_adapter/SConscript')
-
-if 'BT' in ca_transport:
-       env.SConscript(ca_path + 'bt_edr_adapter/SConscript')
-
-if 'BLE' in ca_transport:
-       env.SConscript(ca_path + 'bt_le_adapter/SConscript')
-
-print "Include path is %s" %env.get('CPPPATH')
-print "Files path is %s" %env.get('CA_SRC')
-
-calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
-env.InstallTarget(calib, 'libconnectivity_abstraction')
-if env.get('SECURED') == '1':
-       env.Install(build_dir, './lib/tinydtls/libtinydtls.a')
+env.SConscript('./src/SConscript')
 

diff --git a/resource/csdk/connectivity/SConstruct b/resource/csdk/connectivity/SConstruct
index 22bec79..7f8febd 100644 (file)
--- a/resource/csdk/connectivity/SConstruct
+++ b/resource/csdk/connectivity/SConstruct
@@ -83,7 +83,7 @@ elif target_os == 'linux':
        SConscript(build_dir + 'SConscript')
 
        # Build 'samples' sub-project
-       sample_env.SConscript(build_dir + 'samples/linux/SConscript')
+       env.SConscript(build_dir + 'samples/linux/SConscript')
 elif target_os == 'android':
 
        # Build 'libcoap' library

diff --git a/resource/csdk/connectivity/build/arduino/arduino.scons b/resource/csdk/connectivity/build/arduino/arduino.scons
index 57b6ece..15093ae 100644 (file)
--- a/resource/csdk/connectivity/build/arduino/arduino.scons
+++ b/resource/csdk/connectivity/build/arduino/arduino.scons
@@ -14,4 +14,7 @@ if 'BLE' in env.get('TARGET_TRANSPORT'):
 
 env.ImportLib('Time/Time')
 # we have variety of macros for arduino!!
-env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__', 'TB_LOG'])
+if env.get('RELEASE'):
+       env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__'])
+else:
+       env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__', 'TB_LOG'])

diff --git a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
index 62a98ed..0301ba7 100644 (file)
--- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
+++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
@@ -48,7 +48,7 @@ mkdir -p %{buildroot}/usr/lib
 mkdir -p %{DEST_INC_DIR}
 mkdir -p %{DEST_LIB_DIR}/pkgconfig
 
-cp -rf %{ROOTDIR}/con/libconnectivity_abstraction.a %{buildroot}/usr/lib
+cp -rf %{ROOTDIR}/con/src/libconnectivity_abstraction.a %{buildroot}/usr/lib
 cp -rf %{ROOTDIR}/con/lib/libcoap-4.1.1/libcoap.a %{buildroot}/usr/lib
 cp -rf %{ROOTDIR}/con/api/cacommon.h* %{DEST_INC_DIR}/
 cp -rf %{ROOTDIR}/con/inc/caadapterinterface.h* %{DEST_INC_DIR}/

diff --git a/resource/csdk/connectivity/common/SConscript b/resource/csdk/connectivity/common/SConscript
index ce670a7..9f4dcbf 100644 (file)
--- a/resource/csdk/connectivity/common/SConscript
+++ b/resource/csdk/connectivity/common/SConscript
@@ -7,12 +7,12 @@ Import('env')
 print "Reading common folder script"
 
 ca_os = env.get('TARGET_OS')
-root_dir = './'
+root_dir = './../'
 ca_common_path = root_dir + '/common/'
 ca_common_src_path = ca_common_path + 'src/'
 
 env.AppendUnique(CPPPATH = [
-       ca_common_path + 'inc/',
+       'common/inc/',
        ])
 
 temp = env['CPPPATH']
@@ -31,7 +31,7 @@ ca_common_src = [
        ]
        
 if ca_os == 'arduino':
-       env.Command(env.get('BUILD_DIR') + 'logger.c.o', None, '$CXX -o ' + env.get('BUILD_DIR') + 'logger.c.o' + ' $LINKFLAGS  $CCFLAGS  $CXXFLAGS ' + header + ' ' + ca_common_src_path + 'logger.c')
+       env.Command(env.get('BUILD_DIR') + 'logger.c.o', None, '$CXX -o ' + env.get('BUILD_DIR') + 'logger.c.o' + ' $LINKFLAGS  $CCFLAGS  $CXXFLAGS ' + header + ' ' + 'common/src/logger.c')
        platform_src = [
                env.get('BUILD_DIR') + 'logger.c.o',
        ]

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
new file mode 100644 (file)
index 0000000..5b73ddc
--- /dev/null
+++ b/resource/csdk/connectivity/src/SConscript
@@ -0,0 +1,88 @@
+##
+# CA build script
+##
+
+Import('env')
+
+ca_os = env.get('TARGET_OS')
+ca_transport = env.get('TARGET_TRANSPORT')
+secured = env.get('SECURED')
+root_dir = './../'
+ca_path = './'
+build_dir = env.get('BUILD_DIR')
+
+#####################################################################
+# Source files and Target(s)
+######################################################################
+
+print"Reading ca script %s"%ca_transport
+
+env.PrependUnique(CPPPATH = [root_dir + '/api/'])
+env.AppendUnique(CPPPATH = [root_dir + '/inc/'])
+env.AppendUnique(CPPPATH = [root_dir + '/lib/libcoap-4.1.1/'])
+env.AppendUnique(CPPPATH = [root_dir + '/common/inc/'])
+
+#Getting common source files
+env.SConscript('./../common/SConscript')
+
+
+env.AppendUnique(CA_SRC=[ca_path+'adapter_util/caadapterutils.c'])
+env.AppendUnique(CA_SRC=[ca_path+'adapter_util/camsgparser.c'])
+if env.get('SECURED') == '1':
+       env.AppendUnique(CA_SRC=[ca_path+'adapter_util/caadapternetdtls.c'])
+       env.AppendUnique(CPPPATH = [root_dir + '/external/inc/'])
+
+if ca_os == 'arduino':
+       ca_common_src = [
+               ca_path + 'caconnectivitymanager_singlethread.c',
+               ca_path + 'cainterfacecontroller_singlethread.c',
+               ca_path + 'camessagehandler_singlethread.c',
+               ca_path + 'canetworkconfigurator_singlethread.c',
+               ca_path + 'caprotocolmessage_singlethread.c',
+               ca_path + 'caremotehandler.c',
+               ca_path + 'caretransmission_singlethread.cpp',
+               ]
+else:
+       ca_common_src = [
+               ca_path + 'caconnectivitymanager.c',
+               ca_path + 'cainterfacecontroller.c',
+               ca_path + 'camessagehandler.c',
+               ca_path + 'canetworkconfigurator.c',
+               ca_path + 'caprotocolmessage.c',
+               ca_path + 'caqueueingthread.c',
+               ca_path + 'caremotehandler.c',
+               ca_path + 'caretransmission.c',
+               ]
+       if secured == '1':
+               env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
+               env.AppendUnique(CPPPATH = [root_dir + '/lib/tinydtls'])
+env.AppendUnique(CA_SRC = ca_common_src)
+
+
+
+if 'ALL' in ca_transport:
+       env.SConscript(ca_path + 'ethernet_adapter/SConscript')
+       env.SConscript(ca_path + 'wifi_adapter/SConscript')
+       env.SConscript(ca_path + 'bt_edr_adapter/SConscript')
+       env.SConscript(ca_path + 'bt_le_adapter/SConscript')
+
+if 'WIFI' in ca_transport:
+       env.SConscript(ca_path + 'wifi_adapter/SConscript')
+
+if 'ETHERNET' in ca_transport:
+       env.SConscript(ca_path + 'ethernet_adapter/SConscript')
+
+if 'BT' in ca_transport:
+       env.SConscript(ca_path + 'bt_edr_adapter/SConscript')
+
+if 'BLE' in ca_transport:
+       env.SConscript(ca_path + 'bt_le_adapter/SConscript')
+
+print "Include path is %s" %env.get('CPPPATH')
+print "Files path is %s" %env.get('CA_SRC')
+
+calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC'))
+env.InstallTarget(calib, 'libconnectivity_abstraction')
+if env.get('SECURED') == '1':
+       env.Install(build_dir, './../lib/tinydtls/libtinydtls.a')
+

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/SConscript b/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
index f740c03..b3dca7d 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/SConscript
@@ -7,7 +7,7 @@ Import('env')
 print"Reading bt adapter script"
 
 target_os = env.get('TARGET_OS')
-src_dir = './src/bt_edr_adapter/'
+src_dir = './bt_edr_adapter/'
 
 #Source files to build common for all platforms
 if target_os != 'arduino':

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/SConscript b/resource/csdk/connectivity/src/bt_le_adapter/SConscript
index 0e83b33..7968c75 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/SConscript
+++ b/resource/csdk/connectivity/src/bt_le_adapter/SConscript
@@ -7,7 +7,7 @@ Import('env')
 print"Reading ble adapter script"
 
 target_os = env.get('TARGET_OS')
-src_dir = './src/bt_le_adapter/'
+src_dir = './bt_le_adapter/'
 
 #Source files to build common for all platforms
 if target_os != 'arduino':

diff --git a/resource/csdk/connectivity/src/ethernet_adapter/SConscript b/resource/csdk/connectivity/src/ethernet_adapter/SConscript
index f88766e..355a038 100644 (file)
--- a/resource/csdk/connectivity/src/ethernet_adapter/SConscript
+++ b/resource/csdk/connectivity/src/ethernet_adapter/SConscript
@@ -8,7 +8,7 @@ print "Reading ethernet adapter script"
 
 target_os = env.get('TARGET_OS')
 inc_files = env.get('CPPPATH')
-src_dir = './src/ethernet_adapter/'
+src_dir = './ethernet_adapter/'
 
 #Source files to build common for all platforms
 if target_os == 'arduino':

diff --git a/resource/csdk/connectivity/src/wifi_adapter/SConscript b/resource/csdk/connectivity/src/wifi_adapter/SConscript
index d5c548b..c0d95b8 100644 (file)
--- a/resource/csdk/connectivity/src/wifi_adapter/SConscript
+++ b/resource/csdk/connectivity/src/wifi_adapter/SConscript
@@ -7,7 +7,7 @@ Import('env')
 print"Reading wifi adapter script"
 
 target_os = env.get('TARGET_OS')
-src_dir = './src/wifi_adapter/'
+src_dir = './wifi_adapter/'
 
 #Source files to build common for all platforms
 if target_os != 'arduino':