[certi-cvs] certi libRTI/RTIambassador.cc libRTI/RTI1516amb...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/10/27 07:59:52

Modified files:
        libRTI         : RTIambassador.cc RTI1516ambassadorFactory.cpp 
        .              : CMakeLists.txt 

Log message:
        Make RTIA console display an option (default is DO not show RTIA 
console)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.127&r2=3.128
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516ambassadorFactory.cpp?cvsroot=certi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.108&r2=1.109

Patches:
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.127
retrieving revision 3.128
diff -u -b -r3.127 -r3.128
--- libRTI/RTIambassador.cc     3 Oct 2011 06:54:17 -0000       3.127
+++ libRTI/RTIambassador.cc     27 Oct 2011 07:59:51 -0000      3.128
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.127 2011/10/03 06:54:17 erk Exp $
+// $Id: RTIambassador.cc,v 3.128 2011/10/27 07:59:51 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include "RTI.hh"
@@ -208,12 +208,15 @@
        ZeroMemory( &si, sizeof(si) );
        si.cb = sizeof(si);
        ZeroMemory( &pi, sizeof(pi) );
+
+#ifndef RTIA_CONSOLE_SHOW
        /*
         * Avoid displaying console window
         * when running RTIA.
         */
        si.dwFlags = STARTF_USESHOWWINDOW;
        si.wShowWindow = SW_HIDE;
+#endif
 
 #if !defined(RTIA_USE_TCP)
        SOCKET newPipeFd;
@@ -360,6 +363,8 @@
        privateRefs->executeService(&req, &rep);
        // after the response is received, the privateRefs->socketUn must not 
be used
 
+       //TerminateProcess(privateRefs->handle_RTIA, 0);
+
        delete privateRefs;
 }
 
@@ -2853,4 +2858,4 @@
        privateRefs->executeService(&req, &rep);
                }
 
-// $Id: RTIambassador.cc,v 3.127 2011/10/03 06:54:17 erk Exp $
+// $Id: RTIambassador.cc,v 3.128 2011/10/27 07:59:51 erk Exp $

Index: libRTI/RTI1516ambassadorFactory.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516ambassadorFactory.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libRTI/RTI1516ambassadorFactory.cpp 2 Dec 2010 07:31:19 -0000       1.6
+++ libRTI/RTI1516ambassadorFactory.cpp 27 Oct 2011 07:59:51 -0000      1.7
@@ -82,12 +82,15 @@
        ZeroMemory( &si, sizeof(si) );
        si.cb = sizeof(si);
        ZeroMemory( &pi, sizeof(pi) );
+
+#ifndef RTIA_CONSOLE_SHOW
        /*
         * Avoid displaying console window
         * when running RTIA.
         */
        si.dwFlags = STARTF_USESHOWWINDOW;
        si.wShowWindow = SW_HIDE;
+#endif
 
 #if !defined(RTIA_USE_TCP)
        SOCKET newPipeFd;

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- CMakeLists.txt      18 Oct 2011 20:42:24 -0000      1.108
+++ CMakeLists.txt      27 Oct 2011 07:59:51 -0000      1.109
@@ -85,6 +85,12 @@
     ADD_DEFINITIONS(-DRTIA_USE_TCP)
 ENDIF(RTIA_USE_TCP)
 
+OPTION(RTIA_CONSOLE_SHOW
+       "Windows specific: if set to ON the RTIA console will be shown" OFF)
+IF(RTIA_CONSOLE_SHOW)
+    ADD_DEFINITIONS(-DRTIA_CONSOLE_SHOW)
+ENDIF(RTIA_CONSOLE_SHOW)
+
 # The new NULL Prime message protocol
 OPTION(CERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL 
          "NULL PRIME MESSAGE protocol is an enhanced version of the CMB NULL 
MESSAGE protocol (experimental)" OFF)