From 5140166685c1c87785e87fcd4009cea419bd9a80 Mon Sep 17 00:00:00 2001 From: buddygr Date: Wed, 13 Sep 2023 18:57:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 51f1a32..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -# These are supported funding model platforms - -patreon: riverfor -custom: ["https://paypal.me/qpyriver"] -- Gitee From bf111547de69c0a353d4d11831eef9af9b27b6ce Mon Sep 17 00:00:00 2001 From: buddygr Date: Thu, 14 Sep 2023 09:57:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qbaselib | 2 +- qftplib | 2 +- qpysdk/src/main/jni | 2 +- qpysl4a | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qbaselib b/qbaselib index bac1576..c6ff3c5 160000 --- a/qbaselib +++ b/qbaselib @@ -1 +1 @@ -Subproject commit bac1576d3ee165ca6a135276f07685a3ffc5e44d +Subproject commit c6ff3c52130cb5d97861f5f6a0076edb48dd4b97 diff --git a/qftplib b/qftplib index 1ee9699..0e259e3 160000 --- a/qftplib +++ b/qftplib @@ -1 +1 @@ -Subproject commit 1ee969909fc790d9e7382246afbb6c96be4fc9c7 +Subproject commit 0e259e3112734f9e249861e3fef76a2f462725f2 diff --git a/qpysdk/src/main/jni b/qpysdk/src/main/jni index b18e932..4c7dca5 160000 --- a/qpysdk/src/main/jni +++ b/qpysdk/src/main/jni @@ -1 +1 @@ -Subproject commit b18e932ee2ec7826facef8ad8b1f2417034103e6 +Subproject commit 4c7dca5e91d0c2e858dc02c93a136f9a82ad259a diff --git a/qpysl4a b/qpysl4a index b73a584..be78772 160000 --- a/qpysl4a +++ b/qpysl4a @@ -1 +1 @@ -Subproject commit b73a58468334023ccd6f7825dc13dd1d2db82be8 +Subproject commit be78772b8c201ccfe1bc9b552ccda9a946a9a51a -- Gitee From fc611726ddec6cdf8900dc8c36acd7a81d455dad Mon Sep 17 00:00:00 2001 From: buddygr Date: Thu, 14 Sep 2023 13:23:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +----- gradle/wrapper/gradle-wrapper.properties | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/.gitignore b/.gitignore index 7413caa..2e32483 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,6 @@ local.properties qbaselib.iml .* !/.gitignore -gradle-wrapper.properties -Android.mk -qpython/src/main/jni/python/libpython2.7.b -qpysdk/src/main/obj values-fr values-tr build.gradle.new @@ -30,4 +26,4 @@ qpython/op qpysl4a qbaselib qftplib -qpysdk\src\main\jni \ No newline at end of file +qpysdk\src\main\jni diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..8ced95b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,2 @@ +#Sun Jul 16 23:43:00 CST 2023 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -- Gitee From 19a44b565b397ec13197062a090dc70ce4638222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=98=E7=9D=80=E8=88=B9?= Date: Thu, 14 Sep 2023 05:24:45 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20qpyt?= =?UTF-8?q?hon/libs/arm64-v8a/lib-qpython3-setup.so?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qpython/libs/arm64-v8a/lib-qpython3-setup.so | 48 -------------------- 1 file changed, 48 deletions(-) delete mode 100644 qpython/libs/arm64-v8a/lib-qpython3-setup.so diff --git a/qpython/libs/arm64-v8a/lib-qpython3-setup.so b/qpython/libs/arm64-v8a/lib-qpython3-setup.so deleted file mode 100644 index ff4f7a4..0000000 --- a/qpython/libs/arm64-v8a/lib-qpython3-setup.so +++ /dev/null @@ -1,48 +0,0 @@ -#!/system/bin/sh - -BIN=$HOME/bin - -if [ "$1" == "Setup" ]; then -ln -s -f $ANDROID_NATIVE_LIBRARY/lib-qpython3-setup.so $BIN/qpython3.sh -$BIN/qpython3.sh setup -exit -fi - -if [ "$1" != "setup" ]; then -exit -fi - -for i in python python3 python3.11 -do -ln -s $ANDROID_NATIVE_LIBRARY/lib-python.so $BIN/$i -done - -for i in busybox bash sh -do -ln -s $ANDROID_NATIVE_LIBRARY/lib-busybox.so $BIN/$i -done - -i=$ANDROID_NATIVE_LIBRARY/lib-7z -ln -s $i-elf.so $HOME/lib/p7zip/7z -ln -s $i-txt.so $BIN/7z - -for i in 1 2 -do -i=$HOME/private$i.7z -. 7z x $i -aoa -o$HOME -rm $i -done - -i=$HOME/public.7z -. 7z x $i -aoa -o$ANDROID_PUBLIC -rm $i - -for i in $(ls $BIN) -do -chmod 777 $BIN/$i -done - -python $HOME/setup.py - -sleep 3 -exit -- Gitee From 1ac5507951fccbf8c41eb2a3ec322f4d7730f9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=98=E7=9D=80=E8=88=B9?= Date: Thu, 14 Sep 2023 05:26:05 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4lib-qpy?= =?UTF-8?q?thon3-setup.so?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 乘着船 --- qpython/libs/arm64-v8a/lib-qpython3-setup.so | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 qpython/libs/arm64-v8a/lib-qpython3-setup.so diff --git a/qpython/libs/arm64-v8a/lib-qpython3-setup.so b/qpython/libs/arm64-v8a/lib-qpython3-setup.so new file mode 100644 index 0000000..ff4f7a4 --- /dev/null +++ b/qpython/libs/arm64-v8a/lib-qpython3-setup.so @@ -0,0 +1,48 @@ +#!/system/bin/sh + +BIN=$HOME/bin + +if [ "$1" == "Setup" ]; then +ln -s -f $ANDROID_NATIVE_LIBRARY/lib-qpython3-setup.so $BIN/qpython3.sh +$BIN/qpython3.sh setup +exit +fi + +if [ "$1" != "setup" ]; then +exit +fi + +for i in python python3 python3.11 +do +ln -s $ANDROID_NATIVE_LIBRARY/lib-python.so $BIN/$i +done + +for i in busybox bash sh +do +ln -s $ANDROID_NATIVE_LIBRARY/lib-busybox.so $BIN/$i +done + +i=$ANDROID_NATIVE_LIBRARY/lib-7z +ln -s $i-elf.so $HOME/lib/p7zip/7z +ln -s $i-txt.so $BIN/7z + +for i in 1 2 +do +i=$HOME/private$i.7z +. 7z x $i -aoa -o$HOME +rm $i +done + +i=$HOME/public.7z +. 7z x $i -aoa -o$ANDROID_PUBLIC +rm $i + +for i in $(ls $BIN) +do +chmod 777 $BIN/$i +done + +python $HOME/setup.py + +sleep 3 +exit -- Gitee