Skip to content

Commit 953dcd0

Browse files
committed
2.25; add OpenConsole
1 parent beb9c91 commit 953dcd0

4 files changed

Lines changed: 23 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/package
33
/dist
44
/llvm-mingw-*
5+
/terminal-*
56
/RedPanda-CPP-*
67
*.7z
78
*.exe

build.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash
22

3-
set -xe
3+
set -euxo pipefail
44

5-
LLVM_MINGW_VERSION="20230614"
6-
REDPANDA_VERSION="2.24"
5+
LLVM_MINGW_VERSION="20231017"
6+
WINDOWS_TERMINAL_VERSION="1.18.2822.0"
7+
REDPANDA_VERSION="2.25"
78

89
_QMAKE="/clangarm64/qt5-static/bin/qmake"
910
_MAKE="mingw32-make"
@@ -12,6 +13,9 @@ _NSIS="/mingw32/bin/makensis"
1213
_LLVM_MINGW_DIRECTORY="llvm-mingw-${LLVM_MINGW_VERSION}-ucrt-aarch64"
1314
_LLVM_MINGW_ARCHIVE="${_LLVM_MINGW_DIRECTORY}.zip"
1415

16+
_WINDOWS_TERMINAL_DIRECTORY="terminal-${WINDOWS_TERMINAL_VERSION}"
17+
_WINDOWS_TERMINAL_ARCHIVE="Microsoft.WindowsTerminal_${WINDOWS_TERMINAL_VERSION}_arm64.zip"
18+
1519
_REDPANDA_SOURCE_DIRECTORY="RedPanda-CPP-${REDPANDA_VERSION}"
1620
_REDPANDA_SOURCE_ARCHIVE="${_REDPANDA_SOURCE_DIRECTORY}.zip"
1721

@@ -27,6 +31,14 @@ prepare-llvm-mingw() {
2731
[[ -d ${_LLVM_MINGW_DIRECTORY} ]] || ( download-llvm-mingw && 7z x ${_LLVM_MINGW_ARCHIVE} )
2832
}
2933

34+
download-windows-terminal() {
35+
[[ -f ${_WINDOWS_TERMINAL_ARCHIVE} ]] || curl -LO "https://github.com/microsoft/terminal/releases/download/v${WINDOWS_TERMINAL_VERSION}/${_WINDOWS_TERMINAL_ARCHIVE}"
36+
}
37+
38+
prepare-openconsole() {
39+
[[ -f ${_WINDOWS_TERMINAL_DIRECTORY} ]] || ( download-windows-terminal && 7z x ${_WINDOWS_TERMINAL_ARCHIVE} )
40+
}
41+
3042
download-redpanda-source() {
3143
[[ -f ${_REDPANDA_SOURCE_ARCHIVE} ]] || curl -L -o ${_REDPANDA_SOURCE_ARCHIVE} "https://github.com/royqh1979/RedPanda-CPP/archive/refs/tags/${REDPANDA_VERSION}.zip"
3244
}
@@ -41,6 +53,8 @@ build() {
4153
time ${_MAKE} -j$(nproc)
4254
${_MAKE} install
4355
popd
56+
57+
cp ${_WINDOWS_TERMINAL_DIRECTORY}/OpenConsole.exe ${_PKGDIR}
4458
}
4559

4660
7z-repack() {
@@ -106,6 +120,7 @@ dist() {
106120

107121
main() {
108122
prepare-llvm-mingw
123+
prepare-openconsole
109124
prepare-redpanda-source
110125
build
111126
package-none

redpanda-woa-clang.nsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Section "$(SectionMainName)" SectionMain
9292
; Write required files
9393
File "RedPandaIDE.exe"
9494
File "ConsolePauser.exe"
95+
File "OpenConsole.exe"
9596
File "redpanda-win-git-askpass.exe"
9697
File "astyle.exe"
9798
File "LICENSE"
@@ -463,6 +464,7 @@ Section "Uninstall"
463464
Delete "$INSTDIR\NEWS.md"
464465
Delete "$INSTDIR\RedPandaIDE.exe"
465466
Delete "$INSTDIR\ConsolePauser.exe"
467+
Delete "$INSTDIR\OpenConsole.exe"
466468
Delete "$INSTDIR\redpanda-win-git-askpass.exe"
467469
Delete "$INSTDIR\astyle.exe"
468470
Delete "$INSTDIR\LICENSE"

redpanda-woa-none.nsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Section "$(SectionMainName)" SectionMain
9292
; Write required files
9393
File "RedPandaIDE.exe"
9494
File "ConsolePauser.exe"
95+
File "OpenConsole.exe"
9596
File "redpanda-win-git-askpass.exe"
9697
File "astyle.exe"
9798
File "LICENSE"
@@ -455,6 +456,7 @@ Section "Uninstall"
455456
Delete "$INSTDIR\NEWS.md"
456457
Delete "$INSTDIR\RedPandaIDE.exe"
457458
Delete "$INSTDIR\ConsolePauser.exe"
459+
Delete "$INSTDIR\OpenConsole.exe"
458460
Delete "$INSTDIR\redpanda-win-git-askpass.exe"
459461
Delete "$INSTDIR\astyle.exe"
460462
Delete "$INSTDIR\LICENSE"

0 commit comments

Comments
 (0)