调整makefile

Merge pull request !10 from shenmo/N/A

.github/workflows/building-off-line-package-arm.yml

@@ -71,7 +71,7 @@ jobs:
           cd ..
           xz -T $cpu spark-deepin-wine-runner-off-line.tar
       - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: spark-deepin-wine-runner-off-line.tar.xz
           path: /home/runner/spark-deepin-wine-runner-off-line.tar.xz

Makefile

@@ -177,8 +177,63 @@ copy-files:
 remove-copy-files:
 	sudo rm -rfv /tmp/spark-deepin-wine-runner-builder
 
+package-deb-to-amd64:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: amd64/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-amd64.deb
+
+package-deb-to-arm64:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: arm64/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-arm64.deb
+
+package-deb-to-mips64el:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: mips64el/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-mips64el.deb
+
+package-deb-to-loongarch64:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: loongarch64/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-loongarch64.deb
+
+package-deb-to-loong64:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: loong64/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-loong64.deb
+
+package-deb-to-riscv64:
+	rm -rfv /tmp/wine-runner-package
+	dpkg -x spark-deepin-wine-runner.deb /tmp/wine-runner-package
+	dpkg -e spark-deepin-wine-runner.deb /tmp/wine-runner-package/DEBIAN
+	sudo chown -R root:root /tmp/wine-runner-package/opt
+	sudo chown -R root:root /tmp/wine-runner-package/usr
+	sed -i "s/Architecture: all/Architecture: riscv64/g" /tmp/wine-runner-package/DEBIAN/control
+	dpkg-deb -Z xz -z 0 -b /tmp/wine-runner-package spark-deepin-wine-runner-riscv64.deb
+
 package-deb:
 	make copy-files -j$(nproc)
+	sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder
 	dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
 	make remove-copy-files -j$(nproc)
 	# 构建 ace 包

Model/__init__.py

