X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fprovisioning%2Fsample%2FSConscript;h=cfde9797fd6c56b979ede5d7e1b5d73f57509cec;hb=03ae7cd73e2e10a8de75da40a0e476cc955b46b2;hp=a301f908bb61684875133a2a2ce100b4b9d1ab94;hpb=ab62c8e15659e1b94259ac95b98e042383fc1cf9;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index a301f90..cfde979 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -49,14 +49,15 @@ provisioning_env.AppendUnique(CPPPATH = [ '../include/oxm', '../include/cloud', '../../include', - '../../../../../extlibs/tinydtls', '../../../../../extlibs/cjson', '../../../../../extlibs/base64', + '../../../../../extlibs/mbedtls/mbedtls/include', '../../../connectivity/inc', '../../../connectivity/inc/pkix', '../../../connectivity/common/inc', '../../../connectivity/api', - 'cloud' + 'cloud', + 'hw_emul' ]) target_os = env.get('TARGET_OS') @@ -64,7 +65,7 @@ provisioning_env.AppendUnique(RPATH = [env.get('BUILD_DIR')]) provisioning_env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__']) if target_os not in ['windows']: - provisioning_env.AppendUnique(CFLAGS = ['-std=c99']) + provisioning_env.AppendUnique(CFLAGS = ['-std=gnu99']) provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread', '-fpermissive']) provisioning_env.AppendUnique(LIBS = ['pthread']) @@ -87,25 +88,32 @@ if env.get('SECURED') == '1': if env.get('MULTIPLE_OWNER') == '1': - provisioning_env.AppendUnique(CPPDEFINES = ['_ENABLE_MULTIPLE_OWNER_']) + provisioning_env.AppendUnique(CPPDEFINES = ['MULTIPLE_OWNER']) provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG']) if target_os == 'tizen': provisioning_env.AppendUnique(CPPDEFINES = ['__TIZEN__']) +if target_os in ['linux', 'tizen']: provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3') ###################################################################### # Source files and Targets ###################################################################### -provisioningclient = provisioning_env.Program('provisioningclient', 'provisioningclient.c') +hwemul_src = [ + 'hw_emul/hw_interface.c', + 'hw_emul/ss_emul.c'] +provisioningclient = provisioning_env.Program('provisioningclient', hwemul_src + ['provisioningclient.c']) sampleserver_justworks = provisioning_env.Program('sampleserver_justworks', 'sampleserver_justworks.cpp') +sampleserver_justworks_protectedDB = provisioning_env.Program('sampleserver_justworks_protectedDB', 'sampleserver_justworks_protectedDB.cpp') sampleserver_randompin = provisioning_env.Program('sampleserver_randompin', 'sampleserver_randompin.cpp') +sampleserver_mfg = provisioning_env.Program('sampleserver_mfg', hwemul_src + ['sampleserver_mfg.cpp']) +sampleserver_mvjustworks = provisioning_env.Program('sampleserver_mvjustworks', 'sampleserver_mvjustworks.cpp') if provisioning_env.get('MULTIPLE_OWNER') == '1': subownerclient = provisioning_env.Program('subownerclient', 'subownerclient.c') - sampleclient_ownedbysubowner = provisioning_env.Program('sampleclient_ownedbysubowner', 'sampleclient_owned_by_subowner.cpp') + sampleserver_preconfpin = provisioning_env.Program('sampleserver_preconfpin', 'sampleserver_preconfpin.cpp') if provisioning_env.get('WITH_TCP') == True: cloud_src = [ @@ -113,8 +121,8 @@ if provisioning_env.get('WITH_TCP') == True: 'cloud/cloudCommon.c', 'cloud/cloudWrapper.c', 'cloud/cloudDiscovery.c'] - cloudClient = provisioning_env.Program('cloudClient', cloud_src + ['cloudClient.c']) - cloudServer = provisioning_env.Program('cloudServer', cloud_src + ['cloudServer.c', 'cloud/cloudResource.c']) + cloudClient = provisioning_env.Program('cloudClient', hwemul_src + cloud_src + ['cloudClient.c']) + cloudServer = provisioning_env.Program('cloudServer', hwemul_src + cloud_src + ['cloudServer.c', 'cloud/cloudResource.c']) src_dir = provisioning_env.get('SRC_DIR') sec_provisioning_src_dir = src_dir + '/resource/csdk/security/provisioning/sample/' @@ -125,16 +133,25 @@ clientdat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir + 'oic_svr_db_client.dat') justworksdat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir + 'oic_svr_db_server_justworks.dat') +justworksDefaultdat = provisioning_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'oic_svr_db_server_justworks_default.dat') +justworksProtectedDBdat_plain = provisioning_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'oic_svr_db_server_justworks_protectedDB_plain.dat') + randompindat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir+ 'oic_svr_db_server_randompin.dat') +mfgdat = provisioning_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir+ 'oic_svr_db_server_mfg.dat') randompin_with_emptyuuid_dat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir+ 'oic_svr_db_randompin_with_empty_deviceid.dat') +mvjustworksdat = provisioning_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'oic_svr_db_server_mvjustworks.dat') if provisioning_env.get('MULTIPLE_OWNER') == '1': subownerclientdat = provisioning_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir + 'oic_svr_db_subowner_client.dat') - clientownedbysubownerdat = provisioning_env.Install(sec_provisioning_build_dir, - sec_provisioning_src_dir + 'oic_svr_db_client_owned_by_subowner.dat') + preconfserverdat = provisioning_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'oic_svr_db_server_preconfpin.dat') if provisioning_env.get('WITH_TCP') == True: clouddat = provisioning_env.Install(sec_provisioning_build_dir, @@ -146,17 +163,20 @@ if provisioning_env.get('WITH_TCP') == True: if provisioning_env.get('MULTIPLE_OWNER') == '1': Alias("samples", [ - provisioningclient, subownerclient, sampleclient_ownedbysubowner, - sampleserver_justworks, sampleserver_randompin, - clientdat, subownerclientdat, clientownedbysubownerdat, - justworksdat, randompindat, randompin_with_emptyuuid_dat + provisioningclient, subownerclient, + sampleserver_justworks, sampleserver_randompin, sampleserver_mfg, + sampleserver_preconfpin,sampleserver_justworks_protectedDB, + clientdat, subownerclientdat, preconfserverdat, + justworksdat, randompindat, mfgdat, randompin_with_emptyuuid_dat, + mvjustworksdat, justworksDefaultdat, justworksProtectedDBdat_plain ]) else: Alias("samples", [ provisioningclient, - sampleserver_justworks, sampleserver_randompin, - clientdat, - justworksdat, randompindat, randompin_with_emptyuuid_dat + sampleserver_justworks, sampleserver_randompin, sampleserver_mfg, + clientdat,sampleserver_justworks_protectedDB, + justworksdat, randompindat, mfgdat, randompin_with_emptyuuid_dat, + mvjustworksdat, justworksDefaultdat, justworksProtectedDBdat_plain ]) provisioning_env.AppendTarget('samples')