Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO

6 files changed, 102 insertions, 24 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index f7e1601ef52..23137b84d0a 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -463,8 +463,8 @@ State Perl.</a></p>
 Microsoft Visual Studio</a></h3>
 
 <p>ACE contains project files for
-Visual Studio 2015 (vc14), and Visual Studio 2017 (vc141).
-Visual Studio 2015 and 2017 use different file formats but the same file
+Visual Studio 2015 (vc14), Visual Studio 2017 (vc141), and Visual Studio 2019 (vc142).
+Visual Studio 2015/2017/2019 use different file formats but the same file
 suffixes (<code>.sln</code> and <code>.vcproj</code>). To support both
 environments, ACE supplies files with different names for the different
 development and target platforms. The platform/name mapping is shown below.
@@ -489,6 +489,11 @@ a <code>.vcproj</code> suffix.</p>
     <td><i>name</i><code>_vs2017</code>
     </td>
   </tr>
+  <tr>
+    <th>Visual Studio 2019</th>
+    <td><i>name</i><code>_vs2019</code>
+    </td>
+  </tr>
 </tbody></table>
 
 <p>The VC++ compiler and linker can now be invoked from GNU make just like
@@ -3130,18 +3135,16 @@ quickly.
 
   On Windows, with Visual Studio 2017, you must generate solution and project files with MPC:<p>
   <code> $ACE_ROOT/bin/mwc.pl -type vs2017 ACE.mwc </code> </p>
+
+  On Windows, with Visual Studio 2019, you must generate solution and project files with MPC:<p>
+  <code> $ACE_ROOT/bin/mwc.pl -type vs2019 ACE.mwc </code> </p>
   </li><li>If you want to build TAO and its associated libraries
   please see <a href="TAO/TAO-INSTALL.html">TAO-INSTALL</a> for details.
 </li></ul>
 
 <hr><p>
-
 Back to the <a href="https://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</a>
 home page.
-
-
-
-
 </p><p>
 <!--<EM>
 Visitor #
diff --git a/ACE/NEWS b/ACE/NEWS
index bf56bf46b3d..24ff7e0697d 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -20,6 +20,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.4 and ACE-6.5.5
 
 . minizip has been moved from ACE to DANCE
 
+. Add initial support for Visual Studio 2019
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.3 and ACE-6.5.4
 ====================================================
 
diff --git a/ACE/ace/Log_Msg_Android_Logcat.cpp b/ACE/ace/Log_Msg_Android_Logcat.cpp
index 8fc517be099..2985965136c 100644
--- a/ACE/ace/Log_Msg_Android_Logcat.cpp
+++ b/ACE/ace/Log_Msg_Android_Logcat.cpp
@@ -49,7 +49,7 @@ ACE_Log_Msg_Android_Logcat::~ACE_Log_Msg_Android_Logcat (void)
 }
 
 int
-ACE_Log_Msg_Android_Logcat::open (const ACE_TCHAR * logger_key)
+ACE_Log_Msg_Android_Logcat::open (const ACE_TCHAR *)
 {
   return 0;
 }
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index b6e828e00fe..8415b2185b5 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -868,6 +868,7 @@ def generate_workspaces (stage_dir):
     msvc_exclude_option = ' '
     vc14_option = ' -name_modifier *_vc14 '
     vs2017_option = ' -name_modifier *_vs2017 '
+    vs2019_option = ' -name_modifier *_vs2019 '
 
     redirect_option = str ()
     if not opts.verbose:
@@ -882,6 +883,9 @@ def generate_workspaces (stage_dir):
     print "\tGenerating VS2017 solutions..."
     ex (mpc_command + " -type vs2017 "  + msvc_exclude_option + mpc_option + workers_option + vs2017_option + redirect_option)
 
+    print "\tGenerating VS2019 solutions..."
+    ex (mpc_command + " -type vs2019 "  + msvc_exclude_option + mpc_option + workers_option + vs2019_option + redirect_option)
+
     print "\tCorrecting permissions for all generated files..."
     ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644")
 
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index e758e5f0a4f..c8fc3726cee 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -31,7 +31,7 @@ to run TAO on:<P>
 <table width="100%" border=1>
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
-    <td>Windows (Microsoft Visual C++ 7.1, 9.0, 10.0, 11.0, 12, 14.0, and 14.1),
+    <td>Windows (Microsoft Visual C++ 7.1, 9.0, 10.0, 11.0, 12, 14.0, 14.1, and 14.2),
         Linux/Intel (Redhat, Debian, and SuSe), Android
     </td>
   </tr>
@@ -393,7 +393,7 @@ you need to have <code>TAO_IDL</code> compiled.
 <H4>Visual C++ 7.1 and newer</H4>
 
 <P>It works best if TAO is placed in ACE_wrappers so TAO ends up in
