More tweaks

Author: kunitoki

cmake/yup_python.cmake

@@ -31,6 +31,8 @@ function (yup_prepare_python_stdlib target_name python_tools_path output_variabl
     set (ignored_library_patterns ${default_ignored_library_patterns})
     list (APPEND ignored_library_patterns ${YUP_ARG_IGNORED_LIBRARY_PATTERNS})
 
+    get_filename_component (python_tools_path "${python_tools_path}" REALPATH)
+
     set (python_standard_library "${CMAKE_CURRENT_BINARY_DIR}/python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}.zip")
 
     _yup_message (STATUS "Executing python stdlib archive generator tool")

python/MANIFEST.in

@@ -1,7 +1,7 @@
-include README.md
-include LICENSE
+include ../README.md
+include ../LICENSE
 
 graft yup
 graft yup.pyi
 
-global-exclude *.py[cod] __pycache__ .DS_Store CMakeLists.txt
+global-exclude *.py[cod] __pycache__ tools .DS_Store CMakeLists.txt

tests/CMakeLists.txt

@@ -75,9 +75,10 @@ else()
         GTest::gmock_main)
 endif()
 
-if (YUP_PLATFORM_DESKTOP)
+if (YUP_PLATFORM_MACOS OR YUP_PLATFORM_WINDOWS)
     set (python_tools_path "${CMAKE_CURRENT_LIST_DIR}/../python/tools")
     set (python_target_name "${target_name}_python_stdlib")
+
     yup_prepare_python_stdlib (${python_target_name} ${python_tools_path} python_standard_library)
 
     yup_add_embedded_binary_resources (

tests/yup_python/yup_ScriptEngine.cpp

@@ -23,7 +23,10 @@
 
 #include <gtest/gtest.h>
 
+#if __has_include(<PythonStandardLibrary.h>)
+#define YUP_HAS_EMBEDDED_PYTHON_STANDARD_LIBRARY 1
 #include <PythonStandardLibrary.h>
+#endif
 
 using namespace yup;
 
@@ -436,6 +439,7 @@ TEST_F (ScriptEngineTest, RunScriptWithLambdaFunctions)
     EXPECT_TRUE (result.wasOk());
 }
 
+#if YUP_HAS_EMBEDDED_PYTHON_STANDARD_LIBRARY
 TEST_F (ScriptEngineTest, RunScriptWithStdLibImports)
 {
     ScriptEngine engine (ScriptEngine::prepareScriptingHome (
@@ -446,9 +450,7 @@ TEST_F (ScriptEngineTest, RunScriptWithStdLibImports)
         return { PythonStandardLibrary_data, PythonStandardLibrary_size };
     }));
 
-    auto result = engine.runScript (String (R"(
-        import argparse
-    )")
-                                        .dedentLines());
+    auto result = engine.runScript ("import argparse");
     EXPECT_TRUE (result.wasOk());
 }
+#endif

tests/yup_python/yup_ScriptPython.cpp

@@ -23,7 +23,10 @@
 
 #include <gtest/gtest.h>
 
+#if __has_include(<PythonStandardLibrary.h>)
+#define YUP_HAS_EMBEDDED_PYTHON_STANDARD_LIBRARY 1
 #include <PythonStandardLibrary.h>
+#endif
 
 using namespace yup;
 
@@ -42,13 +45,17 @@ class ScriptPythonTest : public ::testing::Test
 
     void SetUp() override
     {
+#if YUP_HAS_EMBEDDED_PYTHON_STANDARD_LIBRARY
         engine = std::make_unique<ScriptEngine> (ScriptEngine::prepareScriptingHome (
             YUPApplication::getInstance()->getApplicationName(),
             File::getSpecialLocation (File::tempDirectory),
             [] (const char*) -> MemoryBlock
         {
             return { PythonStandardLibrary_data, PythonStandardLibrary_size };
         }));
+#else
+        engine = std::make_unique<ScriptEngine>();
+#endif
     }
 
     void TearDown() override
@@ -67,6 +74,25 @@ TEST_F (ScriptPythonTest, RunPythonTests)
         currentWorkingDirectory.setAsCurrentWorkingDirectory();
     });
 
+    auto scriptingVersion = engine->getScriptingVersion();
+    auto scriptingVersionCompact = scriptingVersion.upToLastOccurrenceOf (".", false, false);
+
+    auto scriptingHome = engine->getScriptingHome();
+    if (scriptingHome == File())
+    {
+        scriptingHome = File::getSpecialLocation (File::userHomeDirectory).getChildFile ("yup_python");
+        scriptingHome.createDirectory();
+
+        auto binDirectory = scriptingHome.getChildFile ("bin");
+        binDirectory.createDirectory();
+
+        auto sitePackages = scriptingHome
+                                .getChildFile ("lib")
+                                .getChildFile ("python" + scriptingVersionCompact)
+                                .getChildFile ("site-packages");
+        sitePackages.createDirectory();
+    }
+
     auto baseFolder = getPytestTestFolder().getParentDirectory();
     baseFolder.setAsCurrentWorkingDirectory();
 
@@ -91,8 +117,8 @@ TEST_F (ScriptPythonTest, RunPythonTests)
 
     script = script
                  .dedentLines()
-                 .replace ("{{version}}", engine->getScriptingVersion().upToLastOccurrenceOf (".", false, false))
-                 .replace ("{{root_path}}", engine->getScriptingHome().getFullPathName())
+                 .replace ("{{version}}", scriptingVersionCompact)
+                 .replace ("{{root_path}}", scriptingHome.getFullPathName())
                  .replace ("{{test_path}}", getPytestTestFolder().getFullPathName());
 
     auto result = engine->runScript (script);