Extension - renewed

.bumpversion.cfg

@@ -1,16 +1,16 @@
 [bumpversion]
-current_version = 1.5.2.dev0
+current_version = 2.0.0_dev0
 commit = True
 tag = False
-parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?
-serialize = 
-	{major}.{minor}.{patch}.{release}{build}
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\_(?P<release>[a-z]+)(?P<build>\d+))?
+serialize =
+	{major}.{minor}.{patch}_{release}{build}
 	{major}.{minor}.{patch}
 
 [bumpversion:part:release]
 first_value = dev
 optional_value = prod
-values = 
+values =
 	dev
 	prod
 

.gitignore

@@ -85,3 +85,15 @@ jacoco/
 wheelhouse/
 vc*.pdb
 *.class
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+*.project
+*.ninja*
+_jpype.*
+.clangd
+.classpath
+compile_commands.json
+*.gradle
+*.settings
+*.vscode

CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_minimum_required (VERSION 3.30)
+
+project("_jpype" LANGUAGES CXX)
+
+set (Python_FIND_ABI "ANY" "ANY" "ANY" "ON")
+set(Python_Interpreter_GIL_DISABLED ON)
+find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_SHARED_MODULE_SUFFIX ".cp313t-win_amd64.pyd")
+
+set(PROJECT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_ROOT})
+
+set(D_SRC_COMMON ${PROJECT_ROOT}/native/common)
+set(D_SRC_PYTHON ${PROJECT_ROOT}/native/python)
+
+file(GLOB SrcFiles ${D_SRC_COMMON}/*.cpp ${D_SRC_PYTHON}/*.cpp)
+
+add_compile_options(
+"$<$<COMPILE_LANGUAGE:CXX>:-Od;>"
+)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DPy_GIL_DISABLED=1 /W3 /GL")
+#target_sources(${PROJECT_NAME} MODULE ${SrcFiles})
+add_library(${PROJECT_NAME} MODULE ${SrcFiles})
+target_include_directories(${PROJECT_NAME} PRIVATE "C:\\Program Files\\Python313\\include" ${PROJECT_ROOT}/native/jni_include ${D_SRC_COMMON}/include  ${D_SRC_PYTHON}/include)
+#target_link_libraries(${PROJECT_NAME} PRIVATE Python3::Module)
+target_link_directories(${PROJECT_NAME} PRIVATE "C:\\Program Files\\Python313\\libs")

LICENSE

@@ -199,3 +199,35 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+==============
+ASM License
+==============
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2011 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.

_jpype-stubs/__init__.pyi

@@ -0,0 +1,215 @@
+import types
+import typing
+import jpype
+from java.lang import Class # type: ignore
+
+__version__: str
+
+class _JArray(_JObject):
+    length: jpype.JInt
+    def __init__(self, *args, **kwargs) -> None: ...
+    def __buffer__(self, *args, **kwargs): ...
+    def __delitem__(self, other) -> None: ...
+    def __getitem__(self, index): ...
+    def __len__(self) -> int: ...
+    def __release_buffer__(self, *args, **kwargs): ...
+    def __setitem__(self, index, object) -> None: ...
+
+class _JArrayPrimitive(_JArray):
+    def __buffer__(self, *args, **kwargs): ...
+    def __release_buffer__(self, *args, **kwargs): ...
+
+class _JBoolean(int, _JObject):
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __eq__(self, other: object) -> bool: ...
+    def __float__(self) -> float: ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    @classmethod
+    def __init_subclass__(cls, *args, internal: bool, **kwargs): ...
+    def __int__(self) -> int: ...
+    def __le__(self, other: object) -> bool: ...
+    def __lt__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+    def __setattr__(self, name, value): ...
+
+class _JBuffer(_JObject):
+    def __buffer__(self, *args, **kwargs): ...
+    def __release_buffer__(self, *args, **kwargs): ...
+
+class _JChar(str, _JObject):
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __abs__(self): ...
+    def __add__(self, other): ...
+    def __and__(self, other): ...
+    def __bool__(self) -> bool: ...
+    def __delattr__(self, name): ...
+    def __divmod__(self, other): ...
+    def __eq__(self, other: object) -> bool: ...
+    def __float__(self) -> float: ...
+    def __floordiv__(self, other): ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    def __index__(self) -> int: ...
+    def __invert__(self): ...
+    def __le__(self, other: object) -> bool: ...
+    def __len__(self) -> int: ...
+    def __lshift__(self, other): ...
+    def __lt__(self, other: object) -> bool: ...
+    def __mul__(self, other): ...
+    def __ne__(self, other: object) -> bool: ...
+    def __neg__(self): ...
+    def __or__(self, other): ...
+    def __pos__(self): ...
+    def __radd__(self, other): ...
+    def __rand__(self, other): ...
+    def __rdivmod__(self, other): ...
+    def __rfloordiv__(self, other): ...
+    def __rlshift__(self, other): ...
+    def __rmul__(self, other): ...
+    def __ror__(self, other): ...
+    def __rrshift__(self, other): ...
+    def __rshift__(self, other): ...
+    def __rsub__(self, other): ...
+    def __rxor__(self, other): ...
+    def __setattr__(self, name, value): ...
+    def __sub__(self, other): ...
+    def __xor__(self, other): ...
+    @classmethod
+    def __init_subclass__(cls, *args, internal: bool, **kwargs): ...
+
+class _JClass(type):
+    class_: Class
+    def __init__(self, *args, **kwargs) -> None: ...
+    def mro(self, *args, **kwargs): ...
+    def __del__(self, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __getitem__(self, index): ...
+    def __imatmul__(self, *args, **kwargs): ...
+    def __instancecheck__(self, *args, **kwargs): ...
+    def __matmul__(self, *args, **kwargs): ...
+    @classmethod
+    def __prepare__(cls, *args, **kwargs): ...
+    def __rmatmul__(self, *args, **kwargs): ...
+    def __setattr__(self, name, value): ...
+    def __subclasscheck__(self, *args, **kwargs): ...
+
+class _JClassHints:
+    def __init__(self, *args, **kwargs) -> None: ...
+
+class _JComparable(_JObject):
+    def __eq__(self, other: object) -> bool: ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    def __le__(self, other: object) -> bool: ...
+    def __lt__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+
+class _JException(Exception, _JObject):
+    def __init__(self, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __setattr__(self, name, value): ...
+
+class _JField:
+    def __delete__(self, *args, **kwargs): ...
+    def __get__(self, instance, owner): ...
+    def __set__(self, instance, value): ...
+
+class _JMethod(function):
+    def matchReport(self, *args, **kwargs): ...
+    def __call__(self, *args, **kwargs): ...
+    def __get__(self, instance, owner): ...
+
+class _JMonitor:
+    def __init__(self, *args, **kwargs) -> None: ...
+    def __enter__(self): ...
+    def __exit__(self, type: type[BaseException] | None, value: BaseException | None, traceback: types.TracebackType | None): ...
+
+class _JNumberFloat(float, _JObject):
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __eq__(self, other: object) -> bool: ...
+    def __float__(self) -> float: ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    @classmethod
+    def __init_subclass__(cls, *args, internal: bool, **kwargs): ...
+    def __int__(self) -> int: ...
+    def __le__(self, other: object) -> bool: ...
+    def __lt__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+    def __setattr__(self, name, value): ...
+
+class _JNumberLong(int, _JObject):
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __eq__(self, other: object) -> bool: ...
+    def __float__(self) -> float: ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    @classmethod
+    def __init_subclass__(cls, *args, internal: bool, **kwargs): ...
+    def __int__(self) -> int: ...
+    def __le__(self, other: object) -> bool: ...
+    def __lt__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+    def __setattr__(self, name, value): ...
+
+class _JObject:
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __del__(self, *args, **kwargs) -> None: ...
+    def __delattr__(self, name): ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ge__(self, other: object) -> bool: ...
+    def __gt__(self, other: object) -> bool: ...
+    def __hash__(self) -> int: ...
+    @classmethod
+    def __init_subclass__(cls, *args, **kwargs): ...
+    def __le__(self, other: object) -> bool: ...
+    def __lt__(self, other: object) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+    def __setattr__(self, name, value): ...
+
+class _JPackage(types.ModuleType):
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def __call__(self, *args, **kwargs): ...
+    def __dir__(self): ...
+    def __imatmul__(self, *args, **kwargs): ...
+    def __matmul__(self, *args, **kwargs): ...
+    def __rmatmul__(self, *args, **kwargs): ...
+
+class _JProxy:
+    __javaclass__: jpype.JClass
+    __javainst__: typing.Any
+    @classmethod
+    def __init__(cls, *args, **kwargs) -> None: ...
+    def equals(self, *args, **kwargs): ...
+    def hashCode(self, *args, **kwargs): ...
+    def toString(self, *args, **kwargs): ...
+
+def arrayFromBuffer(*args, **kwargs): ...
+def attachThreadAsDaemon(*args, **kwargs): ...
+def attachThreadToJVM(*args, **kwargs): ...
+def convertToDirectBuffer(*args, **kwargs): ...
+def detachThreadFromJVM(*args, **kwargs): ...
+def enableStacktraces(*args, **kwargs): ...
+def examine(*args, **kwargs): ...
+def gcStats(*args, **kwargs): ...
+def isPackage(*args, **kwargs): ...
+def isStarted(*args, **kwargs): ...
+def isThreadAttachedToJVM(*args, **kwargs): ...
+def shutdown(*args, **kwargs): ...
+def startup(*args, **kwargs): ...
+def trace(*args, **kwargs): ...

build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'java-library'
+apply plugin: 'eclipse'
+
+sourceCompatibility = 8
+targetCompatibility = 8
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['native/java']
+        }
+    }
+}
+
+jar {
+    destinationDirectory.set(file(project.rootDir))
+	archiveFileName.set('org.jpype.jar')
+	manifest {
+		attributes(
+			'Premain-Class': 'org.jpype.agent.JPypeAgent'
+		)
+	}
+}