[Patch-1] Initial
[Patch-2,3] Fixed build error in case of CA partially.
Note : The purpose of this patch is to fix build error
when building full tizen with security.
The change required in jenkins configuration is out of this patch.
Change-Id: I2ec95c13d6c7d7978662e7ef69f7a02cd8188df0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2997
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit
8a42b6a387e634c1138a82ada0df1fc43d93ad36)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3171
target_os = sqlite_env.get('TARGET_OS')
src_dir = sqlite_env.get('SRC_DIR')
-targets_need_sqlite = ['linux', 'android']
+targets_need_sqlite = ['linux', 'android', 'tizen']
sqlite_dir = src_dir + '/extlibs/sqlite3/'
sqlite_build_dir = src_dir + '/extlibs/sqlite3/sqlite-amalgamation-3081101/'
sqlite_zip_file = src_dir + '/extlibs/sqlite3/sqlite-amalgamation-3081101.zip'
cp -R ./extlibs/tinycbor $sourcedir/tmp/extlibs
cp -R ./extlibs/cjson $sourcedir/tmp/extlibs
cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs
+cp -R ./extlibs/sqlite3 $sourcedir/tmp/extlibs
cp -R ./extlibs/timer $sourcedir/tmp/extlibs
cp -R ./extlibs/rapidxml $sourcedir/tmp/extlibs
cp -R ./resource $sourcedir/tmp
# is interpreted by SCons as the top-level iotivity directory where
# the SConscruct file is found.
if env.get('SECURED') == '1':
- if ca_os == 'tizen':
- env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
- else:
- env.SConscript('#extlibs/tinydtls/SConscript')
+ if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'):
+ env.SConscript(os.path.join(root_dir, 'extlibs/tinydtls/SConscript'))
+ else:
+ env.SConscript('#extlibs/tinydtls/SConscript')
env.AppendUnique(CA_SRC = [os.path.join(ca_path,
'adapter_util/caadapterutils.c')])
env.AppendUnique(CPPDEFINES = ['WITH_BWT'])
if secured == '1':
env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
- if ca_os == 'tizen':
- env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')])
- else:
- env.AppendUnique(CPPPATH = ['#extlibs/tinydtls'])
+ if ca_os == 'tizen' and os.path.exists(root_dir + '/extlibs/tinydtls'):
+ env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'extlibs/tinydtls')])
+ else:
+ env.AppendUnique(CPPPATH = ['#extlibs/tinydtls'])
ca_common_src = [
os.path.join(ca_path, d) for d in ca_common_src ]
libocsrm_env.InstallTarget(libocsrm, 'libocsrm')
libocsrm_env.UserInstallTargetLib(libocsrm, 'libocsrm')
-if target_os in ['linux', 'android'] and env.get('SECURED') == '1':
+if target_os in ['linux', 'android', 'tizen'] and env.get('SECURED') == '1':
SConscript('provisioning/SConscript')
#include <stdio.h>
#include <stdbool.h>
-#include <sqlite3.h>
#include <string.h>
#include <stdlib.h>
+#include "sqlite3.h"
#include "logger.h"
#include "oic_malloc.h"
#include "provisioningdatabasemanager.h"
* eg: VERIFY_NON_NULL(TAG, ptrData, ERROR,OC_STACK_ERROR);
*/
#define PDM_VERIFY_SQLITE_OK(tag, arg, logLevel, retValue) do{ if (SQLITE_OK != (arg)) \
- { OC_LOG_V((logLevel), tag, ("Error in " #arg ", Error Message: %s"), \
+ { OC_LOG_V((logLevel), tag, "Error in " #arg ", Error Message: %s", \
sqlite3_errmsg(g_db)); return retValue; }}while(0)
#define PDM_SQLITE_TRANSACTION_BEGIN "BEGIN TRANSACTION;"
* eg: VERIFY_NON_NULL(TAG, ptrData, ERROR,OC_STACK_ERROR);
*/
#define VERIFY_NON_NULL(tag, arg, logLevel, retValue) { if (NULL == (arg)) \
- { OC_LOG((logLevel), tag, (#arg " is NULL")); return retValue; } }
+ { OC_LOG((logLevel), tag, #arg " is NULL"); return retValue; } }
/**
* Macro to verify success of operation.
* eg: VERIFY_SUCCESS(TAG, OC_STACK_OK == foo(), ERROR, OC_STACK_ERROR);
*/
#define VERIFY_SUCCESS(tag, op, logLevel, retValue) { if (!(op)) \
- {OC_LOG((logLevel), tag, (#op " failed!!")); return retValue;} }
+ {OC_LOG((logLevel), tag, #op " failed!!"); return retValue;} }
/**
* Structure to carry credential data to callback.
BuildRequires: pkgconfig(capi-network-wifi)
BuildRequires: pkgconfig(capi-network-bluetooth)
BuildRequires: pkgconfig(capi-appfw-app-common)
+BuildRequires: pkgconfig(glib-2.0)
Requires(postun): /sbin/ldconfig
Requires(post): /sbin/ldconfig