Merge branch 'main' into Fix-issue-with-sysroot_path-and-XEUS_CPP_RESOURCE_DIR-with-@-in-absolute-path

Author: mcbarton

CONTRIBUTING.md

@@ -149,7 +149,14 @@ To build Jupyter Lite with this kernel without creating a website you can execut
 ```bash
 micromamba create -n xeus-lite-host jupyterlite-core=0.6 jupyter_server jupyterlite-xeus -c conda-forge
 micromamba activate xeus-lite-host
-jupyter lite build --XeusAddon.prefix=$PREFIX
+jupyter lite build --XeusAddon.prefix=$PREFIX \
+                   --XeusAddon.mounts="$PREFIX/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
+                   --XeusAddon.mounts="$PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
+                   --contents README.md \
+                   --contents notebooks/xeus-cpp-lite-demo.ipynb \
+                   --contents notebooks/smallpt.ipynb \
+                   --contents notebooks/images/marie.png \
+                   --contents notebooks/audio/audio.wav
 ```
 
 Once the Jupyter Lite site has built you can test the website locally by executing

README.md

@@ -151,7 +151,14 @@ To build Jupyter Lite with this kernel without creating a website you can execut
 ```bash
 micromamba create -n xeus-lite-host jupyterlite-core=0.6 jupyter_server jupyterlite-xeus -c conda-forge
 micromamba activate xeus-lite-host
-jupyter lite build --XeusAddon.prefix=$PREFIX
+jupyter lite build --XeusAddon.prefix=$PREFIX \            
+                   --XeusAddon.mounts="$PREFIX/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
+                   --XeusAddon.mounts="$PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
+                   --contents README.md \
+                   --contents notebooks/xeus-cpp-lite-demo.ipynb \
+                   --contents notebooks/smallpt.ipynb \
+                   --contents notebooks/images/marie.png \
+                   --contents notebooks/audio/audio.wav
 ```
 
 Once the Jupyter Lite site has built you can test the website locally by executing

docs/source/InstallationAndUsage.rst

@@ -133,6 +133,13 @@ To build Jupyter Lite with this kernel without creating a website you can execut
     micromamba create -n xeus-lite-host jupyterlite-core=0.6 jupyter_server jupyterlite-xeus -c conda-forge
     micromamba activate xeus-lite-host
     jupyter lite build --XeusAddon.prefix=$PREFIX
+                       --XeusAddon.mounts="$PREFIX/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
+                       --XeusAddon.mounts="$PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
+                       --contents README.md \
+                       --contents notebooks/xeus-cpp-lite-demo.ipynb \
+                       --contents notebooks/smallpt.ipynb \
+                       --contents notebooks/images/marie.png \
+                       --contents notebooks/audio/audio.wav
 
 Once the Jupyter Lite site has built you can test the website locally by executing
 

include/xeus-cpp/xeus_cpp_config.hpp

@@ -11,9 +11,8 @@
 
 // Project version
 #define XEUS_CPP_VERSION_MAJOR 0
-#define XEUS_CPP_VERSION_MINOR 8
-#define XEUS_CPP_VERSION_PATCH 0
-#define XEUS_CPP_VERSION_LABEL dev
+#define XEUS_CPP_VERSION_MINOR 7
+#define XEUS_CPP_VERSION_PATCH 1
 
 // Composing the version string from major, minor and patch
 #define XEUS_CPP_CONCATENATE(A, B) XEUS_CPP_CONCATENATE_IMPL(A, B)

src/xinterpreter.cpp

@@ -73,31 +73,20 @@ namespace xcpp
         xeus::register_interpreter(this);
     }
 
-    static std::string get_stdopt()
+    static std::string get_stdopt(int argc, const char* const* argv)
     {
-        // We need to find what's the C++ version the interpreter runs with.
-        const char* code = R"(
-int __get_cxx_version () {
-#if __cplusplus > 202302L
-    return 26;
-#elif __cplusplus > 202002L
-    return 23;
-#elif __cplusplus >  201703L
-    return 20;
-#elif __cplusplus > 201402L
-    return 17;
-#elif __cplusplus > 201103L || (defined(_WIN32) && _MSC_VER >= 1900)
-    return 14;
-#elif __cplusplus >= 201103L
-   return 11;
-#else
-  return 0;
-#endif
-  }
-__get_cxx_version ()
-      )";
-        auto cxx_version = Cpp::Evaluate(code);
-        return std::to_string(cxx_version);
+        std::string res = "14";
+        for (int i = 0; i < argc; ++i)
+        {
+            std::string arg(argv[i]);
+            auto pos = arg.find("-std=c++");
+            if (pos != std::string::npos)
+            {
+                res = arg.substr(pos + 8);
+                break;
+            }
+        }
+        return res;
     }
 
     interpreter::interpreter(int argc, const char* const* argv) :
@@ -109,7 +98,7 @@ __get_cxx_version ()
     {
         //NOLINTNEXTLINE (cppcoreguidelines-pro-bounds-pointer-arithmetic)
         createInterpreter(Args(argv ? argv + 1 : argv, argv + argc));
-        m_version = get_stdopt();
+        m_version = get_stdopt(argc, argv);
         redirect_output();
         init_preamble();
         init_magic();

test/test_interpreter.cpp

@@ -254,7 +254,9 @@ TEST_SUITE("kernel_info_request")
 {
     TEST_CASE("good_status")
     {
-        std::vector<const char*> Args = {/*"-v", "resource-dir", "....."*/};
+        std::vector<const char*> Args = {
+            "-v", "-std=c++23"  // test input for get_stdopt
+        };
         xcpp::interpreter interpreter((int)Args.size(), Args.data());
 
         nl::json result = interpreter.kernel_info_request();
@@ -264,6 +266,7 @@ TEST_SUITE("kernel_info_request")
         REQUIRE(result["language_info"]["mimetype"] == "text/x-c++src");
         REQUIRE(result["language_info"]["codemirror_mode"] == "text/x-c++src");
         REQUIRE(result["language_info"]["file_extension"] == ".cpp");
+        REQUIRE(result["language_info"]["version"] == "23");
         REQUIRE(result["status"] == "ok");
     }