Remove references to 'winrt'

Change-Id: Iaa0cb9b830eeb040971023296c3b0c677d028d28
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

diff --git a/build_common/SConscript b/build_common/SConscript
index f1044d7d9fa2eb17f1dafa34a7acd51efb0c6c29..d1f1a07285d5fc653590ab9b43f52090dba2877e 100644 (file)
--- 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 e8ed300f6f52e3636e2daa298ea0a3f799621180..f9f3c85a05e06215336f92cf9c468008a05733f9 100644 (file)
--- 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 54cb48e7189b089f5750ad9d2a5f7a125de0d426..0d1bf935cbc319c40cde82253202e8aed5d0ac88 100644 (file)
--- 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 e7daaa6e9780cc452d3153904d2d66b453405443..a5864835880f15a434aa7c2c2443e905c6762d55 100644 (file)
--- 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 947d66d6a5930a6b52e70e4a53625f2996e07b25..0c49c79d709b2974eb7e26ffd05143c4a5b0c719 100644 (file)
--- 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 be270594148861c9fa8b2948f8df114069544804..077d21f60a1dde888f519e4e571d865da0b39f31 100644 (file)
--- 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 b2165a34152c78b08b06774fa73585fce10cd087..c791e3f8face98def6303df4762e87cfdd66c357 100644 (file)
--- 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 4e46270385be6b7c6d00a4d801b4ddee2bc8f802..4b71fd819afe8b4dbb21dd4075bdb5e936069bcc 100644 (file)
--- 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 0623dbe57fc15a45ec21cfe7444fab9d22d94a14..b47c8359ab367302e14fae4ed056aea2c3a5134b 100644 (file)
--- 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 1cf0fdbe89899040550746c8909e526889e6eb3d..d2b52e88c4b5666b931b64f25b2595de91deed9e 100644 (file)
--- 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 96ae81cc8134cd0fc2793d4d564ce1354feb9443..a79ab3ea5f37f81b5452c7b37024caeed0220727 100644 (file)
--- 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 2f338ea9acb38f59e35139ba2b76ce5e56619314..a3c66afecc9a63acc5f1f6d8cc4f6147625524ef 100644 (file)
--- 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 e20a12651a3ebce014a6b670937abc175f3d9119..f48fcb076da44d19378895579c8fabfb95918319 100644 (file)
--- 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 2889c0f21279c236b4105d079e63df940e835623..74cd6dd16e57cf19f236700262f6dc9fd28d88cf 100644 (file)
--- 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 5e86cdc68466e181a5a7e50bc64a89865e35ae58..c6593658962348f9877fa6ea60085ba544b92ef6 100644 (file)
--- 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 7778b54466ecb236d2b3fd5bbccd21c73b6ac788..42a03cb615cc2fd43f3decdc6d2c70861cd395cc 100644 (file)
--- 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 05186c194e3137ef6d5599300cb399c9ce5e75d3..a343e79598fe25c960e2605b2ff7290f58a0a819 100644 (file)
--- 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 ceb52bf138b7fc876c96a99fa7eac1b99f07d3ac..ae9d12ff682629de73d48debf9b3d85f96450874 100644 (file)
--- 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 a9b8edbb57ec5458f2c3cd381d9f9f8100eb61e6..146e2eb7b529e22b07bb6da9c88c1a08aabd119e 100644 (file)
--- 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 f129242d4d39b8201402230d0ec7775da375961b..8d255aa3cee9493ced5650a7a0306266b02e7ee6 100644 (file)
--- 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 734f051725f129c0d378e2a4b647dd3ca734aa75..cad7dd2e55ae14ed72562ea912aac2b3d0468229 100644 (file)
--- 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 1624ff1912345e8372468cab9edb6a6969ed67d9..8ed21ad20557fae4fb056251a0c8c927f1b4a1e9 100644 (file)
--- 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 099eddb5d72b68300a6e1c85a9c46702edaf2577..ca7bfad94fd724358811d5f9a6e3282bf6b42c6e 100644 (file)
--- 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 0cd828854485c289797281a200be3c46472aab16..cfb169534d0ff6700dc0a9596996a250ee7b120c 100644 (file)
--- 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 70826627f28d48cbf029d51409c0ca32bb3339d6..e9333a73cfdf01542867980079639c82dbd9d355 100644 (file)
--- 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 cc6680082bff2d36b8fe79594b6161b933e8c785..f885fdeee7f41adf4706d9f909ada50c2382dbaa 100644 (file)
--- 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 62be9f2b508ac178d787374cfff999043199c420..770cede0560568d99a14918c8c0a20578ab3f254 100644 (file)
--- 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 ecc530645d9155e9c19b75aaab4842565bf712f2..e79f360cadb79ad1c82b56563f9319a9a8387050 100644 (file)
--- 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 710245d1eb639c47ce41c4c8a003e7d98a11c8c0..b7e47f04fbe632775eba7efa24afcf3a36593b75 100755 (executable)
--- 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 f02d7d323d46c62a099116f8fb1921d0116525f2..30d1ad7c2679c407755296e7821ca0cbe6116565 100644 (file)
--- 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 06efb88ce4fd9a7ea6496b7c0b1c2bbdf3bea3ea..4c9cf74108d7ced87271083ccef7f849a2dfa796 100644 (file)
--- 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 00012e61d5fdc2ae1758824cda374276321446c8..b6be66fc6a5a4d300e5b39c35cd388ead13b2deb 100644 (file)
--- 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 7a7d992db24dc759864b63373105140d809e46db..50b0f8f75df81997e8ee6e7bd4b2882b78ef1c54 100644 (file)
--- 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 563d1d64ef5e2d513093037aa81a06582345cd72..111d91d63dd11130c5af3308b3c1852a082baf24 100644 (file)
--- 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 7af50f7ea3355d8965132292550e87998c029f80..b86b795cf10f629286b0e109cde8764cb22f4f85 100644 (file)
--- 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 1b92f13436f5cee5ebd369acc369008da86698d4..fd9d622ab16994e172d266c0f0141c4065a19749 100644 (file)
--- 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 2b15b0a4cc0ac5d4a5cca8c096c0eb598fc5bf88..5fa595b17c5d9eb7fe461a4446c8ada972f71465 100644 (file)
--- 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 d3511040a85253adf1454cad5338e3538f8bb623..c0c4a27fed0b12530cc88f8f1e66cb80e4788808 100755 (executable)
--- 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 25d65d8118f5a05de209ae64089fe69656ec4098..ea9e48d1b1258db2a2bd35bd8abc07b4cbaee801 100755 (executable)
--- 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 da66dbf2a95a380801ac03ae8f92a724f0d8108d..531e0cbd67d2651bc85197483096389826006130 100644 (file)
--- 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 d6232a0a2d34d2e6d23d305bbdd454eef2d02d80..9cb068393923f08f0de8ac5c5e3dae3cc6327938 100644 (file)
--- 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 461103aeb68941eac4ff9109131a945f7cecee39..8c49f7e0679b7016fcda22f45572ae7e3da95708 100644 (file)
--- 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'])