Add non wasm build of xeus-cpp to ci

Author: mcbarton

.github/workflows/ci.yml

@@ -303,10 +303,15 @@ if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
 endif ()
 
 # Fixes "C++ exception handler used, but unwind semantics are not enabled" warning Windows
-if (WIN32)
+if (MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
 endif ()
 
+# Attempt to fix emulated tls missing symbols
+if (WIN32)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -femulated-tls")
+endif ()
+
 if (APPLE)
   set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
 endif ()
@@ -393,7 +398,7 @@ else()
     option(CPPINTEROP_ENABLE_TESTING "Enables the testing infrastructure." ON)
 endif()
 
-if(MSVC)
+if(WIN32)
 
   set(MSVC_EXPORTLIST
    ??_7type_info@@6B@
@@ -421,8 +426,8 @@ if(MSVC)
    ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z
    ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z
    ?_Facet_Register@std@@YAXPEAV_Facet_base@1@@Z
-  )
-
+  ) 
+  
   if(MSVC_VERSION LESS 1914)
     set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST} ??3@YAXPAX0@Z ??_V@YAXPAX0@Z)
   endif()

CMakeLists.txt

@@ -9,11 +9,7 @@ get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}"
 # Determine CMAKE_SHARED_LIBRARY_SUFFIX based on operating system
 include(CMakeSystemSpecificInformation)
 
-if(MSVC)
-  set(shared_lib_dir bin)
-else()
-  set(shared_lib_dir lib)
-endif()
+set(shared_lib_dir lib)
 
 ### build/install workaround
 if (@BUILD_SHARED_LIBS@)
@@ -56,7 +52,7 @@ set_target_properties(clangCppInterOp PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${_include}
   IMPORTED_LOCATION ${_lib}
   )
-if (MSVC)
+if (WIN32)
   if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/include")
     set(_static_lib "${CPPINTEROP_INSTALL_PREFIX}/lib/${_lib_prefix}clangCppInterOp.lib")
   else()
@@ -66,7 +62,7 @@ if (MSVC)
   set_target_properties(clangCppInterOp PROPERTIES
     IMPORTED_IMPLIB ${_static_lib}
     )
-endif(MSVC)
+endif(WIN32)
 
 unset(_lib_prefix)
 unset(_lib_suffix)

cmake/CppInterOp/CppInterOpConfig.cmake.in

