buildz 0.7.3__tar.gz → 0.7.5__tar.gz

{buildz-0.7.3/buildz.egg-info → buildz-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.3
+Version: 0.7.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.7.3 → buildz-0.7.5}/buildz/tz/myers_diff.py

@@ -1,7 +1,6 @@
 #codig=utf-8
 import os
 import re
-import numpy as np
 import base64
 ACT_ADD = "add_prev"
 ACT_DEL = "del_curr"

{buildz-0.7.3 → buildz-0.7.5}/buildz/xf/cpp/Makefile

@@ -1,10 +1,10 @@
-.PHONY: cpp_depend ALL
+.PHONY: ALL
 TARGETLIB = libcxf.a
 TARGETLIB_CPP = cxf
 TARGETDYN=cxf.so
 SRC=$(wildcard loaderz/*.cpp) $(wildcard loaderz/**/*.cpp)
 OBJ=$(SRC:.cpp=.o)
-ALL:$(TARGETLIB) $(TARGETDYN)
+ALL:cpp_depend $(TARGETLIB) $(TARGETDYN)
 	echo "$(SRC)"
 
 $(TARGETDYN):$(OBJ)
@@ -16,9 +16,15 @@ test: $(OBJ)
 %.o:%.cpp
 	g++ -O3 -fPIC -Wall -g -c $< -o $@
 
-include cpp_depend
 cpp_depend:
 	g++ -MM $(SRC) > cpp_depend
 
+include cpp_depend
+
 clean:
-	rm $(OBJ)
+	rm $(OBJ) cpp_depend
+
+wclean:
+	del cpp_depend
+	del loaderz\*.o
+	del loaderz\deal\*.o

{buildz-0.7.3 → buildz-0.7.5}/buildz/xf/cpp/loaderz/cxf.h

@@ -8,12 +8,17 @@ typedef void (*fptr_dict_set)(void* dict, void* key, void *val);
 typedef void (*fptr_list_add)(void* list, void* val);
 typedef void* (*fptr_exp)(const char* s);
 
+typedef void* (*mptr_create)(void* obj, int type, void* val, int ival);
+typedef void (*mptr_dict_set)(void* obj, void* dict, void* key, void *val);
+typedef void (*mptr_list_add)(void* obj, void* list, void* val);
+typedef void* (*mptr_exp)(void* obj, const char* s);
+
 void* loads(const char* s, void* callback);
 void* loadx(const char* s, void* callback);
 void* loads_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp);
 void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp);
-void* testloads(const char* s);
-int tests(const char* s);
+void* loads_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp);
+void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp);
 #ifdef __cplusplus
 }
 #endif

{buildz-0.7.3 → buildz-0.7.5}/buildz/xf/cpp/loaderz/init.cpp

@@ -143,6 +143,34 @@ void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr
     obj_loadx.buildx();
     return obj_loadx.loads(s, callback);
 }
-int tests(const char* s){
-    return 123;
+struct MethodCallback:public Callback{
+    mptr_create fc_create; 
+    mptr_dict_set fc_set; 
+    mptr_list_add fc_add; 
+    mptr_exp fc_exp;
+    void* obj;
+    MethodCallback(void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp):obj(obj),
+    fc_create(fc_create),fc_set(fc_set),fc_add(fc_add),fc_exp(fc_exp){}
+    void* create(int type, void* val=NULL, int ival=0){
+        return fc_create(obj, type, val, ival);
+    }
+    void dict_set(void* dict, void* key, void *val){
+        fc_set(obj, dict, key, val);
+    }
+    void list_add(void* list, void* val){
+        fc_add(obj, list, val);
+    }
+    void* exp(const char* s){
+        return fc_exp(obj, s);
+    }
+};
+void* loads_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp){
+    MethodCallback callback(obj, fc_create, fc_set, fc_add, fc_exp);
+    obj_loads.build();
+    return obj_loads.loads(s, callback);
+}
+void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp){
+    MethodCallback callback(obj, fc_create, fc_set, fc_add, fc_exp);
+    obj_loadx.buildx();
+    return obj_loadx.loads(s, callback);
 }

