Port simpleserverHQ and simpleclientHQ to Windows

Change-Id: I481987321f27b52780d6c907886dd1d1276039c8
Signed-off-by: Anisha Aggarwal <anisha.aggarwal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10829
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/resource/examples/SConscript b/resource/examples/SConscript
index ba49690..5dc7ff5 100644 (file)
--- a/resource/examples/SConscript
+++ b/resource/examples/SConscript
@@ -95,12 +95,12 @@ example_names = [
        'simpleserver', 'simpleclient',
        'simpleclientserver',
        'directpairingclient',
-       'devicediscoveryserver', 'devicediscoveryclient'
+       'devicediscoveryserver', 'devicediscoveryclient',
+       'simpleserverHQ', 'simpleclientHQ',
        ]
 
 if target_os not in ['windows', 'msys_nt']:
        example_names += [
-               'simpleserverHQ', 'simpleclientHQ',
                'fridgeserver', 'fridgeclient',
                'presenceserver', 'presenceclient',
                'roomserver', 'roomclient',

diff --git a/resource/examples/simpleclientHQ.cpp b/resource/examples/simpleclientHQ.cpp
index b8a571c..be585fc 100644 (file)
--- a/resource/examples/simpleclientHQ.cpp
+++ b/resource/examples/simpleclientHQ.cpp
@@ -23,7 +23,9 @@
 #include <set>
 #include <string>
 #include <cstdlib>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include <mutex>
 #include <condition_variable>
 #include "OCPlatform.h"
@@ -220,7 +222,7 @@ void postLightRepresentation(std::shared_ptr<OCResource> resource)
 // callback handler on PUT request
 void onPut(const HeaderOptions& /*headerOptions*/, const OCRepresentation& rep, const int eCode)
 {
-    if(eCode == SUCCESS_RESPONSE)
+    if(eCode == SUCCESS_RESPONSE || eCode == OC_STACK_RESOURCE_CHANGED)
     {
         std::cout << "PUT request was successful" << std::endl;
 

diff --git a/resource/examples/simpleserverHQ.cpp b/resource/examples/simpleserverHQ.cpp
index 607b45f..3adef4e 100644 (file)
--- a/resource/examples/simpleserverHQ.cpp
+++ b/resource/examples/simpleserverHQ.cpp
@@ -25,7 +25,9 @@
 
 #include <functional>
 
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include <mutex>
 #include <condition_variable>
 

diff --git a/run.bat b/run.bat
index 717429f..861d851 100644 (file)
--- a/run.bat
+++ b/run.bat
@@ -68,7 +68,13 @@ if "!CURRENT_ARG!"=="server" (
 ) else if "!CURRENT_ARG!"=="client" (
   cd %BUILD_DIR%\resource\examples
   %DEBUG% simpleclient.exe
-) else if "!CURRENT_ARG!"=="mediaclient" (
+) else if "!CURRENT_ARG!"=="serverhq" (
+  cd %BUILD_DIR%\resource\examples
+  %DEBUG% simpleserverHQ.exe
+) else if "!CURRENT_ARG!"=="clienthq" (
+  cd %BUILD_DIR%\resource\examples
+  %DEBUG% simpleclientHQ.exe
+)else if "!CURRENT_ARG!"=="mediaclient" (
   cd %BUILD_DIR%\resource\examples
   %DEBUG% mediaclient.exe
 ) else if "!CURRENT_ARG!"=="mediaserver" (