@@ -1,5 +1,6 @@
 set(_gtest_byproduct_binary_dir
-  ${CMAKE_BINARY_DIR}/downloads/googletest-prefix/src/googletest-build)
+  ${CMAKE_CURRENT_BINARY_DIR}/googletest-prefix/src/googletest-stamp)
+
 set(_gtest_byproducts
   ${_gtest_byproduct_binary_dir}/lib/libgtest.a
   ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a
@@ -20,6 +21,10 @@ elseif(APPLE)
 endif()
 
 include(ExternalProject)
+IF(WIN32)
+  string(REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS_GTEST ${CMAKE_CXX_FLAGS})
+  set(CMAKE_CXX_FLAGS_GTEST "${CMAKE_CXX_FLAGS_GTEST} -Wno-language-extension-token")
+endif()
 ExternalProject_Add(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
@@ -36,7 +41,7 @@ ExternalProject_Add(
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_GTEST}
                 -DCMAKE_AR=${CMAKE_AR}
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 ${EXTRA_GTEST_OPTS}

cmake/modules/GoogleTest.cmake

@@ -0,0 +1,22 @@
+name: xeus-cpp
+channels:
+  - conda-forge
+dependencies:
+  # Build dependencies
+  - make
+  - cmake
+  # Host dependencies
+  - xeus>=5.0.0
+  - xeus-zmq>=3.0,<4.0
+  - nlohmann_json=3.11.3
+  - pugixml
+  - cpp-argparse <3.1
+  - zlib
+  # Test dependencies
+  - pytest
+  - jupyter_kernel_test>=0.5,<0.6
+  - papermill
+  - nbformat
+  - nbval
+  - pytest-rerunfailures
+  - doctest

environment-dev.yml

@@ -3206,22 +3206,41 @@ namespace Cpp {
     int m_DupFD = -1;
 
   public:
+#if defined(_WIN32)
     StreamCaptureInfo(int FD) : m_TempFile(tmpfile(), std::fclose), m_FD(FD) {
       if (!m_TempFile) {
         perror("StreamCaptureInfo: Unable to create temp file");
         return;
       }
 
-      m_DupFD = dup(FD);
+      m_DupFD = _dup(FD);
 
       // Flush now or can drop the buffer when dup2 is called with Fd later.
       // This seems only neccessary when piping stdout or stderr, but do it
       // for ttys to avoid over complicated code for minimal benefit.
       ::fflush(FD == STDOUT_FILENO ? stdout : stderr);
+      if (_dup2(_fileno(m_TempFile.get()), FD) < 0)
+        perror("StreamCaptureInfo:");
+    }
+#else
+    StreamCaptureInfo(int FD) : m_TempFile(tmpfile(), std::fclose), m_FD(FD) {
+      
+      if (!m_TempFile) {
+        perror("StreamCaptureInfo: Unable to create temp file");
+        return;
+      }
+
+      m_DupFD = dup(FD);
 
+      // Flush now or can drop the buffer when dup2 is called with Fd later.
+      // This seems only neccessary when piping stdout or stderr, but do it
+      // for ttys to avoid over complicated code for minimal benefit.
+      ::fflush(FD == STDOUT_FILENO ? stdout : stderr);
       if (dup2(fileno(m_TempFile.get()), FD) < 0)
         perror("StreamCaptureInfo:");
     }
+#endif
+
     StreamCaptureInfo(const StreamCaptureInfo&) = delete;
     StreamCaptureInfo& operator=(const StreamCaptureInfo&) = delete;
     StreamCaptureInfo(StreamCaptureInfo&&) = delete;
@@ -3235,8 +3254,11 @@ namespace Cpp {
       assert(m_DupFD != -1 && "Multiple calls to GetCapturedString");
 
       fflush(nullptr);
-
+#if defined(_WIN32)
+      if (_dup2(m_DupFD, m_FD) < 0)
+#else
       if (dup2(m_DupFD, m_FD) < 0)
+#endif
         perror("StreamCaptureInfo:");
       // Go to the end of the file.
       if (fseek(m_TempFile.get(), 0L, SEEK_END) != 0)
@@ -3263,7 +3285,11 @@ namespace Cpp {
         content[newLen++] = '\0'; // Just to be safe.
 
       std::string result = content.get();
+#if defined(_WIN32)
+      _close(m_DupFD);
+#else
       close(m_DupFD);
+#endif
       m_DupFD = -1;
       return result;
     }

lib/Interpreter/CppInterOp.cpp

@@ -52,7 +52,13 @@ namespace Cpp {
     // Behaviour is to not add paths that don't exist...In an interpreted env
     // does this make sense? Path could pop into existance at any time.
     for (const char* Var : kSysLibraryEnv) {
+#if defined(_WIN32)
+      char* Env = nullptr;
+      size_t sz = 0;
+      if (_dupenv_s(&Env, &sz, Var)) {
+#else
       if (const char* Env = ::getenv(Var)) {
+#endif
         SmallVector<StringRef, 10> CurPaths;
         SplitPaths(Env, CurPaths, utils::kPruneNonExistant, Cpp::utils::platform::kEnvDelim);
         for (const auto& Path : CurPaths)

lib/Interpreter/DynamicLibraryManager.cpp

@@ -168,7 +168,13 @@ bool ExpandEnvVars(std::string& Str, bool Path) {
 
     std::string EnvVar = Str.substr(DPos + 1, Length -1); //"HOME"
     std::string FullPath;
-    if (const char* Tok = ::getenv(EnvVar.c_str()))
+#if defined(_WIN32)
+      char* Tok = nullptr;
+      size_t sz = 0;
+      if (_dupenv_s(&Tok, &sz, EnvVar.c_str()))
+#else
+      if (const char* Tok = getenv(EnvVar.c_str()))
+#endif
       FullPath = Tok;
 
     Str.replace(DPos, Length, FullPath);