{buildz-0.7.3 → buildz-0.7.5}/buildz/xf/cpp/setup.py

@@ -1,10 +1,14 @@
 #coding=utf-8
 import sys
+import os
+curr_dir = os.path.dirname(__file__)
 mark_msvc = False
 mark_mingw32 = False
 if len(sys.argv)==1:
     sys.argv.append("build_ext")
-    sys.argv.append("--inplace")
+    #sys.argv.append("--inplace")
+    sys.argv.append('--build-lib')
+    sys.argv.append(f"{curr_dir}")
 if sys.platform=='win32':
     mark_msvc = True
     for k in sys.argv[1:]:
@@ -15,14 +19,12 @@ if sys.platform=='win32':
             break
 from distutils.core import setup, Extension
 from Cython.Build import cythonize
-import os
-import sys
 extra_link_args = []
 define_macros=[]
 extra_compile_args = []
-sources = ["pcxf.pyx","pc.cpp"]
+sources = [os.path.join(curr_dir, "pcxf.pyx"),os.path.join(curr_dir, "pc.cpp")]
 from buildz import fz
-cpps = fz.search("./loaderz",".*\.cpp")
+cpps = fz.search(os.path.join(curr_dir,"loaderz"),".*\.cpp")
 sources+=cpps
 if not mark_msvc:
     extra_link_args = ["-lstdc++", "-O3"]
