ChangeLogTag:Fri Mar 2 20:48:45 UTC 2007 Steve Huston <shuston@riverace.com>

16 files changed, 84 insertions, 50 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0191af64811..c2a9f2414a8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Fri Mar  2 20:48:45 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * TAO-INSTALL.html: Added a description of cross-compiling on
+          Windows with Visual Studio.
+
+        * orbsvcs/ImplRepo_Service/Activator_NT_Service.{h cpp}:
+        * orbsvcs/ImplRepo_Service/Locator_NT_Service.{h cpp}:
+        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+        * orbsvcs/Naming_Service/NT_Naming_Service.{h cpp}:
+        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+        * orbsvcs/Notify_Service/NT_Notify_Service.{h cpp}: Don't try this
+          on ACE_WIN32 platforms where ACE_LACKS_WIN32_SERVICES.
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp (open_config):
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: Don't try to build
+          the Windows registry-using code where ACE_LACKS_WIN32_REGISTRY.
+
 Fri Mar  2 21:00:23 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
 
         * tests/DSI_AMI_Gateway/test_dsi.cpp:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index eb9425bc1c7..929e5235d91 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -219,21 +219,42 @@ href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p>
     <H4>Modifying the default location for the IDL compiler</H4>
 
     <P>By default TAO assumes that the IDL compiler is located in:
-      <CODE>$TAO_ROOT/bin/tao_idl</CODE> and that the GPERF tool
+      <CODE>$ACE_ROOT/bin/tao_idl</CODE> and that the GPERF tool
       is located in <CODE>$ACE_ROOT/bin/gperf</CODE>, this is fine for
       hosted builds, but not for cross-compilation.
       Unfortunately there is no good default for cross-compilation
       builds because different sites choose a different location for
       their tools.
     </P>
-    <P>You can override the default values by adding several new lines in your
-      platform_macros.GNU file assuming $(HOST_ROOT) is set to the location
-      of your host build where you have build gperf and tao_idl, as follows:
+    <P>
+      The location of the IDL compiler is set when the makefiles (whether
+      GNU, Visual Studio projects, or any other type) are generated using
+      MPC. If you are using GNU make for the target build, you can follow the
+      procedure below with no further steps. If, however, you are using
+      Visual Studio for the target build, you must generate the Visual Studio
+      projects with a specification of where the hosted IDL compiler is. One
+      common way to do this is to use the MPC <code>-value_template</code>
+      option to specify the path to the IDL compiler, either using a
+      fully specified path or an environment variable. For example, to specify
+      the location with the <code>HOST_TAO_IDL</code> environment variable,
+      generate your projects with the MPC command line option
+      <code>-value_template tao_idl=$(HOST_TAO_IDL)</code>. Then before
+      running Visual Studio to cross-build for the target, be sure that the
+      <code>HOST_TAO_IDL</code> environment variable is set to the location
+      of the host-built IDL compiler. Note that if the host-built IDL compiler
+      requires a PATH setting different from what's set in the Visual Studio
+      environment, you must set the PATH environment variable and specify the
+      <code>/USEENV</code> option to devenv.
+    </P>
+    <P>If your builds are using GNU make, you can override the default values
+      by adding several lines to your <code>platform_macros.GNU</code> file.
+      Assuming $(HOST_ROOT) is set to the location of your host build where
+      you previously built gperf and tao_idl, you can change the target
+      build by adding the following lines:
 <PRE>
-$ echo 'TAO_IDL := $(HOST_ROOT)/bin/tao_idl' \
-$ echo 'TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf' \
-$ echo 'TAO_IDL_DEP := $(HOST_ROOT)/bin/tao_idl$(EXEEXT)' \
-     >> platform_macros.GNU
+TAO_IDL := $(HOST_ROOT)/bin/tao_idl
+TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
+TAO_IDL_DEP := $(HOST_ROOT)/bin/tao_idl$(EXEEXT)
 </PRE>
 
     <P>Obviously you must first build the tools for the host platform,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 81cf67856de..12b98e9e7bf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -13,7 +13,7 @@
 
 #include "Activator_NT_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ImR_Activator_i.h"
 #include "Activator_Options.h"
@@ -107,4 +107,4 @@ Activator_NT_Service::svc (void)
   return -1;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index bde40cf1cd9..6d8294cf5a6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -17,7 +17,7 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -58,8 +58,6 @@ private:
 
 typedef ACE_Singleton<Activator_NT_Service, ACE_Mutex> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #endif /* Activator_NT_Service_H */
-
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 09effd0c661..28caae6dd50 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -80,14 +80,14 @@ run_standalone (Activator_Options& opts)
   return 1;
 }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 ACE_NT_SERVICE_DEFINE (service, Activator_NT_Service, IMR_ACTIVATOR_SERVICE_NAME);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
 run_service (void)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
   ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret);
 
