Skip to content

Commit 883a6b1

Browse files
committed
tools:uard star gui tools support windows
Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
1 parent fea7def commit 883a6b1

4 files changed

Lines changed: 23 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ jobs:
8181
# replace pkexec with sudo for ci
8282
sed -i 's/pkexec/sudo/g' build.sh
8383
./build.sh
84+
# perupload
85+
sudo rm -rf ./output/rootfs/bootfs ./output/rootfs/rootfs ./output/rootfs/target
8486
tar -czf build.tar.gz output/ update_tools/ run.sh update_tools.sh
8587
tar -czf toolchain.tar.gz /opt/gcc-riscv64-unknown-linux-gnu /opt/gcc-riscv64-unknown-elf
86-
du -sh /opt/gcc-riscv64-unknown-linux-gnu
87-
du -sh /opt/gcc-riscv64-unknown-elf
8888
8989
- name: Upload build asserts
9090
uses: actions/upload-artifact@v2.2.4
@@ -194,7 +194,7 @@ jobs:
194194
fi
195195
}
196196
197-
qemu_windows_build:
197+
qemu_w64_build:
198198
runs-on: ubuntu-20.04
199199
steps:
200200
- uses: actions/checkout@v2
@@ -204,19 +204,19 @@ jobs:
204204
run: |
205205
cd qemu-6.0.0
206206
./tests/docker/docker.py --engine docker build -t qemu/fedora -f tests/docker/dockerfiles/fedora.docker --registry registry.gitlab.com/qemu-project/qemu --add-current-user
207-
207+
208208
- uses: addnab/docker-run-action@v3
209209
with:
210210
image: qemu/fedora:latest
211211
options: -w /home/runner/work/quard_star_tutorial/quard_star_tutorial -v /home/runner:/home/runner
212212
shell: bash -l {0}
213213
run: |
214214
./build.sh qemu_w64
215-
215+
216216
- name: Upload build asserts
217217
uses: actions/upload-artifact@v2.2.4
218218
with:
219-
name: qemu_windows_x64
219+
name: qemu_w64
220220
path: |
221221
output/qemu_w64
222222
run.bat
@@ -230,7 +230,7 @@ jobs:
230230
uses: jurplel/install-qt-action@v2.14.0
231231
with:
232232
version: '5.12.12'
233-
233+
234234
- name: Install prerequisites
235235
shell: bash -l {0}
236236
run: |
@@ -253,6 +253,7 @@ jobs:
253253
name: quard_star_tools
254254
path: |
255255
./quard_star_tools/release/out/quard_star_tools
256+
./quard_star_tools/run_quard_star_tools.sh
256257
257258
quard_star_tools_w64_build:
258259
runs-on: windows-2019
@@ -287,3 +288,4 @@ jobs:
287288
name: quard_star_tools_w64
288289
path: |
289290
./quard_star_tools/release/out
291+
./quard_star_tools/run_quard_star_tools.bat

quard_star_tools/boardview/boardwindow.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ BoardWindow::~BoardWindow()
6363

6464
void BoardWindow::powerSwitch(bool power)
6565
{
66+
#if defined(Q_OS_WIN)
67+
QString program = envPath + "/qemu_w64/qemu-system-riscv64.exe";
68+
#elif defined(Q_OS_LINUX)
6669
QString program = envPath + "/qemu/bin/qemu-system-riscv64";
70+
#else
71+
QString program = envPath + "qemu-system-riscv64";
72+
#endif
6773
QStringList arguments = {
6874
"-M", "quard-star,mask-rom-path="+maskromImgPath,
6975
"-m", "1G",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
3+
%cd%/gui_tools/quard_star_tools_w64/quard_star_tools.exe -e %cd%/output
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
5+
$SHELL_FOLDER/gui_tools/quard_star_tools -e $SHELL_FOLDER/output

0 commit comments

Comments
 (0)