diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 50 | ||||
| -rw-r--r-- | h7toolpc-bin.install | 5 |
3 files changed, 45 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = h7toolpc-bin pkgdesc = H7-TOOL 的 PC 上位机，支持串口、CAN、示波器、CMSIS-DAP、DS18B20、RTT Viewer、脱机烧录等 pkgver = 2.0.5 - pkgrel = 3 + pkgrel = 4 url = http://www.armbbs.cn/forum.php?mod=viewthread&tid=95468 install = h7toolpc-bin.install arch = x86_64 @@ -19,8 +19,8 @@ pkgbase = h7toolpc-bin source = h7toolPC_release.zip::http://www.armfly.com/download/H7-TOOL/h7toolPC_release(V2.0.5).zip source = icons.tar.gz source = h7toolpc-bin.install - sha256sums = 13A02CB749BC6E5C69986EE231E0647ED829C5D5247BD77D4509A91093F7E121 + sha256sums = 13a02cb749bc6e5c69986ee231e0647ed829c5d5247bd77d4509a91093f7e121 sha256sums = 6823224b5699dc17c41efdcbc8465554f007cb62cadea0aad9b67c08c5698142 - sha256sums = 10ebc665ba27ab7b38659e4b8fc9b88f45af0600aa6039ff3f563c5272988b99 + sha256sums = f642ff0a53b207ffbc37c6370699b4e0be56fbaaf879fbb6ec3462ebbc3debff pkgname = h7toolpc-bin @@ -2,7 +2,7 @@ pkgname=h7toolpc-bin pkgver=2.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="H7-TOOL 的 PC 上位机，支持串口、CAN、示波器、CMSIS-DAP、DS18B20、RTT Viewer、脱机烧录等" arch=('x86_64') url="http://www.armbbs.cn/forum.php?mod=viewthread&tid=95468" @@ -19,9 +19,9 @@ install=${pkgname}.install source=("${pkgname/pc-bin/PC_release}.zip::http://www.armfly.com/download/H7-TOOL/${pkgname/pc-bin/PC_release}(V${pkgver}).zip" "icons.tar.gz" "${pkgname}.install") -sha256sums=('13A02CB749BC6E5C69986EE231E0647ED829C5D5247BD77D4509A91093F7E121' +sha256sums=('13a02cb749bc6e5c69986ee231e0647ed829c5d5247bd77d4509a91093f7e121' '6823224b5699dc17c41efdcbc8465554f007cb62cadea0aad9b67c08c5698142' - '10ebc665ba27ab7b38659e4b8fc9b88f45af0600aa6039ff3f563c5272988b99') + 'f642ff0a53b207ffbc37c6370699b4e0be56fbaaf879fbb6ec3462ebbc3debff') noextract=("${pkgname/pc-bin/PC_release}.zip" "icons.tar.gz") @@ -57,15 +57,47 @@ REGEDIT4 "Lucida Sans Unicode"=str(7):"${_ftname}" "Microsoft Sans Serif"=str(7):"${_ftname}" "Tahoma"=str(7):"${_ftname}" +"Lucida Sans Unicode"="${_ftname}" +"Microsoft Sans Serif"="${_ftname}" +"Microsoft YaHei"="${_ftname}" +"微软雅黑"="${_ftname}" +"宋体"="${_ftname}" +"新細明體"="${_ftname}" +"DFKai-SB"="${_ftname}" +"FangSong"="${_ftname}" +"KaiTi"="${_ftname}" +"Microsoft JhengHei"="${_ftname}" +"Microsoft YaHei"="${_ftname}" +"MingLiU"="${_ftname}" +"NSimSun"="${_ftname}" +"PMingLiU"="${_ftname}" +"SimHei"="${_ftname}" +"SimKai"="${_ftname}" +"SimSun"="${_ftname}" [HKEY_CURRENT_USER\Software\Wine\X11 Driver] +"ClientSideAntiAliasWithCore"="N" +"ClientSideAntiAliasWithRender"="N" "ClientSideWithRender"="N" +[HKEY_CURRENT_USER\Control Panel\Desktop] +"FontSmoothing"="2" +"FontSmoothingType"=dword:00000002 +"FontSmoothingGamma"=dword:00000578 +"FontSmoothingOrientation"=dword:00000001 + +[HKEY_LOCAL_MACHINE\Software\Wine\Ports] +"COM1"="/dev/ttyUSB0" +"COM2"="/dev/ttyUSB1" +"COM3"="/dev/ttyUSB2" +"COM4"="/dev/ttyUSB3" +"COM5"="/dev/ttyUSB4" +"COM6"="/dev/ttyUSB5" +"COM7"="/dev/ttyACM0" EOF install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname%-bin}" << EOF #!/bin/bash -export LC_CTYPE="zh_CN.UTF-8" export WINEARCH=win32 WINEPREFIX="$HOME/.${pkgname%-bin}/wine" if [ ! -d "$HOME"/.${pkgname%-bin} ] ; then @@ -89,10 +121,11 @@ fi if [ ! -f "$HOME"/.${pkgname%-bin}/fontok ] ; then touch "$HOME"/.${pkgname%-bin}/fontok || exit 1 - cd "$HOME"/.${pkgname%-bin}/wine && regedit ttffont.reg + cd "$HOME"/.${pkgname%-bin}/wine && regedit ttffont.reg && wineserver -k + wine "$HOME"/.${pkgname%-bin}/Driver/WinUSB/zadig-2.5.exe fi -wine "$HOME"/.${pkgname%-bin}/${pkgname%-bin} "$@" +wine "$HOME"/.${pkgname%-bin}/${pkgname%-bin} -opengl "$@" EOF install -Dm0644 /dev/stdin "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop" << EOF @@ -111,7 +144,6 @@ EOF install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname/-bin/-old}" << EOF #!/bin/bash -export LC_CTYPE="zh_CN.UTF-8" export WINEARCH=win32 WINEPREFIX="$HOME/.${pkgname%-bin}/wine" if [ ! -d "$HOME"/.${pkgname%-bin} ] ; then @@ -135,10 +167,10 @@ fi if [ ! -f "$HOME"/.${pkgname%-bin}/fontok ] ; then touch "$HOME"/.${pkgname%-bin}/fontok || exit 1 - cd "$HOME"/.${pkgname%-bin}/wine && regedit ttffont.reg + cd "$HOME"/.${pkgname%-bin}/wine && regedit ttffont.reg && wineserver -k fi - wine "$HOME"/.${pkgname%-bin}/${pkgname/-bin/-old} "$@" + wine "$HOME"/.${pkgname%-bin}/${pkgname/-bin/-old} -opengl"$@" EOF install -Dm0644 /dev/stdin "${pkgdir}/usr/share/applications/${pkgname/-bin/-old}.desktop" << EOF diff --git a/h7toolpc-bin.install b/h7toolpc-bin.install index 758315e1fdf8..0b1357b4e631 100644 --- a/h7toolpc-bin.install +++ b/h7toolpc-bin.install @@ -1,8 +1,5 @@ info() { - echo -e "Run h7toolpc once to install the wine environment,\r - and then run the following command to fix the font display" - echo -e "Install fonts patch" - echo -e "cd ~/.h7toolpc && patch -p0 < font.patch" + echo -e "H7-TOOL 的 PC 上位机，支持串口、CAN、示波器、CMSIS-DAP、DS18B20、RTT Viewer、脱机烧录等" } post_install() { info |