Merge pull request #866 from jwillemsen/jwi-vcpkgwcharxercesc

Use new vcpkg xerces wchar feature
DOCGroup · Mar 9, 2019 · a0fe8e3 · a0fe8e3
2 parents fa4af72 + 740937a
commit a0fe8e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ACE/ace/Shared_Object.h b/ACE/ace/Shared_Object.h
@@ -46,7 +46,6 @@ class ACE_Export ACE_Shared_Object
 
   /// Returns information on a service object.
   virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL

diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
@@ -10,8 +10,6 @@
 #include "ace/Sig_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 #if defined (ACE_HAS_SIG_C_FUNC)
 
 extern "C" void

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,36 +20,43 @@ jobs:
         BuildConfiguration: Debug
         vcpkgarch: x64-windows
         vcpkglibdir: debug\lib
-        OptionalFeatures: uses_wchar=1 xerces3=0
+        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: C:\vcpkg
+    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: |
-      vcpkg install --recurse --triplet $(vcpkgarch) openssl xerces-c
+      git clone --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
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,6 @@ class ACE_Export ACE_Shared_Object @@
       /// Returns information on a service object.
       virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
     };
     ACE_END_VERSIONED_NAMESPACE_DECL
@@ Expand Down @@