gfdgd-xi/deep-wine-runner
gfdgd-xi/deep-wine-runner
1
0
Fork 0
mirror of https://gitee.com/gfdgd-xi/deep-wine-runner synced 2025-05-20 06:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复打包器若干bug；修改wine封装入deb机制以便可以被uos商店正常签名

Browse Source
This commit is contained in:
gfdgd xi 2024-08-04 22:22:37 +08:00
parent 96319869b6
commit 6863e58413
4 changed files with 42 additions and 16 deletions

1
Makefile

@ -139,6 +139,7 @@ copy-files:
cp -rv globalenv.py deb/opt/apps/deepin-wine-runner cp -rv globalenv.py deb/opt/apps/deepin-wine-runner
cp -rv local deb/opt/apps/deepin-wine-runner cp -rv local deb/opt/apps/deepin-wine-runner
cp -rv WindowModule.py deb/opt/apps/deepin-wine-runner cp -rv WindowModule.py deb/opt/apps/deepin-wine-runner
cp -rv welcome.py deb/opt/apps/deepin-wine-runner
cp -rv main.py deb/opt/apps/deepin-wine-runner/deepin-wine-runner cp -rv main.py deb/opt/apps/deepin-wine-runner/deepin-wine-runner
mkdir -pv deb/opt/apps/deepin-wine-runner/entries/ mkdir -pv deb/opt/apps/deepin-wine-runner/entries/
cp -rv deb/usr/share/applications deb/opt/apps/deepin-wine-runner/entries/applications cp -rv deb/usr/share/applications deb/opt/apps/deepin-wine-runner/entries/applications

53
deepin-wine-packager.py