-<CODE>ACE_wrappers\TAO</CODE> because the Visual C++ 7.1 Project files
+<CODE>ACE_wrappers\TAO</CODE> because the Visual Studio Project files
 are setup up to work in this configuration. If you move it, then make
 sure you regenerate the project files to look for the include and
 library files in the correct place. The default place for placing the
@@ -409,7 +409,7 @@ project </a> file.</P>
       compiler under MSVC.  If you intend to also use the release
       version of the libraries in the same workspace you have to be
       careful, since the executable name for TAO_IDL is same in debug
-      and release builds. You can use only or the oethr in the same
+      and release builds. You can use only or the other in the same
       workspace. This shouldn't be an issue since the projects for
       tests and examples are set up to transparently use one or the
       other.
@@ -425,15 +425,6 @@ project </a> file.</P>
       and build both client and server. <P>
 </OL>
 
-<H4>Visual C++ 7.0</H4>
-The DOC group doesn't support TAO on VC++ 7.0 since the libraries that
-were shipped with VC++ 7.0 did not work well. The DOC group supports
-only VC++ 7.1, which is used by their sponsors. The above mentioned
-points are also relevant to users who are trying to use TAO with VC++
-7.1. Additionally, all required options are set for the generated .sln
-files. If something is missing then it is probably a bug with
-MPC. Please report such bugs to the tao-users newsgroups.
-
 <H4>Upgrading From Older Releases</H4>
 
 <P>When a newer version of ACE/TAO is installed, rebuild all should be
@@ -472,10 +463,6 @@ The correct way is:
 execution of these tests. The scripts are found as "run_test.pl" in the
 directory of the test.</p>
 
-<P> The versions of perl that we use are 5.005_02 on NT and 5.003 on Solaris.
-The scripts may work on earlier versions of perl, but we cannot say for sure
-that they do.</P>
-
 <HR>
 <P>
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aacc774a6e8..601fedab6d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,6 +9,88 @@ resources:
   fetchDepth: 1
 
 jobs:
+- job: VisualStudio2019
+  timeoutInMinutes: 120
+  pool:
+    vmImage: windows-2019
+  strategy:
+    matrix:
+      WChar:
+        BuildPlatform: x64
+        BuildConfiguration: Debug
+        vcpkgarch: x64-windows
+        vcpkglibdir: debug\lib
+        vcpkgpackages: 'openssl xerces-c[xmlch_wchar]'
+        OptionalFeatures: uses_wchar=1
+      Debug64:
+        BuildPlatform: x64
+        BuildConfiguration: Debug
+        vcpkgarch: x64-windows
+        vcpkglibdir: debug\lib
+        vcpkgpackages: openssl xerces-c
+      Release64:
+        BuildPlatform: x64
+        BuildConfiguration: Release
+        vcpkgarch: x64-windows
+        vcpkglibdir: lib
+        vcpkgpackages: openssl xerces-c
+      Debug32:
+        BuildPlatform: Win32
+        BuildConfiguration: Debug
+        vcpkgarch: x86-windows
+        vcpkglibdir: debug\lib
+        vcpkgpackages: openssl xerces-c
+      Release32:
+        BuildPlatform: Win32
+        BuildConfiguration: Release
+        vcpkgarch: x86-windows
+        vcpkglibdir: lib
+        vcpkgpackages: openssl xerces-c
+  variables:
+    VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
+    XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
+    XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
+    SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
+    SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
+  steps:
+  - powershell: |
+      git clone -q --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT)
+      $(VCPKG_ROOT)\bootstrap-vcpkg.bat
+      $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages)
+    displayName: Install additional packages using vcpkg
+  - powershell: |
+      '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h
+    displayName: Create config.h file
+  - powershell: |
+      echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+      echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+      echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+    displayName: Create default.features file
+  - powershell: |
+      echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+    displayName: Add optional features ($(OptionalFeatures))
+    condition: and(succeeded(), ne(variables['OptionalFeatures'], ''))
+  - powershell: git clone -q --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT)
+    displayName: git clone MPC
+  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(TAO_ROOT)/TAO_ACE.mwc -workers 4
+    displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
+  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(ACE_ROOT)/tests/tests.mwc -workers 4
+    displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc
+  - task: VSBuild@1
+    displayName: Build solution TAO/TAO_ACE.sln
+    inputs:
+      solution: TAO/TAO_ACE.sln
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      maximumCpuCount: true
+  - task: VSBuild@1
+    displayName: Build solution ACE/tests/tests.sln
+    inputs:
+      solution: ACE/tests/tests.sln
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      maximumCpuCount: true
+
 - job: VisualStudio2017
   timeoutInMinutes: 120
   pool: