diff options
author | Dan Mihai <Daniel.Mihai@microsoft.com> | 2017-05-16 13:00:32 -0700 |
---|---|---|
committer | Dan Mihai <Daniel.Mihai@microsoft.com> | 2017-05-19 22:49:54 +0000 |
commit | db2361bad1e029db5b702691dc267b374963ec41 (patch) | |
tree | a148474ce9f3968bfe9d39e1c189d4a169feaa58 /resource | |
parent | 285a09fd00761255ec4955d6a007544474fa1839 (diff) | |
download | iotivity-db2361bad1e029db5b702691dc267b374963ec41.tar.gz iotivity-db2361bad1e029db5b702691dc267b374963ec41.tar.bz2 iotivity-db2361bad1e029db5b702691dc267b374963ec41.zip |
IOT-2275 Windows: Disable the Cloud APIs
These APIs are not working on Windows.
Change-Id: I6c4869da290808fdb41d2d834a5dd1cbd0766744
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19967
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Diffstat (limited to 'resource')
-rw-r--r-- | resource/csdk/security/provisioning/sample/SConscript | 32 | ||||
-rw-r--r-- | resource/csdk/stack/SConscript | 9 | ||||
-rw-r--r-- | resource/csdk/stack/octbstack_product_with_tcp.def | 36 |
3 files changed, 19 insertions, 58 deletions
diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index dce2135a3..836223229 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -92,14 +92,15 @@ if provisioning_sample_env.get('MULTIPLE_OWNER') == '1': subownerclient = provisioning_sample_env.Program('subownerclient', 'subownerclient.c') sampleserver_preconfpin = provisioning_sample_env.Program('sampleserver_preconfpin', 'sampleserver_preconfpin.cpp') -if provisioning_sample_env.get('WITH_TCP') == True: - cloud_src = [ - 'cloud/cloudAuth.c', - 'cloud/cloudCommon.c', - 'cloud/cloudWrapper.c', - 'cloud/cloudDiscovery.c'] - cloudClient = provisioning_sample_env.Program('cloudClient', cloud_src + ['cloudClient.c']) - cloudServer = provisioning_sample_env.Program('cloudServer', cloud_src + ['cloudServer.c', 'cloud/cloudResource.c']) +if target_os not in ['msys_nt', 'windows']: + if provisioning_sample_env.get('WITH_TCP') == True: + cloud_src = [ + 'cloud/cloudAuth.c', + 'cloud/cloudCommon.c', + 'cloud/cloudWrapper.c', + 'cloud/cloudDiscovery.c'] + cloudClient = provisioning_sample_env.Program('cloudClient', cloud_src + ['cloudClient.c']) + cloudServer = provisioning_sample_env.Program('cloudServer', cloud_src + ['cloudServer.c', 'cloud/cloudResource.c']) src_dir = provisioning_sample_env.get('SRC_DIR') sec_provisioning_src_dir = src_dir + '/resource/csdk/security/provisioning/sample/' @@ -125,13 +126,14 @@ if provisioning_sample_env.get('MULTIPLE_OWNER') == '1': preconfserverdat = provisioning_sample_env.Install(sec_provisioning_build_dir, sec_provisioning_src_dir + 'oic_svr_db_server_preconfpin.dat') -if provisioning_sample_env.get('WITH_TCP') == True: - clouddat = provisioning_sample_env.Install(sec_provisioning_build_dir, - sec_provisioning_src_dir + 'cloud.dat') - rootcert = provisioning_sample_env.Install(sec_provisioning_build_dir, - sec_provisioning_src_dir + 'rootca.crt') - Alias("cloud", [clouddat, rootcert, cloudClient, cloudServer]) - provisioning_sample_env.AppendTarget("cloud") +if target_os not in ['msys_nt', 'windows']: + if provisioning_sample_env.get('WITH_TCP') == True: + clouddat = provisioning_sample_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'cloud.dat') + rootcert = provisioning_sample_env.Install(sec_provisioning_build_dir, + sec_provisioning_src_dir + 'rootca.crt') + Alias("cloud", [clouddat, rootcert, cloudClient, cloudServer]) + provisioning_sample_env.AppendTarget("cloud") if provisioning_sample_env.get('MULTIPLE_OWNER') == '1': Alias("samples", [ diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript index 2e6011d65..b09aef0fb 100644 --- a/resource/csdk/stack/SConscript +++ b/resource/csdk/stack/SConscript @@ -154,15 +154,10 @@ else: liboctbstack_env.Textfile(target = 'octbstack_temp3.def', source = [File('octbstack_temp2.def'), File('octbstack_product_secured.def')]) - if with_tcp == True: - liboctbstack_env.Textfile(target = 'octbstack_temp4.def', source = [File('octbstack_temp3.def'), File('octbstack_product_with_tcp.def')]) - else: - liboctbstack_env.Textfile(target = 'octbstack_temp4.def', source = [File('octbstack_temp3.def')]) - if env.get('MULTIPLE_OWNER') == '1': - liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp4.def'), File('octbstack_product_secured_mot.def')]) + liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp3.def'), File('octbstack_product_secured_mot.def')]) else: - liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp4.def')]) + liboctbstack_env.Textfile(target = 'octbstack.def', source = [File('octbstack_temp3.def')]) if target_os in ['tizen', 'linux']: liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid") diff --git a/resource/csdk/stack/octbstack_product_with_tcp.def b/resource/csdk/stack/octbstack_product_with_tcp.def deleted file mode 100644 index 5964919c4..000000000 --- a/resource/csdk/stack/octbstack_product_with_tcp.def +++ /dev/null @@ -1,36 +0,0 @@ -; Cloud APIs used when WITH_TCP is enabled. - -clearStringArray -DEFAULT_PREFIX -DEFAULT_QUERY -DeleteCrl -FreeRsrc -getDeviceId -OCCloudAclCancelInvitation -OCCloudAclCreateGroup -OCCloudAclDeleteDeviceFromGroup -OCCloudAclDeleteGroup -OCCloudAclDeleteInvitation -OCCloudAclFindMyGroup -OCCloudGetAclIdByDevice -OCCloudAclGetInvitation -OCCloudAclGroupGetInfo -OCCloudAclIdCreate -OCCloudAclIdDelete -OCCloudAclAcesDelete -OCCloudAclIndividualAceDelete -OCCloudAclIndividualGetInfo -OCCloudAclIndividualAceUpdate -OCCloudAclIndividualAclUpdate -OCCloudAclInviteUser -OCCloudAclJoinToInvitedGroup -OCCloudAclObserveGroup -OCCloudAclPolicyCheck -OCCloudAclShareDeviceIntoGroup -OCCloudCertificateIssueRequest -OCCloudGetCRL -OCCloudPostCRL -OCSaveTrustCertChain -OIC_RSRC_DOXM_URI -OIC_RSRC_PSTAT_URI -setCoapPrefix |