Try to Fix More Windows CI Issues

- Add Possible Missing Xerces/OpenSSL to Builds - Install test should inherit CMAKE_MSVC_RUNTIME_LIBRARY - Fix issue with scrap_vs.pl - Try to fix issue encountered locally with missing symbols from DynamicDataReader.
iguessthislldo · Oct 5, 2023 · d1cdb48 · d1cdb48
1 parent 54ee152
commit d1cdb48
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 31 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -8322,6 +8322,24 @@ jobs:
     needs: build_w19_re_o1p1_sec
 
     steps:
+    - name: download openssl artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: openssl3_w19_artifact
+    - name: extract openssl artifact
+      shell: bash
+      run: |
+        tar xvJf openssl3_w19.tar.xz
+        rm -f openssl3_w19.tar.xz
+    - name: setup for run-vcpkg
+      shell: bash
+      run: |
+        echo '{ "name": "opendds", "version-string": "github-actions", "dependencies": [ "xerces-c" ] }' > vcpkg.json
+    - name: install xerces-c
+      uses: lukka/run-vcpkg@v11
+      with:
+        vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131
+        runVcpkgInstall: true
     - name: checkout MPC
       uses: actions/checkout@v4
       with:
@@ -12845,6 +12863,15 @@ jobs:
     needs: ACE_TAO_w22_p1
 
     steps:
+    - name: setup for run-vcpkg
+      shell: bash
+      run: |
+        echo '{ "name": "opendds", "version-string": "github-actions", "dependencies": [ "openssl", "xerces-c" ] }' > vcpkg.json
+    - name: install openssl & xerces-c
+      uses: lukka/run-vcpkg@v11
+      with:
+        vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131
+        runVcpkgInstall: true
     - name: Checkout OpenDDS
       uses: actions/checkout@v3
       with:

diff --git a/cmake/scrape_vs.pl b/cmake/scrape_vs.pl
@@ -49,14 +49,22 @@
     open(my $pf_fh, $pf) or die("Couldn't open \"$pf\": $!");
     while (my $pf_line = <$pf_fh>) {
       $pf_line =~ s/\s$//;
-      if ($pf_line =~ /<OutputFile>(\$\(OutDir\))?(.*)<\/OutputFile>$/) {
-        my $out_dir = $1;
+      if ($pf_line =~ /<OutputFile>(\$\(\w+\))?(.*)<\/OutputFile>$/) {
+        my $base_var = $1;
         my $output_file = $2;
         $output_file =~ s/d?\.dll/d.dll/;
         $output_file =~ s/\.dll$/.lib/;
-        if ($out_dir) {
-          my $dir = $output_file =~ /.exe/ ? 'bin' : 'lib';
-          $loc = File::Spec->catfile($values{ace}, $dir, $output_file);
+        if ($base_var) {
+          if ($base_var eq '$(OutDir)') {
+            $loc = File::Spec->catfile(
+              $values{ace}, $output_file =~ /.exe/ ? 'bin' : 'lib', $output_file);
+          }
+          elsif ($base_var eq '$(ACE_ROOT)') {
+            $loc = File::Spec->catfile($values{ace}, $output_file);
+          }
+          else {
+            die("Unexpected name $base_var on $pf:$.");
+          }
         }
         else {
           $loc = File::Spec->catfile(dirname($pf), $output_file);

diff --git a/dds/DCPS/XTypes/DynamicDataReaderImpl.cpp b/dds/DCPS/XTypes/DynamicDataReaderImpl.cpp
@@ -13,32 +13,6 @@
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace OpenDDS {
-namespace DCPS {
-
-#ifndef OPENDDS_NO_CONTENT_SUBSCRIPTION_PROFILE
-  template <>
-  DDS::ReturnCode_t
-  DataReaderImpl_T<XTypes::DynamicSample>::read_generic(GenericBundle&,
-                                                        DDS::SampleStateMask,
-                                                        DDS::ViewStateMask,
-                                                        DDS::InstanceStateMask,
-                                                        bool)
-  {
-    return DDS::RETCODE_UNSUPPORTED;
-  }
-
-  template <>
-  DDS::ReturnCode_t
-  DataReaderImpl_T<XTypes::DynamicSample>::take(AbstractSamples&,
-                                                DDS::SampleStateMask,
-                                                DDS::ViewStateMask,
-                                                DDS::InstanceStateMask)
-  {
-    return DDS::RETCODE_UNSUPPORTED;
-  }
-#endif
-}
-
 namespace XTypes {
   using namespace OpenDDS::DCPS;
 

diff --git a/dds/DCPS/XTypes/DynamicTypeSupport.cpp b/dds/DCPS/XTypes/DynamicTypeSupport.cpp
@@ -208,6 +208,31 @@ namespace OpenDDS {
 
   }
 
+  namespace DCPS {
+#ifndef OPENDDS_NO_CONTENT_SUBSCRIPTION_PROFILE
+    template <>
+    DDS::ReturnCode_t DataReaderImpl_T<XTypes::DynamicSample>::read_generic(
+      GenericBundle&,
+      DDS::SampleStateMask,
+      DDS::ViewStateMask,
+      DDS::InstanceStateMask,
+      bool)
+    {
+      return DDS::RETCODE_UNSUPPORTED;
+    }
+
+    template <>
+    DDS::ReturnCode_t DataReaderImpl_T<XTypes::DynamicSample>::take(
+      AbstractSamples&,
+      DDS::SampleStateMask,
+      DDS::ViewStateMask,
+      DDS::InstanceStateMask)
+    {
+      return DDS::RETCODE_UNSUPPORTED;
+    }
+#endif
+  }
+
   namespace XTypes {
     template <>
     DDS::DynamicData_ptr get_dynamic_data_adapter<DynamicSample, DynamicSample>(

diff --git a/tests/cmake/install/CMakeLists.txt b/tests/cmake/install/CMakeLists.txt
@@ -18,6 +18,7 @@ set(common_cmake_args
   "-DCMAKE_PREFIX_PATH:PATH=${OPENDDS_ROOT}$<SEMICOLON>${dest_install_prefix}"
   "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
   "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+  "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}"
 )
 if(DEFINED CMAKE_CXX_STANDARD)
   list(APPEND common_cmake_args "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}")