fix module bundle problem

Author: kewlbear

Package.swift

@@ -8,26 +8,32 @@ let package = Package(
     products: [
         .library(
             name: "Python-iOS",
-            targets: ["libpython3", "libssl", "libcrypto", "libffi", "PythonSupport"]),
+            targets: [ // order matters!
+                "LinkPython",
+                "libpython3", "libssl", "libcrypto", "libffi",
+                "PythonSupport",
+            ]),
     ],
     targets: [
         .binaryTarget(name: "libpython3", url: "https://github.com/kewlbear/Python-iOS/releases/download/0.0.1/libpython3.xcframework.zip", checksum: "245c51a97eda854a7b0c7bd507f24d1dfc2efae38f20aceac91fe0fd99a6eebe"),
         .binaryTarget(name: "libssl", url: "https://github.com/kewlbear/Python-iOS/releases/download/0.0.1/libssl.xcframework.zip", checksum: "1fc7dd3e95d5152812bc8d74450fdc45539e4ac53d4008b21b7f0a81d2fc52a9"),
         .binaryTarget(name: "libcrypto", url: "https://github.com/kewlbear/Python-iOS/releases/download/0.0.1/libcrypto.xcframework.zip", checksum: "43948ae2aac97bf80445ad0e38dd943b4f903506802633bd82d8b813da0328bf"),
         .binaryTarget(name: "libffi", url: "https://github.com/kewlbear/Python-iOS/releases/download/0.0.1/libffi.xcframework.zip", checksum: "0b028a1068f5f085ba1861b73928b99d14970438639d2531c3f31afe4d0e0e3c"),
-        .target(name: "PythonSupport",
+        .target(name: "LinkPython",
                 dependencies: [
                     "libpython3",
                     "libssl",
                     "libcrypto",
                     "libffi",
                 ],
-                resources: [.copy("lib")],
                 linkerSettings: [
                     .linkedLibrary("z"),
                     .linkedLibrary("sqlite3"),
                 ]
         ),
+        .target(name: "PythonSupport",
+                dependencies: ["LinkPython"],
+                resources: [.copy("lib")]),
         .testTarget(
             name: "PythonTests",
             dependencies: ["PythonSupport"]),

Sources/LinkPython/PythonSupport.m

@@ -0,0 +1,58 @@
+//
+//  PythonSupport.m
+//
+//  Copyright (c) 2021 Changbeom Ahn
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+#import <Python.h>
+#include <dlfcn.h>
+
+#import "PythonSupport.h"
+
+int PythonInitialize(int argc, const char **argv, const char *custom_builtin_importer)
+{
+    int ret = 0;
+
+    Py_Initialize();
+
+    wchar_t** python_argv = PyMem_RawMalloc(sizeof(wchar_t *) *argc);
+    for (int i = 0; i < argc; i++)
+        python_argv[i] = Py_DecodeLocale(argv[i], NULL);
+    PySys_SetArgv(argc, python_argv);
+
+    // If other modules are using the thread, we need to initialize them before.
+    PyEval_InitThreads();
+
+    // Add an importer for builtin modules
+    PyRun_SimpleString(custom_builtin_importer);
+
+    return ret;
+}
+
+void PythonFinalize()
+{
+    Py_Finalize();
+}
+
+void PythonRunSimpleString(const char *string)
+{
+    PyRun_SimpleString(string);
+}

Sources/LinkPython/include/PythonSupport.h

@@ -0,0 +1,35 @@
+//
+//  PythonSupport.h
+//
+//  Copyright (c) 2021 Changbeom Ahn
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+int PythonInitialize(int argc, const char **argv, const char *);
+
+void PythonFinalize();
+
+void PythonRunSimpleString(const char *);
+
+NS_ASSUME_NONNULL_END