Windows: Remove octbstack_static.lib

octbstack_static.lib was identical to octbstack_internal.lib.

IoTivity sample apps and apps outside IoTivity are using
octbstack.lib, so they don't need octbstack_internal.lib.

Change-Id: I6ffef4ba6ee1ea90e852c707a6c58a7f8e93c1f9
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19163
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript
index 6420519..427ce07 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/SConscript
+++ b/resource/csdk/security/provisioning/unittest/SConscript
@@ -79,7 +79,7 @@ if sptest_env.get('MULTIPLE_OWNER') == '1':
        sptest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
 
 if target_os in ['msys_nt', 'windows']:
-    sptest_env.AppendUnique(LIBS = ['octbstack_static', 'sqlite3'])
+    sptest_env.AppendUnique(LIBS = ['octbstack_internal', 'sqlite3'])
 else:
     sptest_env.AppendUnique(LIBS = ['octbstack'])
     if target_os in ['linux', 'tizen']:

diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript
index 756ec96..4161b72 100644 (file)
--- a/resource/csdk/security/tool/SConscript
+++ b/resource/csdk/security/tool/SConscript
@@ -61,8 +61,8 @@ else:
         tools_env.AppendUnique(LIBS = ['octbstack'])
     else:
         # This IoTivity-internal app calls non-Public APIs, so link with LIBS intended
-        # for IoTivity-internal tests (such as octbstack_static).
-        tools_env.AppendUnique(LIBS = ['octbstack_static'])
+        # for IoTivity-internal tests (such as octbstack_internal).
+        tools_env.AppendUnique(LIBS = ['octbstack_internal'])
         if target_os in ['windows']:
             tools_env.AppendUnique(LIBS = ['sqlite3'])
     tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index fd3b074..3d92905 100644 (file)
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -73,7 +73,7 @@ if srmtest_env.get('MULTIPLE_OWNER') == '1':
        srmtest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
 
 if target_os == 'windows':
-       srmtest_env.AppendUnique(LIBS = ['octbstack_static', 'sqlite3'])
+       srmtest_env.AppendUnique(LIBS = ['octbstack_internal', 'sqlite3'])
 else:
        # TODO: Implement feature check.
        srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R'])

diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript
index d34c8b2..d46e42f 100644 (file)
--- a/resource/csdk/stack/SConscript
+++ b/resource/csdk/stack/SConscript
@@ -234,13 +234,9 @@ else:
 
 octbstack_libs = Flatten(test_liboctbstack)
 
-if target_os in ['windows', 'msys_nt']:
-    # Avoid a name conflict with the octbstack.lib target of the SharedLibrary.
-    static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack_static', liboctbstack_src)
-else:
+if target_os not in ['windows', 'msys_nt']:
     static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src)
-
-octbstack_libs += Flatten(static_liboctbstack)
+    octbstack_libs += Flatten(static_liboctbstack)
 
 if target_os not in ['arduino','darwin','ios'] :
     shared_liboctbstack = liboctbstack_env.SharedLibrary('octbstack', liboctbstack_src)