@@ -44,7 +46,7 @@ setup(
         "pcxf",
         language="c++",
         sources = sources,
-        include_dirs=["./loaderz","."],
+        include_dirs=[os.path.join(curr_dir,"loaderz"),curr_dir],
         extra_compile_args=extra_compile_args,
         extra_link_args=extra_link_args,  # 链接 C++ 标准库
         define_macros=define_macros,

buildz-0.7.5/buildz/xf/cpp/setup_mingw32.py

@@ -0,0 +1,11 @@
+#
+import sys
+import os
+curr_dir = os.path.dirname(__file__)
+if len(sys.argv)==1:
+    sys.argv.append("build_ext")
+    sys.argv.append('--build-lib')
+    sys.argv.append(f"{curr_dir}")
+if sys.platform =='win32':
+    sys.argv.append("--compiler=mingw32")
+from buildz.xf.cpp import setup

buildz-0.7.5/buildz/xf/java/Test.java

@@ -0,0 +1,12 @@
+
+import com.buildz.xf.Loader;
+public class Test {
+    public static void main(String[] args) throws Exception{
+        Loader jni = new Loader();
+        Object rst;
+        rst = jni.loads("a,b,c,{},[1,2,3,(4,5,6),{7=8,9=0},'asdf\\n']");
+        System.out.println("rst:"+rst);
+        rst = jni.loadx("(a,b,c=0)");
+        System.out.println("rst:"+rst);
+    }
+}

buildz-0.7.5/buildz/xf/java/all.sh

@@ -0,0 +1,20 @@
+cd ../cpp
+make
+cd ../java
+javac -h ./com/buildz/xf/cpp com/buildz/xf/LoaderJNI.java -encoding utf-8
+javac com/buildz/xf/Loader.java -encoding utf-8
+javac com/buildz/xf/Args.java -encoding utf-8
+
+g++ -I"./com/buildz/xf/cpp" -I"$JAVA_HOME/include" -I"$JAVA_HOME/include/win32" -shared -o ./jxf.dll ./com/buildz/xf/cpp/jxf.cpp -I"../cpp" -L"../cpp" -lcxf -O3
+
+g++ -I"./com/buildz/xf/cpp" -I"%JAVA_HOME%/include" -I"%JAVA_HOME%/include/win32" -shared -o ./jxf.dll ./com/buildz/xf/cpp/jxf.cpp -I"../cpp" -L"../cpp" -lcxf -O3
+
+javac Test.java -encoding utf-8 && java -Djava.library.path=. Test
+
+clean:
+    rm ./com/buildz/xf/*.class
+    rm *.class
+
+win clean
+    del .\com\buildz\xf\*.class
+    del *.class

buildz-0.7.5/buildz/xf/java/com/buildz/xf/Args.java

@@ -0,0 +1,23 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+public class Args{
+    public String toString(){
+        return "<args list="+list.toString()+", map="+map.toString()+">";
+    }
+    public List list = new ArrayList();
+    public Map map = new HashMap();
+    public Args(){}
+    public boolean add(Object obj){
+        return list.add(obj);
+    }
+    public Object put(Object key, Object val){
+        return map.put(key, val);
+    }
+    public int size(){
+        return list.size()+map.size();
+    }
+}

buildz-0.7.5/buildz/xf/java/com/buildz/xf/Loader.java

@@ -0,0 +1,30 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.Map;
+public class Loader {
+    public static LoaderJNI jni = new LoaderJNI();
+    // 声明native方法
+    public Object loads(String s)throws Exception{
+        Object obj = jni.jloads(s);
+        if (obj instanceof Exception)throw (Exception)obj;
+        if ((obj instanceof List)&&((List)obj).size()==0){
+            return "";
+        }
+        if ((obj instanceof List)&&((List)obj).size()==1){
+            obj = ((List)obj).get(0);
+        }
+        return obj;
+    }
+    public Object loadx(String s)throws Exception{
+        Object obj = jni.jloadx(s);
+        if (obj instanceof Exception)throw (Exception)obj;
+        if ((obj instanceof Args)&&((Args)obj).size()==0){
+            return "";
+        }
+        if ((obj instanceof Args)&&((Args)obj).size()==1&&((Args)obj).list.size()==1){
+            obj = ((Args)obj).list.get(0);
+        }
+        return obj;
+    }
+
+}

buildz-0.7.5/buildz/xf/java/com/buildz/xf/LoaderJNI.java

@@ -0,0 +1,13 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.Map;
+public class LoaderJNI {
+    // 声明native方法
+    public native Object jloads(String s);
+    public native Object jloadx(String s);
+    // 加载动态链接库
+    static {
+        System.loadLibrary("./jxf");
+    }
+
+}

buildz-0.7.5/buildz/xf/java/com/buildz/xf/cpp/com_buildz_xf_LoaderJNI.h

@@ -0,0 +1,29 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_buildz_xf_LoaderJNI */
+
+#ifndef _Included_com_buildz_xf_LoaderJNI
+#define _Included_com_buildz_xf_LoaderJNI
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_buildz_xf_LoaderJNI
+ * Method:    jloads
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_buildz_xf_LoaderJNI
+ * Method:    jloadx
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloadx
+  (JNIEnv *, jobject, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

buildz-0.7.5/buildz/xf/java/com/buildz/xf/cpp/jxf.cpp

@@ -0,0 +1,121 @@
+
+#include <jni.h>
+#include <stdio.h>
+#include "com_buildz_xf_LoaderJNI.h"
+#include "loaderz/cxf.h"
+#include "loaderz/base.h"
+void* fc_create(void* obj, int type, void* val, int ival){
+    JNIEnv* env = (JNIEnv*) obj;
+    switch(type){
+        case TYPE_NULL:
+            return NULL;
+        case TYPE_BOOL:
+        {
+            jclass booleanClass = env->FindClass("java/lang/Boolean");
+            jmethodID constructor = env->GetMethodID(booleanClass, "<init>", "(Z)V");
+            jobject result = env->NewObject(booleanClass, constructor, ival==1);
+            env->DeleteLocalRef(booleanClass);
+            return (void*)result;
+        }
+        case TYPE_INT:
+        {
+            long long lval = std::stoll((const char*) val);
+            jclass longClass = env->FindClass("java/lang/Long");
+            jmethodID constructor = env->GetMethodID(longClass, "<init>", "(J)V");
+            jobject result = env->NewObject(longClass, constructor, lval);
+            env->DeleteLocalRef(longClass);
+            return (void*)result;
+        }
+        case TYPE_FLOAT:
+        {
+            double dval = std::stod((const char*) val);
+            jclass doubleClass = env->FindClass("java/lang/Double");
+            jmethodID constructor = env->GetMethodID(doubleClass, "<init>", "(D)V");
+            jobject result = env->NewObject(doubleClass, constructor, dval);
+            env->DeleteLocalRef(doubleClass);
+            return (void*)result;
+        }
+        case TYPE_STR: {
+            jstring sval = env->NewStringUTF((const char*) val);
+            return (void*)sval;
+        }
+        case TYPE_LIST:{
+            jclass mapClass = env->FindClass("java/util/ArrayList");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+        case TYPE_DICT:{
+            jclass mapClass = env->FindClass("java/util/HashMap");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+        case TYPE_LISTDICT:{
+            jclass mapClass = env->FindClass("com/buildz/xf/Args");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+    }
+    return NULL;
+}
+void fc_dict_set(void* obj, void* dict, void* key, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("java/util/Map");
+    jmethodID putMethod = env->GetMethodID(mapClass, "put", 
+        "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    env->CallObjectMethod((jobject)dict, putMethod, (jobject)key, (jobject)val);
+    env->DeleteLocalRef((jobject)key);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_dict_setx(void* obj, void* dict, void* key, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("com/buildz/xf/Args");
+    jmethodID putMethod = env->GetMethodID(mapClass, "put", 
+        "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    env->CallObjectMethod((jobject)dict, putMethod, (jobject)key, (jobject)val);
+    env->DeleteLocalRef((jobject)key);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_list_add(void* obj, void* list, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("java/util/List");
+    jmethodID addMethod = env->GetMethodID(mapClass, "add", 
+        "(Ljava/lang/Object;)Z");
+    env->CallObjectMethod((jobject)list, addMethod, val);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_list_addx(void* obj, void* list, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("com/buildz/xf/Args");
+    jmethodID addMethod = env->GetMethodID(mapClass, "add", 
+        "(Ljava/lang/Object;)Z");
+    env->CallObjectMethod((jobject)list, addMethod, val);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void* fc_exp(void* obj, const char* s){
+    JNIEnv* env = (JNIEnv*) obj;
+    jstring str = env->NewStringUTF(s);
+    jclass mapClass = env->FindClass("java/lang/Exception");
+    jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "(Ljava/lang/String;)V");
+    jobject exp = env->NewObject(mapClass, initMethod, str);
+    env->DeleteLocalRef(mapClass);
+    return (void*)exp;
+}
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
+  (JNIEnv *env, jobject it, jstring s){
+    return (jobject)loads_mtds(env->GetStringUTFChars(s, nullptr), (void*)env, fc_create, fc_dict_set, fc_list_add, fc_exp);
+  }
+
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloadx
+  (JNIEnv *env, jobject it, jstring s){
+    return (jobject)loadx_mtds(env->GetStringUTFChars(s, nullptr), (void*)env, fc_create, fc_dict_setx, fc_list_addx, fc_exp);
+  }

{buildz-0.7.3 → buildz-0.7.5/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.3
+Version: 0.7.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.7.3 → buildz-0.7.5}/buildz.egg-info/SOURCES.txt

@@ -316,6 +316,13 @@ buildz/xf/cpp/loaderz/deal/spt.cpp
 buildz/xf/cpp/loaderz/deal/spt.h
 buildz/xf/cpp/loaderz/deal/str.cpp
 buildz/xf/cpp/loaderz/deal/str.h
+buildz/xf/java/Test.java
+buildz/xf/java/all.sh
+buildz/xf/java/com/buildz/xf/Args.java
+buildz/xf/java/com/buildz/xf/Loader.java
+buildz/xf/java/com/buildz/xf/LoaderJNI.java
+buildz/xf/java/com/buildz/xf/cpp/com_buildz_xf_LoaderJNI.h
+buildz/xf/java/com/buildz/xf/cpp/jxf.cpp
 buildz/xf/loader/base.py
 buildz/xf/loader/buffer.py
 buildz/xf/loader/exp.py

{buildz-0.7.3 → buildz-0.7.5}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.7.3',
+    version = '0.7.5',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',

buildz-0.7.3/buildz/xf/cpp/setup_mingw32.py

@@ -1,8 +0,0 @@
-#
-import sys
-if len(sys.argv)==1:
-    sys.argv.append("build_ext")
-    sys.argv.append("--inplace")
-if sys.platform =='win32':
-    sys.argv.append("--compiler=mingw32")
-import setup