From c896ef09c14ae37a920bc026d3302f0d76a16a6e Mon Sep 17 00:00:00 2001 From: David Antler Date: Wed, 22 Jun 2016 13:09:58 -0700 Subject: [PATCH] Remove references to 'winrt' Change-Id: Iaa0cb9b830eeb040971023296c3b0c677d028d28 Signed-off-by: David Antler Reviewed-on: https://gerrit.iotivity.org/gerrit/8889 Tested-by: jenkins-iotivity Reviewed-by: Dave Thaler --- build_common/SConscript | 3 +-- examples/OICMiddle/SConscript | 2 +- extlibs/tinydtls/SConscript | 2 +- plugins/src/SConscript | 2 +- plugins/zigbee_wrapper/src/SConscript | 2 +- plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript | 2 +- resource/csdk/SConscript | 6 +++--- resource/csdk/connectivity/build/SConscript | 3 +-- resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript | 4 ++-- resource/csdk/connectivity/src/SConscript | 4 ++-- resource/csdk/security/SConscript | 2 +- resource/csdk/stack/samples/linux/secure/SConscript | 2 +- .../csdk/stack/samples/tizen/SimpleClientServer/SConscript | 3 +-- resource/examples/SConscript | 2 +- resource/oc_logger/SConscript | 4 ++-- resource/oc_logger/examples/SConscript | 2 +- resource/provisioning/SConscript | 2 +- resource/provisioning/examples/SConscript | 2 +- resource/src/SConscript | 4 ++-- service/easy-setup/enrollee/SConscript | 2 +- service/easy-setup/mediator/csdk/unittests/SConscript | 4 ++-- service/easy-setup/mediator/richsdk/SConscript | 2 +- service/easy-setup/mediator/richsdk/unittests/SConscript | 2 +- .../sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript | 3 +-- .../enrollee/tizen-sdb/EnrolleeSample/build/SConscript | 3 +-- .../sampleapp/mediator/linux/richsdk_sample/SConscript | 2 +- service/resource-container/SConscript | 4 ++-- service/resource-container/unittests/SConscript | 6 +++--- service/resource-directory/SConscript | 2 +- service/resource-encapsulation/SConscript | 2 +- service/resource-encapsulation/src/common/SConscript | 4 ++-- .../src/resourceBroker/unittest/SConscript | 2 +- .../src/resourceCache/unittests/SConscript | 4 ++-- service/resource-encapsulation/src/serverBuilder/SConscript | 4 ++-- service/resource-encapsulation/unittests/SConscript | 2 +- service/resource-hosting/SConscript | 4 ++-- service/resource-hosting/unittest/SConscript | 4 ++-- service/scene-manager/SConscript | 4 ++-- service/scene-manager/unittests/SConscript | 4 ++-- service/things-manager/SConscript | 4 ++-- service/things-manager/sdk/java/jni/SConscript | 2 +- service/things-manager/unittests/SConscript | 2 +- 42 files changed, 60 insertions(+), 65 deletions(-) diff --git a/build_common/SConscript b/build_common/SConscript index f1044d7d9..d1f1a0728 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -8,7 +8,7 @@ import platform # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino'], + 'windows': ['windows', 'android', 'arduino'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], 'msys_nt' :['msys_nt'], } @@ -20,7 +20,6 @@ os_arch_map = { 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], 'msys_nt':['x86', 'x86_64'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], diff --git a/examples/OICMiddle/SConscript b/examples/OICMiddle/SConscript index e8ed300f6..f9f3c85a0 100644 --- a/examples/OICMiddle/SConscript +++ b/examples/OICMiddle/SConscript @@ -40,7 +40,7 @@ examples_env.AppendUnique(CPPPATH = [ ]) target_os = env.get('TARGET_OS') -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: examples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) # Note: 'pthread' is in libc for android. On other platform, if use diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript index 54cb48e71..0d1bf935c 100644 --- a/extlibs/tinydtls/SConscript +++ b/extlibs/tinydtls/SConscript @@ -81,7 +81,7 @@ libtinydtls = dtls_env.StaticLibrary('tinydtls', tinydtls_src, OBJPREFIX='libtin if not env.get('RELEASE'): samples_env = dtls_env.Clone() - if target_os not in ['arduino', 'windows', 'winrt']: + if target_os not in ['arduino', 'windows']: samples_env.AppendUnique(CPPDEFINES = ['_GNU_SOURCE']) dtlsserver = samples_env.Program('dtls-server', ['tests/dtls-server.c']) diff --git a/plugins/src/SConscript b/plugins/src/SConscript index e7daaa6e9..a58648358 100644 --- a/plugins/src/SConscript +++ b/plugins/src/SConscript @@ -49,7 +49,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(pi_path, 'include'), os.path.join(pi_path, 'include', 'internal') ]) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) if target_os in ['darwin','ios']: diff --git a/plugins/zigbee_wrapper/src/SConscript b/plugins/zigbee_wrapper/src/SConscript index 947d66d6a..0c49c79d7 100644 --- a/plugins/zigbee_wrapper/src/SConscript +++ b/plugins/zigbee_wrapper/src/SConscript @@ -47,7 +47,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(zw_path, 'include'), os.path.join(zw_path, 'zigbee_wrapper', 'include') ]) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) if target_os in ['darwin','ios']: diff --git a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript index be2705941..077d21f60 100644 --- a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript +++ b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript @@ -44,7 +44,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(tw_path, 'include'), os.path.join(tw_path, 'zigbee_wrapper', 'telegesis_wrapper', 'include') ]) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) if target_os in ['darwin','ios']: diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index b2165a341..c791e3f8f 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -58,7 +58,7 @@ liboctbstack_env.PrependUnique(CPPPATH = [ 'security/provisioning/include', ]) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: liboctbstack_env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) liboctbstack_env.AppendUnique(CFLAGS = ['-std=c99']) @@ -67,7 +67,7 @@ if liboctbstack_env.get('ROUTING') == 'GW': elif liboctbstack_env.get('ROUTING') == 'EP': liboctbstack_env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: liboctbstack_env.AppendUnique(CFLAGS = ['-Wall']) liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) @@ -91,7 +91,7 @@ else: if target_os in ['tizen', 'linux']: liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid") -if target_os not in ['android', 'arduino', 'windows', 'winrt', 'msys_nt']: +if target_os not in ['android', 'arduino', 'windows', 'msys_nt']: liboctbstack_env.AppendUnique(LIBS = ['pthread']) if target_os == 'arduino': diff --git a/resource/csdk/connectivity/build/SConscript b/resource/csdk/connectivity/build/SConscript index 4e4627038..4b71fd819 100644 --- a/resource/csdk/connectivity/build/SConscript +++ b/resource/csdk/connectivity/build/SConscript @@ -8,7 +8,7 @@ import platform # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino'], + 'windows': ['windows', 'android', 'arduino'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], } @@ -18,7 +18,6 @@ os_arch_map = { 'tizen': ['x86', 'x86_64', 'arm', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript index 0623dbe57..b47c8359a 100644 --- a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript +++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript @@ -29,11 +29,11 @@ if target_os == 'arduino': env.get('ARDUINO_HOME')+'/libraries/Ethernet/src/utility', ]) -if target_os not in ['arduino', 'windows', 'winrt', 'msys_nt']: +if target_os not in ['arduino', 'windows', 'msys_nt']: libcoap_env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '_DEFAULT_SOURCE']) libcoap_env.AppendUnique(CFLAGS = ['-std=gnu99','-fPIC']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: libcoap_env.AppendUnique(CFLAGS = ['-Wall', '-ffunction-sections', '-fdata-sections', '-fno-exceptions']) diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript index 1cf0fdbe8..d2b52e88c 100644 --- a/resource/csdk/connectivity/src/SConscript +++ b/resource/csdk/connectivity/src/SConscript @@ -28,10 +28,10 @@ env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'), os.path.join(root_dir, 'common', 'inc'), os.path.join(root_dir, 'util', 'inc') ]) -if ca_os not in ['arduino', 'windows', 'winrt']: +if ca_os not in ['arduino', 'windows']: env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) -if ca_os not in ['darwin', 'ios', 'windows', 'winrt']: +if ca_os not in ['darwin', 'ios', 'windows']: env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if ca_os in ['darwin','ios']: diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript index 96ae81cc8..a79ab3ea5 100644 --- a/resource/csdk/security/SConscript +++ b/resource/csdk/security/SConscript @@ -57,7 +57,7 @@ libocsrm_env.PrependUnique(CPPPATH = [ '../security/provisioning/include' ]) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: libocsrm_env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) libocsrm_env.AppendUnique(CFLAGS = ['-std=c99', '-Wall']) diff --git a/resource/csdk/stack/samples/linux/secure/SConscript b/resource/csdk/stack/samples/linux/secure/SConscript index 2f338ea9a..a3c66afec 100644 --- a/resource/csdk/stack/samples/linux/secure/SConscript +++ b/resource/csdk/stack/samples/linux/secure/SConscript @@ -33,7 +33,7 @@ samples_env.PrependUnique(CPPPATH = [ ]) target_os = env.get('TARGET_OS') -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: samples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) # Note: 'pthread' is in libc for android. diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript index e20a12651..f48fcb076 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript @@ -9,7 +9,7 @@ print "Inside the Config SConscript" # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino', 'tizen'], + 'windows': ['windows', 'android', 'arduino', 'tizen'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], } @@ -18,7 +18,6 @@ os_arch_map = { 'linux': ['x86', 'x86_64', 'arm', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], diff --git a/resource/examples/SConscript b/resource/examples/SConscript index 2889c0f21..74cd6dd16 100644 --- a/resource/examples/SConscript +++ b/resource/examples/SConscript @@ -40,7 +40,7 @@ examples_env.AppendUnique(CPPPATH = [ ]) target_os = env.get('TARGET_OS') -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: examples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) # Note: 'pthread' is in libc for android. On other platform, if use diff --git a/resource/oc_logger/SConscript b/resource/oc_logger/SConscript index 5e86cdc68..c65936589 100644 --- a/resource/oc_logger/SConscript +++ b/resource/oc_logger/SConscript @@ -39,11 +39,11 @@ if target_os == 'android': liboc_logger_env.AppendUnique(LIBS = ['gnustl_shared', 'log']) liboc_logger_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,liboc_logger.so']) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: liboc_logger_env.AppendUnique(CFLAGS = ['-Wall', '-std=c99', '-fPIC']) liboc_logger_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x', '-fPIC']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt', 'msys_nt']: +if target_os not in ['darwin', 'ios', 'windows', 'msys_nt']: liboc_logger_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) ###################################################################### diff --git a/resource/oc_logger/examples/SConscript b/resource/oc_logger/examples/SConscript index 7778b5446..42a03cb61 100644 --- a/resource/oc_logger/examples/SConscript +++ b/resource/oc_logger/examples/SConscript @@ -45,7 +45,7 @@ if target_os == 'android': examples_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions']) examples_env.AppendUnique(LIBS = ['gnustl_shared']) -if target_os not in ['arduino', 'windows', 'winrt']: +if target_os not in ['arduino', 'windows']: examples_env.AppendUnique(CFLAGS = Split('-Wall -std=c99 -Werror')) examples_env.AppendUnique(CXXFLAGS = Split('-Wall -std=c++0x')) diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript index 05186c194..a343e7959 100644 --- a/resource/provisioning/SConscript +++ b/resource/provisioning/SConscript @@ -40,7 +40,7 @@ ocprovision_env.AppendUnique(CPPPATH = [ ]) target_os = env.get('TARGET_OS') -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: ocprovision_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-fPIC']) if target_os == 'android': diff --git a/resource/provisioning/examples/SConscript b/resource/provisioning/examples/SConscript index ceb52bf13..ae9d12ff6 100644 --- a/resource/provisioning/examples/SConscript +++ b/resource/provisioning/examples/SConscript @@ -47,7 +47,7 @@ examples_env.AppendUnique(CPPPATH = [ ]) target_os = env.get('TARGET_OS') -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: examples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) # Note: 'pthread' is in libc for android. On other platform, if use diff --git a/resource/src/SConscript b/resource/src/SConscript index a9b8edbb5..146e2eb7b 100644 --- a/resource/src/SConscript +++ b/resource/src/SConscript @@ -53,10 +53,10 @@ target_os = env.get('TARGET_OS') if target_os == 'linux': oclib_env.AppendUnique(LIBS = ['pthread']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: oclib_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-fPIC']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: oclib_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript index f129242d4..8d255aa3c 100644 --- a/service/easy-setup/enrollee/SConscript +++ b/service/easy-setup/enrollee/SConscript @@ -68,7 +68,7 @@ if enrollee_env.get('SECURED') == '1': enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal', enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/oxm']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: enrollee_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) ###################################################################### diff --git a/service/easy-setup/mediator/csdk/unittests/SConscript b/service/easy-setup/mediator/csdk/unittests/SConscript index 734f05172..cad7dd2e5 100644 --- a/service/easy-setup/mediator/csdk/unittests/SConscript +++ b/service/easy-setup/mediator/csdk/unittests/SConscript @@ -69,7 +69,7 @@ mediator_csdk_test_env.AppendUnique( '../../../inc', ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: mediator_csdk_test_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': mediator_csdk_test_env.AppendUnique(CXXFLAGS = ['-pthread']) @@ -100,4 +100,4 @@ if env.get('TEST') == '1': target_os = env.get('TARGET_OS') if target_os == 'linux': from tools.scons.RunTest import * - run_test(mediator_csdk_test_env, '', 'service/easy-setup/mediator/csdk/unittests/mediator_csdk_test') \ No newline at end of file + run_test(mediator_csdk_test_env, '', 'service/easy-setup/mediator/csdk/unittests/mediator_csdk_test') diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript index 1624ff191..8ed21ad20 100644 --- a/service/easy-setup/mediator/richsdk/SConscript +++ b/service/easy-setup/mediator/richsdk/SConscript @@ -59,7 +59,7 @@ target_os = env.get('TARGET_OS') ###################################################################### easy_setup_env.AppendUnique(CPPPATH = ['inc', 'src', '../../inc']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: easy_setup_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) if target_os in ['linux']: diff --git a/service/easy-setup/mediator/richsdk/unittests/SConscript b/service/easy-setup/mediator/richsdk/unittests/SConscript index 099eddb5d..ca7bfad94 100644 --- a/service/easy-setup/mediator/richsdk/unittests/SConscript +++ b/service/easy-setup/mediator/richsdk/unittests/SConscript @@ -69,7 +69,7 @@ mediator_rich_test_env.AppendUnique( '../../../inc', ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: mediator_rich_test_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': mediator_rich_test_env.AppendUnique(CXXFLAGS = ['-pthread']) diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript index 0cd828854..cfb169534 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript @@ -29,7 +29,7 @@ print "Inside the Config SConscript" # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino', 'tizen'], + 'windows': ['windows', 'android', 'arduino', 'tizen'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], } @@ -38,7 +38,6 @@ os_arch_map = { 'linux': ['x86', 'x86_64', 'arm', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript index 70826627f..e9333a73c 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript @@ -8,7 +8,7 @@ import platform # Map of host os and allowed target os (host: allowed target os) host_target_map = { 'linux': ['linux', 'android', 'arduino', 'yocto', 'tizen'], - 'windows': ['windows', 'winrt', 'android', 'arduino'], + 'windows': ['windows', 'android', 'arduino'], 'darwin': ['darwin', 'ios', 'android', 'arduino'], } @@ -18,7 +18,6 @@ os_arch_map = { 'tizen': ['x86', 'x86_64', 'arm', 'arm64'], 'android': ['x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'armeabi-v7a-hard', 'arm64-v8a'], 'windows': ['x86', 'amd64', 'arm'], - 'winrt': ['arm'], 'darwin': ['i386', 'x86_64'], 'ios': ['i386', 'x86_64', 'armv7', 'armv7s', 'arm64'], 'arduino': ['avr', 'arm'], diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript index cc6680082..f885fdeee 100644 --- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript +++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript @@ -40,7 +40,7 @@ if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['CPP_MEDIATOR']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: mediator_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) mediator_env.PrependUnique(CPPPATH = [ diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript index 62be9f2b5..770cede05 100644 --- a/service/resource-container/SConscript +++ b/service/resource-container/SConscript @@ -83,12 +83,12 @@ if int(containerJavaSupport): print '' -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: resource_container_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': resource_container_env.AppendUnique(CXXFLAGS = ['-pthread']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: resource_container_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/service/resource-container/unittests/SConscript b/service/resource-container/unittests/SConscript index ecc530645..e79f360ca 100644 --- a/service/resource-container/unittests/SConscript +++ b/service/resource-container/unittests/SConscript @@ -106,7 +106,7 @@ if int(containerJavaSupport): except KeyError: print '' -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: container_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': container_gtest_env.AppendUnique(CXXFLAGS = ['-pthread']) @@ -144,7 +144,7 @@ if int(containerJavaSupport): test_bundle_env = container_gtest_env.Clone() test_bundle_env.AppendUnique(CCFLAGS = ['-fPIC']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: test_bundle_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) TEST_BUNDLE_DIR = 'TestBundle/' @@ -181,4 +181,4 @@ if env.get('TEST') == '1': from tools.scons.RunTest import * run_test(container_gtest_env, '', - 'service/resource-container/unittests/container_test') \ No newline at end of file + 'service/resource-container/unittests/container_test') diff --git a/service/resource-directory/SConscript b/service/resource-directory/SConscript index 710245d1e..b7e47f04f 100755 --- a/service/resource-directory/SConscript +++ b/service/resource-directory/SConscript @@ -39,7 +39,7 @@ rd_env.AppendUnique(CPPPATH = ['src/internal']) rd_env.AppendUnique(CPPPATH = ['../../resource/csdk/stack/include']) rd_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: rd_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra']) if target_os == 'linux': diff --git a/service/resource-encapsulation/SConscript b/service/resource-encapsulation/SConscript index f02d7d323..30d1ad7c2 100644 --- a/service/resource-encapsulation/SConscript +++ b/service/resource-encapsulation/SConscript @@ -61,7 +61,7 @@ resourceClient_env.AppendUnique(CPPPATH = [ resourceClient_env.PrependUnique(LIBS = ['oc', 'rcs_common', 'octbstack','oc_logger']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: resourceClient_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x']) if target_os == 'linux': resourceClient_env.AppendUnique(LIBS = ['pthread']) diff --git a/service/resource-encapsulation/src/common/SConscript b/service/resource-encapsulation/src/common/SConscript index 06efb88ce..4c9cf7410 100644 --- a/service/resource-encapsulation/src/common/SConscript +++ b/service/resource-encapsulation/src/common/SConscript @@ -51,13 +51,13 @@ rcs_common_env.AppendUnique(CPPPATH = [ rcs_common_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: rcs_common_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': rcs_common_env.AppendUnique(CXXFLAGS = ['-pthread']) rcs_common_env.AppendUnique(LIBS = ['pthread']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: rcs_common_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/SConscript b/service/resource-encapsulation/src/resourceBroker/unittest/SConscript index 00012e61d..b6be66fc6 100644 --- a/service/resource-encapsulation/src/resourceBroker/unittest/SConscript +++ b/service/resource-encapsulation/src/resourceBroker/unittest/SConscript @@ -72,7 +72,7 @@ broker_test_env.AppendUnique(LIBS = ['rcs_common']) broker_test_env.AppendUnique(LIBS = [gtest]) broker_test_env.AppendUnique(LIBS = [gtest_main]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: broker_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) if target_os == 'linux': diff --git a/service/resource-encapsulation/src/resourceCache/unittests/SConscript b/service/resource-encapsulation/src/resourceCache/unittests/SConscript index 7a7d992db..50b0f8f75 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/SConscript +++ b/service/resource-encapsulation/src/resourceCache/unittests/SConscript @@ -62,7 +62,7 @@ cache_test_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks- cache_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) cache_test_env.PrependUnique(LIBS = ['rcs_client', 'rcs_common', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', gtest, gtest_main]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: cache_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) if target_os == 'linux': @@ -82,4 +82,4 @@ if env.get('TEST') == '1': from tools.scons.RunTest import * run_test(cache_test_env, 'cache_test.memcheck', - 'service/resource-encapsulation/src/resourceCache/unittests/cache_test') \ No newline at end of file + 'service/resource-encapsulation/src/resourceCache/unittests/cache_test') diff --git a/service/resource-encapsulation/src/serverBuilder/SConscript b/service/resource-encapsulation/src/serverBuilder/SConscript index 563d1d64e..111d91d63 100644 --- a/service/resource-encapsulation/src/serverBuilder/SConscript +++ b/service/resource-encapsulation/src/serverBuilder/SConscript @@ -50,12 +50,12 @@ server_builder_env.AppendUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs', 'inclu server_builder_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: server_builder_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': server_builder_env.AppendUnique(CXXFLAGS = ['-pthread']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: server_builder_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/service/resource-encapsulation/unittests/SConscript b/service/resource-encapsulation/unittests/SConscript index 7af50f7ea..b86b795cf 100644 --- a/service/resource-encapsulation/unittests/SConscript +++ b/service/resource-encapsulation/unittests/SConscript @@ -69,7 +69,7 @@ rcs_test_env.AppendUnique( '../src/common/utils/include', ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: rcs_test_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': rcs_test_env.AppendUnique(CXXFLAGS = ['-pthread']) diff --git a/service/resource-hosting/SConscript b/service/resource-hosting/SConscript index 1b92f1343..fd9d622ab 100644 --- a/service/resource-hosting/SConscript +++ b/service/resource-hosting/SConscript @@ -56,10 +56,10 @@ resourcehosting_env.PrependUnique(LIBS = [ 'libcoap' ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: resourcehosting_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: resourcehosting_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'linux': diff --git a/service/resource-hosting/unittest/SConscript b/service/resource-hosting/unittest/SConscript index 2b15b0a4c..5fa595b17 100644 --- a/service/resource-hosting/unittest/SConscript +++ b/service/resource-hosting/unittest/SConscript @@ -58,7 +58,7 @@ hosting_test_env.AppendUnique(LIBS = [ 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', GTest_Main, GTest]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: hosting_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) if target_os == 'linux': @@ -84,4 +84,4 @@ if env.get('TEST') == '1': target_os = env.get('TARGET_OS') if target_os == 'linux': from tools.scons.RunTest import * - run_test(hosting_test_env, '', 'service/resource-hosting/unittest/hosting_test') \ No newline at end of file + run_test(hosting_test_env, '', 'service/resource-hosting/unittest/hosting_test') diff --git a/service/scene-manager/SConscript b/service/scene-manager/SConscript index d3511040a..c0c4a27fe 100755 --- a/service/scene-manager/SConscript +++ b/service/scene-manager/SConscript @@ -60,10 +60,10 @@ scenemanager_env.PrependUnique(LIBS = [ 'rcs_common' ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: scenemanager_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: scenemanager_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'linux': diff --git a/service/scene-manager/unittests/SConscript b/service/scene-manager/unittests/SConscript index 25d65d811..ea9e48d1b 100755 --- a/service/scene-manager/unittests/SConscript +++ b/service/scene-manager/unittests/SConscript @@ -58,7 +58,7 @@ scene_test_env.AppendUnique(LIBS = [ 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', GTest_Main, GTest]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: scene_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) if target_os == 'linux': @@ -129,4 +129,4 @@ env.AppendTarget('remote_scene_action_test') # from tools.scons.RunTest import * # run_test(scene_test_env, # '', -# 'service/scene-manager/unittest/scene_test') \ No newline at end of file +# 'service/scene-manager/unittest/scene_test') diff --git a/service/things-manager/SConscript b/service/things-manager/SConscript index da66dbf2a..531e0cbd6 100644 --- a/service/things-manager/SConscript +++ b/service/things-manager/SConscript @@ -37,13 +37,13 @@ things_manager_env.AppendUnique(CPPPATH = ['../../extlibs/timer', 'sdk/inc', 'sd things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack']) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: things_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': things_manager_env.AppendUnique(CXXFLAGS = ['-pthread']) things_manager_env.AppendUnique(LIBS = ['pthread']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: things_manager_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/service/things-manager/sdk/java/jni/SConscript b/service/things-manager/sdk/java/jni/SConscript index d6232a0a2..9cb068393 100644 --- a/service/things-manager/sdk/java/jni/SConscript +++ b/service/things-manager/sdk/java/jni/SConscript @@ -27,7 +27,7 @@ tm_jni_env.AppendUnique(CPPPATH = [tm_sdk+'/inc']) tm_jni_env.AppendUnique(CPPPATH = [base_jni]) tm_jni_env.AppendUnique(CPPPATH = ['tm/inc', 'jniutil/inc', extlibs+'/timer/']) -if target_os not in ['darwin', 'ios', 'windows', 'winrt']: +if target_os not in ['darwin', 'ios', 'windows']: tm_jni_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) ###################################################################### diff --git a/service/things-manager/unittests/SConscript b/service/things-manager/unittests/SConscript index 461103aeb..8c49f7e06 100644 --- a/service/things-manager/unittests/SConscript +++ b/service/things-manager/unittests/SConscript @@ -69,7 +69,7 @@ ThingsManager_gtest_env.AppendUnique( '../../../extlibs/timer' ]) -if target_os not in ['windows', 'winrt']: +if target_os not in ['windows']: ThingsManager_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall']) if target_os != 'android': ThingsManager_gtest_env.AppendUnique(CXXFLAGS = ['-pthread']) -- 2.34.1