clean slate

PythonSwiftLink · Sep 30, 2023 · 5593552 · 5593552
1 parent 5ee9a35
commit 5593552
Show file tree

Hide file tree

Showing 537 changed files with 68,970 additions and 279 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,9 @@
 
 Getting started/.DS_Store
-.swiftpm/.DS_Store
-.swiftpm/xcode/.DS_Store
-.swiftpm/xcode/xcuserdata/musicmaker.xcuserdatad/xcschemes/xcschememanagement.plist
+
 Sources/PythonSwiftCore/.DS_Store
 Sources/PythonSwiftCore/PySwiftObject/.DS_Store
 .DS_Store
 Sources/.DS_Store
 Package.resolved
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.swiftpm/xcode/package.xcworkspace/xcuserdata/musicmaker.xcuserdatad/UserInterfaceState.xcuserstate
-.swiftpm/xcode/package.xcworkspace/xcuserdata/codebuilder.xcuserdatad/UserInterfaceState.xcuserstate
+.swiftpm/*
diff --git a/Package.swift b/Package.swift
@@ -4,60 +4,65 @@
 import PackageDescription
 
 let package = Package(
-    name: "PythonSwiftCore",
-    platforms: [.macOS(.v11), .iOS(.v13)],
-    products: [
-//        .library(
-//            name: "PythonSwiftCore",
-//            targets: ["PythonSwiftCore"]
-//        ),
-        .library(
-            name: "PythonSwiftCore",
-            targets: ["PythonSwiftCore"]
-        ),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-        //.package(path: "../PythonLib"),
-        .package(url: "https://github.com/PythonSwiftLink/PythonLib", from: "0.1.0"),
-        .package(url: "https://github.com/PythonSwiftLink/PythonTestSuite", branch: "master"),
-        //.package(path: "../PythonTestSuite")
-        //.package(url: "https://github.com/PythonSwiftLink/PythonLib-iOS", branch: "main")
-    ],
-
-    targets: [
-        .target(
-            name: "PythonSwiftCore",
-            dependencies: [
-                "PythonLib",
-                //.product(name: "PythonLib", package: "PythonLib", condition: .when(platforms: [.macOS])),
-                //"PythonLib-iOS",
-                //.product(name: "PythonLib-iOS", package: "PythonLib-iOS", condition: .when(platforms: [.iOS])),
-            ],
-            resources: [
-
-            ],
-            swiftSettings: [ .define("BEEWARE", nil)]
-        ),
-
-//        .target(
-//            name: "PythonSwiftCore-iOS",
-//            dependencies: ["PythonLib-iOS"],
-//            path: "./Sources/PythonSwiftCore",
-//            swiftSettings: [ .define("BEEWARE", nil)]
-//        )
-        .testTarget(
-            name: "PythonSwiftCoreTests",
-            dependencies: [
-                "PythonSwiftCore",
-                "PythonLib",
-                "PythonTestSuite"
-            ]
-//            resources: [
-//                .copy("python_stdlib")
-//            ]
-        ),
-
-    ]
+	name: "PythonSwiftLink",
+	platforms: [.macOS(.v11), .iOS(.v13)],
+	products: [
+		.library(
+			name: "PythonSwiftCore",
+			targets: ["PythonSwiftCore", "PythonLib"]
+		),
+		.library(
+			name: "PySwiftObject",
+			targets: ["PySwiftObject"]
+		),
+	],
+	dependencies: [
+		//.package(url: "https://github.com/PythonSwiftLink/PythonTestSuite", branch: "master"),
+	],
+
+	targets: [
+			.target(
+				name: "PythonSwiftCore",
+				dependencies: [
+					"PythonLib",
+					"PythonTypeAlias"
+				],
+				resources: [
+
+				],
+				swiftSettings: [ .define("BEEWARE", nil)]
+			),
+
+			.target(
+				name: "PySwiftObject",
+				dependencies: [
+					"PythonLib",
+					"PythonTypeAlias"
+				],
+				resources: [
+
+				],
+				swiftSettings: [ .define("BEEWARE", nil)]
+			),
+
+			.target(
+				name: "PythonLib",
+				dependencies: ["Python"],
+				path: "Sources/PythonLib",
+				linkerSettings: [
+					.linkedLibrary("ncurses"),
+					.linkedLibrary("sqlite3"),
+					.linkedLibrary("z"),
+				]
+			),
+			.target(
+				name: "PythonTypeAlias",
+				dependencies: [
+					"PythonLib",
+				]
+			),
+
+		.binaryTarget(name: "Python", path: "Sources/PythonLib/Python.xcframework"),
+
+	]
 )
diff --git a/...iftCore/PySwiftObject/PyBufferProcs.swift → Sources/PySwiftObject/PyBufferProcs.swift b/...iftCore/PySwiftObject/PyBufferProcs.swift → Sources/PySwiftObject/PyBufferProcs.swift
@@ -1,9 +1,8 @@
 
 
 import Foundation
-#if BEEWARE
 import PythonLib
-#endif
+import PythonTypeAlias
 
 public class PyBufferProcsHandler {
 
@@ -20,7 +19,7 @@ public class PyBufferProcsHandler {
 
     }
 
-    init(_getBuffer: PySwiftBuf_Get, _releaseBuffer: PySwiftBuf_Release) {
+    public init(_getBuffer: PySwiftBuf_Get, _releaseBuffer: PySwiftBuf_Release) {
 
         buffer_ptr = .allocate(capacity: 1)
 

diff --git a/...SwiftCore/PySwiftObject/PyGetSetDef.swift → Sources/PySwiftObject/PyGetSetDef.swift b/...SwiftCore/PySwiftObject/PyGetSetDef.swift → Sources/PySwiftObject/PyGetSetDef.swift
@@ -1,8 +1,7 @@
 
 import Foundation
-#if BEEWARE
 import PythonLib
-#endif
+import PythonTypeAlias
 
 
 public final class PyGetSetDefWrap {

diff --git a/...SwiftCore/PySwiftObject/PyMethodDef.swift → Sources/PySwiftObject/PyMethodDef.swift b/...SwiftCore/PySwiftObject/PyMethodDef.swift → Sources/PySwiftObject/PyMethodDef.swift
@@ -1,9 +1,6 @@
-
 import Foundation
-#if BEEWARE
 import PythonLib
-#endif
-
+import PythonTypeAlias
 
 
 public class PyMethodDefWrap {

diff --git a/...re/PySwiftObject/PyMethodDefGeneric.swift → ...es/PySwiftObject/PyMethodDefGeneric.swift b/...re/PySwiftObject/PyMethodDefGeneric.swift → ...es/PySwiftObject/PyMethodDefGeneric.swift
@@ -1,4 +1,6 @@
-
+import Foundation
+import PythonLib
+import PythonTypeAlias
 
 public func GenericPyCFuncCall<A: PyDecodable, B: PyDecodable, R: PyEncodable>(args: UnsafePointer<PyPointer?>?, count: Int,_ function: @escaping ((A,B)-> R) ) -> R? {
     do {

diff --git a/...Core/PySwiftObject/PySequenceMethod.swift → Sources/PySwiftObject/PySequenceMethod.swift b/...Core/PySwiftObject/PySequenceMethod.swift → Sources/PySwiftObject/PySequenceMethod.swift
diff --git a/...ftCore/PySwiftObject/PySwiftImports.swift → Sources/PySwiftObject/PySwiftImports.swift b/...ftCore/PySwiftObject/PySwiftImports.swift → Sources/PySwiftObject/PySwiftImports.swift
diff --git a/...iftCore/PySwiftObject/PySwiftModule.swift → Sources/PySwiftObject/PySwiftModule.swift b/...iftCore/PySwiftObject/PySwiftModule.swift → Sources/PySwiftObject/PySwiftModule.swift
diff --git a/...SwiftCore/PySwiftObject/SwiftPyType.swift → Sources/PySwiftObject/SwiftPyType.swift b/...SwiftCore/PySwiftObject/SwiftPyType.swift → Sources/PySwiftObject/SwiftPyType.swift
diff --git a/Sources/PythonLib/Python.xcframework/Info.plist b/Sources/PythonLib/Python.xcframework/Info.plist
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libPython3.10.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libPython3.10.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libPython3.10.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/Sources/PythonLib/Python.xcframework/ios-arm64/Headers/Python.h b/Sources/PythonLib/Python.xcframework/ios-arm64/Headers/Python.h
@@ -0,0 +1,148 @@
+#ifndef Py_PYTHON_H
+#define Py_PYTHON_H
+/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+
+/* Include nearly all Python header files */
+
+#include "patchlevel.h"
+#include "pyconfig.h"
+#include "pymacconfig.h"
+
+#include <limits.h>
+
+#ifndef UCHAR_MAX
+#error "Something's broken.  UCHAR_MAX should be defined in limits.h."
+#endif
+
+#if UCHAR_MAX != 255
+#error "Python's source code assumes C's unsigned char is an 8-bit type."
+#endif
+
+#if defined(__sgi) && !defined(_SGI_MP_SOURCE)
+#define _SGI_MP_SOURCE
+#endif
+
+#include <stdio.h>
+#ifndef NULL
+#   error "Python.h requires that stdio.h define NULL."
+#endif
+
+#include <string.h>
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdlib.h>
+#ifndef MS_WINDOWS
+#include <unistd.h>
+#endif
+
+/* For size_t? */
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+/* CAUTION:  Build setups should ensure that NDEBUG is defined on the
+ * compiler command line when building Python in release mode; else
+ * assert() calls won't be removed.
+ */
+#include <assert.h>
+
+#include "pyport.h"
+#include "pymacro.h"
+
+/* A convenient way for code to know if sanitizers are enabled. */
+#if defined(__has_feature)
+#  if __has_feature(memory_sanitizer)
+#    if !defined(_Py_MEMORY_SANITIZER)
+#      define _Py_MEMORY_SANITIZER
+#    endif
+#  endif
+#  if __has_feature(address_sanitizer)
+#    if !defined(_Py_ADDRESS_SANITIZER)
+#      define _Py_ADDRESS_SANITIZER
+#    endif
+#  endif
+#elif defined(__GNUC__)
+#  if defined(__SANITIZE_ADDRESS__)
+#    define _Py_ADDRESS_SANITIZER
+#  endif
+#endif
+
+#include "pymath.h"
+#include "pymem.h"
+
+#include "object.h"
+#include "objimpl.h"
+#include "typeslots.h"
+#include "pyhash.h"
+
+#include "cpython/pydebug.h"
+
+#include "bytearrayobject.h"
+#include "bytesobject.h"
+#include "unicodeobject.h"
+#include "longobject.h"
+#include "longintrepr.h"
+#include "boolobject.h"
+#include "floatobject.h"
+#include "complexobject.h"
+#include "rangeobject.h"
+#include "memoryobject.h"
+#include "tupleobject.h"
+#include "listobject.h"
+#include "dictobject.h"
+#include "cpython/odictobject.h"
+#include "enumobject.h"
+#include "setobject.h"
+#include "methodobject.h"
+#include "moduleobject.h"
+#include "funcobject.h"
+#include "classobject.h"
+#include "fileobject.h"
+#include "pycapsule.h"
+#include "code.h"
+#include "pyframe.h"
+#include "traceback.h"
+#include "sliceobject.h"
+#include "cellobject.h"
+#include "iterobject.h"
+#include "cpython/initconfig.h"
+#include "genobject.h"
+#include "descrobject.h"
+#include "genericaliasobject.h"
+#include "warnings.h"
+#include "weakrefobject.h"
+#include "structseq.h"
+#include "namespaceobject.h"
+#include "cpython/picklebufobject.h"
+#include "cpython/pytime.h"
+
+#include "codecs.h"
+#include "pyerrors.h"
+#include "pythread.h"
+#include "pystate.h"
+#include "context.h"
+
+#include "modsupport.h"
+#include "compile.h"
+#include "pythonrun.h"
+#include "pylifecycle.h"
+#include "ceval.h"
+#include "sysmodule.h"
+#include "osmodule.h"
+#include "intrcheck.h"
+#include "import.h"
+
+#include "abstract.h"
+#include "bltinmodule.h"
+
+#include "eval.h"
+
+#include "cpython/pyctype.h"
+#include "pystrtod.h"
+#include "pystrcmp.h"
+#include "fileutils.h"
+#include "cpython/pyfpe.h"
+#include "tracemalloc.h"
+
+#endif /* !Py_PYTHON_H */