@@ -97,7 +97,7 @@ run_service (void)
   return ret;
 #else /* ACE_WIN32 */
   return 1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 /**
@@ -112,7 +112,7 @@ run_service_command (Activator_Options& opts)
   if (opts.service_command () == Activator_Options::SC_NONE)
     return 0;
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
 
   if (opts.service_command () == Activator_Options::SC_INSTALL ||
@@ -180,7 +180,7 @@ run_service_command (Activator_Options& opts)
 #else /* ACE_WIN32 */
   ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index c11ec1201d9..96c88ecc322 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -77,14 +77,14 @@ run_standalone (Options& opts)
   return 1;
 }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 ACE_NT_SERVICE_DEFINE (service, Locator_NT_Service, IMR_LOCATOR_SERVICE_NAME);
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 int
 run_service (void)
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
   SERVICE::instance ()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
 
@@ -96,7 +96,7 @@ run_service (void)
   return ret;
 #else /* ACE_WIN32 */
   return 1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 /**
@@ -111,7 +111,7 @@ run_service_command (Options& opts)
   if (opts.service_command () == Options::SC_NONE)
     return 0;
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
   SERVICE::instance()->name (IMR_LOCATOR_SERVICE_NAME, IMR_LOCATOR_DISPLAY_NAME);
 
   if (opts.service_command () == Options::SC_INSTALL)
@@ -163,7 +163,7 @@ run_service_command (Options& opts)
 #else /* ACE_WIN32 */
   ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform"));
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 59a9f6434c9..32d179e1fca 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -13,7 +13,7 @@
 
 #include "Locator_NT_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ImR_Locator_i.h"
 #include "Locator_Options.h"
@@ -108,4 +108,4 @@ Locator_NT_Service::svc (void)
   return -1;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index c2199926f63..09662e95339 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -17,7 +17,7 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -55,8 +55,6 @@ private:
 
 typedef ACE_Singleton<Locator_NT_Service, ACE_Mutex> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #endif /* Locator_NT_Service_H */
-
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ed44f22f9ad..8d5c0cd2eee 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -23,7 +23,7 @@ static const char* SERVERS_ROOT_KEY = "Servers";
 static const char* ACTIVATORS_ROOT_KEY = "Activators";
 static const char* TOKEN = "Token";
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 static const char* WIN32_REG_KEY = "Software\\TAO\\ImplementationRepository";
 #endif
 
@@ -309,7 +309,7 @@ Locator_Repository::init(const Options& opts)
       }
     case Options::REPO_REGISTRY:
       {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
         if (opts.repository_erase ())
           {
             ACE_Configuration_Win32Registry config ( HKEY_LOCAL_MACHINE );
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index dc1288420cb..d510360f1a2 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -22,7 +22,7 @@
 
 #include "ace/OS.h"
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/Log_Msg.h"
 
@@ -225,4 +225,4 @@ main (int argc, char *argv[])
   return OPTIONS::instance ()->run (argc, argv);
 }
 
-#endif /* ACE_WIN32 */
+#endif /* !ACE_WIN32 || ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 2c1a9364ed6..f96559d086d 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -4,7 +4,7 @@
 
 #include /**/ "NT_Naming_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "Naming_Service.h"
 #include "tao/ORB_Core.h"
@@ -188,4 +188,4 @@ TAO_NT_Naming_Service::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 7d0ced9acf7..6068c9bacbf 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -25,7 +25,7 @@
 
 #include /**/ "ace/OS.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
@@ -93,5 +93,5 @@ private:
 
 typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 #endif /* TAO_NT_NAMING_SERVER_H */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 0b8dfac859c..533420ad49a 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -23,7 +23,7 @@
 
 #include "ace/OS.h"
 
-#if !defined (ACE_WIN32)
+#if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/Log_Msg.h"
 
@@ -228,4 +228,4 @@ main (int argc, char *argv[])
   return OPTIONS::instance ()->run (argc, argv);
 }
 
-#endif /* ACE_WIN32 */
+#endif /* !ACE_WIN32 || ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 9ad03908c0c..58a7749730b 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -3,7 +3,7 @@
 
 #include /**/ "NT_Notify_Service.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "Notify_Service.h"
 #include "tao/ORB_Core.h"
@@ -146,4 +146,4 @@ TAO_NT_Notify_Service::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 9ec67e151c0..f736b7b59a0 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -25,7 +25,7 @@
 
 #include /**/ "ace/OS.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include /**/ "ace/NT_Service.h"
 #include /**/ "ace/Singleton.h"
@@ -73,7 +73,5 @@ private:
 
 typedef ACE_Singleton<TAO_NT_Notify_Service, TAO_NT_Notify_Service::MUTEX> SERVICE;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 #endif /* TAO_NT_NOTIFY_SERVER_H */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 8dac3e08ea1..113fb2736ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -200,7 +200,7 @@ TAO_IFR_Server::open_config (void)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
       HKEY root =
         ACE_Configuration_Win32Registry::resolve_key (
             HKEY_LOCAL_MACHINE,
@@ -210,7 +210,7 @@ TAO_IFR_Server::open_config (void)
       ACE_NEW_THROW_EX (this->config_,
                         ACE_Configuration_Win32Registry (root),
                         CORBA::NO_MEMORY ());
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
       return 0;
     }