@@ -13,8 +13,8 @@ programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 # 优先为深度终端
 terminal = ""
 terminalList = [
-    "deepin-terminal",
     "gxde-terminal",
+    "deepin-terminal",
     "mate-terminal",
     "gnome-terminal",
     "xfce4-terminal"

deb/DEBIAN/postinst

@@ -19,12 +19,14 @@ python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud
 python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
 python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
 # 修改 box86/64 国内源错误数据
-if [ -f /etc/apt/sources.list.d/box64.list ]; then
+sudo rm /etc/apt/sources.list.d/box64.list -rfv
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
+sudo rm /etc/apt/sources.list.d/box86.list -rfv
-fi
+#if [ -f /etc/apt/sources.list.d/box64.list ]; then
-if [ -f /etc/apt/sources.list.d/box86.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
+#fi
-fi
+#if [ -f /etc/apt/sources.list.d/box86.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
+#fi
 echo 执行完成
 echo 移除旧组件
 if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
@@ -60,6 +62,6 @@ if [[ `arch` != "x86_64" ]]; then
 	rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
 fi
 # 设置目录权限，让用户可读可写，方便后续删除组件
-chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
+#chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
 # 向服务器返回安装数加1（不显示内容且忽略错误）
 python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true

deepin-wine-easy-packager.py

@@ -321,7 +321,7 @@ Encoding=UTF-8
 Type=Application
 X-Created-By=@@@Maintainer@@@
 Icon=@@@Icon@@@
-Exec="/opt/apps/@@@Package@@@/files/run.sh --uri %u"
+Exec="/opt/apps/@@@Package@@@/files/run.sh --uri %F"
 Name=@@@Name@@@
 Comment=@@@Description@@@
 MimeType=

deepin-wine-packager.py

@@ -636,7 +636,7 @@ Description: {e3_text.text()}
                 ["@@@MAINTAINER@@@", e4_text.text()],
                 ["@@@DESCRIPTION@@@", e3_text.text()],
                 ["@@@DESKTOP_EXEC@@@", 
-                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command} %u'''],
+                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command} %F'''],
                 ["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()],
                 ["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()],
                 ["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()]
@@ -1356,6 +1356,15 @@ try:
             wine[f"{programPath}/wine/{i}"] = f"{programPath}/wine/{i}"
 except:
     pass
+try:
+    for i in json.loads(readtxt(f"{get_home()}/.deepwinerunner/wine/winelist.json")):
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}.7z"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}.7z"] = f"{get_home()}/.deepwinerunner/wine/{i}.7z"
+            continue
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}"] = f"{get_home()}/.deepwinerunner/wine/{i}"
+except:
+    pass
 os.chdir("/")
 iconUiList = []
 helperConfigPath = None

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.2",
+    "Version": "4.1.3",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

mainwindow.py

@@ -2162,6 +2162,20 @@ def TransLog():
 # 加载配置
 ###########################
 
+if not os.path.exists(get_home() + "/.deepwinerunner/wine/"):  # 如果没有配置文件夹
+    os.makedirs(get_home() + "/.deepwinerunner/wine/")  # 创建配置文件夹
+try:
+    shutil.copy(f"{programPath}/wine/installwine.py", get_home() + "/.deepwinerunner/wine/installwine.py")
+    shutil.copy(f"{programPath}/globalenv.py", get_home() + "/.deepwinerunner/globalenv.py")
+    shutil.copy(f"{programPath}/launch.sh", get_home() + "/.deepwinerunner/launch.sh")
+    if os.path.exists(get_home() + "/.deepwinerunner/Model"):
+        shutil.rmtree(get_home() + "/.deepwinerunner/Model")
+    shutil.copytree(f"{programPath}/Model", get_home() + "/.deepwinerunner/Model")
+    os.system(f"chmod 777 -Rv '{get_home()}/.deepwinerunner/launch.sh'")
+except:
+    traceback.print_exc()
+    exit()
+
 if not os.path.exists(get_home() + "/.config/"):  # 如果没有配置文件夹
     os.mkdir(get_home() + "/.config/")  # 创建配置文件夹
 if not os.path.exists(get_home() + "/.config/deepin-wine-runner"):  # 如果没有配置文件夹
@@ -2304,9 +2318,10 @@ def CheckWine():
                 traceback.print_exc()    
 
             # 不再从列表读取，直接读目录
-            for i in os.listdir(f"{programPath}/wine/"):
+            for i in os.listdir(f"{programPath}/wine/") + os.listdir(f"{get_home()}/.deepwinerunner/wine/"):
             #for i in json.loads(readtxt(f"{programPath}/wine/winelist.json")):
-                if os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}"):
+                if ((os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}")) or
+                    (os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}") and os.path.isdir(f"{get_home()}/.deepwinerunner/wine/{i}"))):
                     name = ""
                     qemuInstall = False
                     nameValue = [["", ""]]
@@ -2394,6 +2409,10 @@ def CheckWine():
                                 wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/{j}"
                                 canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
                                 untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
+                            if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"):        
+                                wine[f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"] = f"{k[1]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"
+                                canUseWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
+                                untipsWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
             
         except:
             traceback.print_exc()
@@ -2478,12 +2497,9 @@ exe路径\' 参数 \'
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复没有 dxvk 的问题
+updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复安全问题
-※2、修复虚拟机功能异常的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IASRHG）
+※2、更新 dxvk 版本至 2.5
-※3、修复打包器生成的 deb 不可用的问题（https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IAXE1T）
+※3、修复打包器生成的 deb 包参数问题                                                                                          
-※4、打包器针对 GXDE OS 进行优化
-※5、修复虚拟机因无法创建磁盘导致崩溃的问题
-※6、修复中文问题                                                  
 ''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
@@ -2836,7 +2852,7 @@ installWineHQ.triggered.connect(InstallWineHQ)
 installWineHQOrg.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallNewWineHQOrg.sh"]).start())
 installLat.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallLat.sh"]).start())
 def InstallMoreWine():
-    os.system(f"'{programPath}/wine/installwine'")
+    os.system(get_home() + "/.deepwinerunner/wine/installwine.py")
     # 更新 Wine 列表
     CheckWine()
     o1.clear()

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.1.1.2",
+    "Version": "4.1.3",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

package-script/template/run.sh

@@ -83,7 +83,7 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
+if [ "$APPRUN_CMD" = "spark-wine9" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
 export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
 export WINEDLLOVERRIDES="control.exe=d"

packager-config/run.sh

@@ -122,7 +122,7 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
+if [ "$APPRUN_CMD" = "spark-wine9" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
 #export WINEDLLOVERRIDES="mscoree=d,mshtml=d,control.exe=d"
 export WINEDLLOVERRIDES="control.exe=d"