@ -424,7 +424,7 @@ class make_deb_threading(QtCore.QThread):
readtxt(f"{programPath}/packager-config/run-old.sh"), readtxt(f"{programPath}/packager-config/run-old.sh"),
readtxt(f"{programPath}/packager-config/run.sh") readtxt(f"{programPath}/packager-config/run.sh")
][chooseWineHelperValue.isChecked()], ][chooseWineHelperValue.isChecked()],
"info": readtxt(f"{programPath}/packager-config/uos-info.sh") "info": readtxt(f"{programPath}/packager-config/uos-info.json")
}, },
{ {
# ARM64 通用 wine 打包配置文件 # ARM64 通用 wine 打包配置文件
@ -547,11 +547,10 @@ true
self.label.emit("正在处理 Wine") self.label.emit("正在处理 Wine")
if os.path.exists(wine[wineVersion.currentText()]): if os.path.exists(wine[wineVersion.currentText()]):
shutil.copy(f"{programPath}/gtkGetFileNameDlg", f"{debPackagePath}/opt/apps/{e1_text.text()}/files/gtkGetFileNameDlg") shutil.copy(f"{programPath}/gtkGetFileNameDlg", f"{debPackagePath}/opt/apps/{e1_text.text()}/files/gtkGetFileNameDlg")
if wine[wineVersion.currentText()][-3:] == ".7z": #self.run_command(f"7z a -snh -snl '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z' '{wine[wineVersion.currentText()]}/*'")
# 都有了为什么要打包呢？ # 不打包为 7z 资源包以让 UOS 可以签名到这些文件
shutil.copy(wine[wineVersion.currentText()], f"{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z") self.run_command(f"mkdir -pv '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine'")
else: self.run_command(f"cp -r '{wine[wineVersion.currentText()]}/'* '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine'")
self.run_command(f"7z a -snh -snl '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z' '{wine[wineVersion.currentText()]}/*'")
############### ###############
# 复制文件 # 复制文件
############### ###############
@ -617,25 +616,37 @@ Description: {e3_text.text()}
write_txt(f"{debPackagePath}/DEBIAN/prerm", debInformation[debArch.currentIndex()]["prerm"]) write_txt(f"{debPackagePath}/DEBIAN/prerm", debInformation[debArch.currentIndex()]["prerm"])
except: except:
pass pass
line = "\\"
if iconUiList[0][2].text().replace(" ", "") == "":
command = f"--uri {iconUiList[0][2].text()}"
else:
command = iconUiList[0][2].text()
replaceMap = [ replaceMap = [
["@@@BOTTLENAME@@@", e5_text.text()], ["@@@BOTTLENAME@@@", e5_text.text()],
["@@@APPVER@@@", e2_text.text()], ["@@@APPVER@@@", e2_text.text()],
["@@@EXEC_PATH@@@", e7_text.text()], ["@@@EXEC_PATH@@@", e7_text.text()],
["@@@DEB_PACKAGE_NAME@@@", e1_text.text()], ["@@@DEB_PACKAGE_NAME@@@", e1_text.text()],
["@@@APPRUN_CMD@@@", wine[wineVersion.currentText()]], ["@@@APPRUN_CMD@@@", [
wine[wineVersion.currentText()],
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
["@@@EXEC_NAME@@@", os.path.basename(e7_text.text().replace("\\", "/"))], ["@@@EXEC_NAME@@@", os.path.basename(e7_text.text().replace("\\", "/"))],
["@@@ARCH@@@", debFirstArch.currentText()], ["@@@ARCH@@@", debFirstArch.currentText()],
["@@@APP_NAME@@@", e8_text.text()], ["@@@APP_NAME@@@", e8_text.text()],
["@@@MAINTAINER@@@", e4_text.text()], ["@@@MAINTAINER@@@", e4_text.text()],
["@@@DESCRIPTION@@@", e3_text.text()], ["@@@DESCRIPTION@@@", e3_text.text()],
["@@@ICON@@@", [a, a[0]][type(a) == list]], # a 是图标（为什么当初要取这个变量名）
# 如果只有一个图标则为 str,两个及以上则为 list
["@@@DESKTOP_EXEC@@@", ["@@@DESKTOP_EXEC@@@",
f'''"/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(iconUiList[0][0].text().replace(line, "/")))[0]}.sh" {command}'''], f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command}'''],
["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()], ["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()],
["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()], ["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()],
["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()] ["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()]
] ]
# a 是图标（为什么当初要取这个变量名）
# 如果只有一个图标则为 str,两个及以上则为 list
if (type(a) == list):
replaceMap.append(["@@@ICON@@@", a[0]])
else:
replaceMap.append(["@@@ICON@@@", a])
# 配置 postinst 和 postrm # 配置 postinst 和 postrm
if debInformation[debArch.currentIndex()]["postinst"] != "": if debInformation[debArch.currentIndex()]["postinst"] != "":
write_txt(f"{debPackagePath}/DEBIAN/postinst", ReplaceText(debInformation[debArch.currentIndex()]["postinst"], replaceMap)) write_txt(f"{debPackagePath}/DEBIAN/postinst", ReplaceText(debInformation[debArch.currentIndex()]["postinst"], replaceMap))
@ -653,25 +664,36 @@ Description: {e3_text.text()}
write_txt("{}/opt/apps/{}/entries/applications/{}.desktop".format(debPackagePath, e1_text.text(), e1_text.text()), desktopFile) write_txt("{}/opt/apps/{}/entries/applications/{}.desktop".format(debPackagePath, e1_text.text(), e1_text.text()), desktopFile)
else: else:
for i in iconUiList: for i in iconUiList:
if i[2].text().replace(" ", "") == "":
command = f"--uri {i[2].text()}"
else:
command = i[2].text()
replaceMap = [ replaceMap = [
["@@@BOTTLENAME@@@", e5_text.text()], ["@@@BOTTLENAME@@@", e5_text.text()],
["@@@APPVER@@@", e2_text.text()], ["@@@APPVER@@@", e2_text.text()],
["@@@EXEC_PATH@@@", i[0].text()], ["@@@EXEC_PATH@@@", i[0].text()],
["@@@DEB_PACKAGE_NAME@@@", e1_text.text()], ["@@@DEB_PACKAGE_NAME@@@", e1_text.text()],
["@@@APPRUN_CMD@@@", wine[wineVersion.currentText()]], ["@@@APPRUN_CMD@@@", [
wine[wineVersion.currentText()],
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
["@@@EXEC_NAME@@@", os.path.basename(i[0].text().replace("\\", "/"))], ["@@@EXEC_NAME@@@", os.path.basename(i[0].text().replace("\\", "/"))],
["@@@ARCH@@@", debFirstArch.currentText()], ["@@@ARCH@@@", debFirstArch.currentText()],
["@@@APP_NAME@@@", i[3].text()], ["@@@APP_NAME@@@", i[3].text()],
["@@@MAINTAINER@@@", e4_text.text()], ["@@@MAINTAINER@@@", e4_text.text()],
["@@@DESCRIPTION@@@", e3_text.text()], ["@@@DESCRIPTION@@@", e3_text.text()],
["@@@ICON@@@", [a, a[0]][type(a) == list]], # a 是图标（为什么当初要取这个变量名）
# 如果只有一个图标则为 str,两个及以上则为 list
["@@@DESKTOP_EXEC@@@", ["@@@DESKTOP_EXEC@@@",
f'''"/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, "/")))[0]}.sh" {command}'''], f'''"/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, "/")))[0]}.sh" {command}'''],
["@@@DESKTOP_NAME@@@", i[3].text()], ["@@@DESKTOP_NAME@@@", i[3].text()],
["@@@DESKTOP_MIMETYPE@@@", i[5].text()], ["@@@DESKTOP_MIMETYPE@@@", i[5].text()],
["@@@DESKTOP_CATEGORIES@@@", i[1].currentText()] ["@@@DESKTOP_CATEGORIES@@@", i[1].currentText()]
] ]
# a 是图标（为什么当初要取这个变量名）
# 如果只有一个图标则为 str,两个及以上则为 list
if (type(a) == list):
replaceMap.append(["@@@ICON@@@", a[0]])
else:
replaceMap.append(["@@@ICON@@@", a])
line = "\\" line = "\\"
desktopFile = ReplaceText(readtxt(f"{programPath}/packager-config/app.desktop"), replaceMap) desktopFile = ReplaceText(readtxt(f"{programPath}/packager-config/app.desktop"), replaceMap)
write_txt(f"{debPackagePath}/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, '/')))[0]}.sh", ReplaceText(debInformation[debArch.currentIndex()]["run.sh"], replaceMap)) write_txt(f"{debPackagePath}/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, '/')))[0]}.sh", ReplaceText(debInformation[debArch.currentIndex()]["run.sh"], replaceMap))
@ -705,7 +727,10 @@ Description: {e3_text.text()}
################ ################
if not self.build: if not self.build:
self.label.emit("正在构建 deb 包……") self.label.emit("正在构建 deb 包……")
self.run_command("bash -c 'dpkg-deb -Z xz -z 0 -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text())) if (os.path.exists(wine[wineVersion.currentText()])):
self.run_command("bash -c 'dpkg-deb -Z xz -z 9 -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
else:
self.run_command("bash -c 'dpkg-deb -Z xz -z 0 -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
################ ################
# 删除临时文件 # 删除临时文件
################ ################

2
main.py

@ -148,7 +148,7 @@ class LeftWidget(QtWidgets.QWidget):
self.setLayout(self.mainLayout) self.setLayout(self.mainLayout)
# 左侧标题 # 左侧标题
self.lab1 = QtWidgets.QLabel("<h3>页面导航区</h3>") self.lab1 = QtWidgets.QLabel("<h2>页面导航区</h2>")
self.mainLayout.addWidget(self.lab1) self.mainLayout.addWidget(self.lab1)
# 新建页面面按钮 # 新建页面面按钮

2
packager-config/run.sh

@ -130,7 +130,7 @@ fi
##############>>>>>>>>>屏蔽mono和gecko安装器结束 ##############>>>>>>>>>屏蔽mono和gecko安装器结束
##############<<<<<<<<<解压自行封装的 Wine（如果存在的话） ##############<<<<<<<<<解压自行封装的 Wine（如果存在的话）
if [[ -e "$ARCHIVE_FILE_DIR/wine_archive.7z" ]]; then if [ -e "$ARCHIVE_FILE_DIR/wine_archive.7z" ]; then
WINE_BIN_DIR=`dirname $APPRUN_CMD` WINE_BIN_DIR=`dirname $APPRUN_CMD`
WINE_DIR=`dirname $WINE_BIN_DIR` WINE_DIR=`dirname $WINE_BIN_DIR`
extract_archive "$ARCHIVE_FILE_DIR/wine_archive.7z" "$ARCHIVE_FILE_DIR/wine_archive.md5sum" "$WINE_DIR" extract_archive "$ARCHIVE_FILE_DIR/wine_archive.7z" "$ARCHIVE_FILE_DIR/wine_archive.md5sum" "$WINE_DIR"