EasySetup Script files are changed to make static library.

Also mistyping is fixed in easysetup sample app.

Change-Id: I339a34a9d8eef0c69af7d9a3ba2388db073935c5
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index 50a2e6f9fd061de7cdf0dda64f39f1033f6d04d6..5f08051446a4469143a67ccc714a2700b2824e4c 100644 (file)
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -104,8 +104,9 @@ es_enrollee_src = None
 if target_os in ['linux', 'tizen']:
        es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c']
        enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK', es_enrollee_common_src)
-       enrollee_env.InstallTarget(enrollee_sdk_shared, 'libESEnrollee')
-       enrollee_env.UserInstallTargetLib(enrollee_sdk_shared, 'libESEnrollee')
+       enrollee_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', es_enrollee_common_src)
+       enrollee_env.InstallTarget([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
+       enrollee_env.UserInstallTargetLib([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
 
 if target_os == 'arduino':
        es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c']

diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript
index 66787469e666db82fb8e7831275a2869f556ae8c..0805bfe5e0f70c2b5cca5fcb3c83494101e14217 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -139,7 +139,8 @@ if target_os in ['android','linux']:
        env.AppendUnique(es_src = es_common_src)
 
        es_sdk_shared = easy_setup_env.SharedLibrary('ESMediatorRich', env.get('es_src'))
-       easy_setup_env.InstallTarget(es_sdk_shared, 'libESMediatorRich')
+       es_sdk_static = easy_setup_env.StaticLibrary('ESMediatorRich', env.get('es_src'))
+       easy_setup_env.InstallTarget([es_sdk_shared, es_sdk_static], 'libESMediatorRich')
        easy_setup_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libESMediatorRich.so'])
 
 print "Files path is %s" % env.get('es_src')

diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
index ea4dbb257718800f315a9413c71e909226f2000c..b3d52512d63c22e7e7d153c5be8f9cf6c824e90e 100755 (executable)
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
@@ -365,7 +365,7 @@ int main()
 
     gMainloop = g_main_loop_new (NULL, FALSE);
     if(gMainloop == NULL) {
-        cout << "Create Min Loop Error" << endl;
+        cout << "Create Main Loop Error" << endl;
         return 0;
     }