Skip to content

Commit 01c1d08

Browse files
committed
Изменено имя GUI приложения на v8_reader_wx.exe
- Обновлено CMakeLists.txt: целевая цель переименована из v8_reader_gui в v8_reader_wx - Добавлена переменная V8_READER_GUI_NAME для управления именем исполняемого файла - Обновлён workflow сборки: теперь собирается GUI приложение (v8_reader_wx) вместо CLI - Workflow проверяет наличие v8_reader_wx.exe и zlibstatic.lib на Windows - Workflow проверяет наличие v8_reader_wx и libz.a на Linux - CLI сборка отключена по умолчанию, только GUI
1 parent cd95aff commit 01c1d08

2 files changed

Lines changed: 41 additions & 26 deletions

File tree

.github/workflows/build-zlib.yml

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build zlib (Windows)
1+
name: Build v8_reader_wx (Windows + Linux)
22

33
on:
44
push:
@@ -33,31 +33,39 @@ jobs:
3333
run: |
3434
cmake -B build `
3535
-S . `
36-
-DV8_READER_BUILD_GUI=OFF `
37-
-DV8_READER_BUILD_CLI=ON `
36+
-DV8_READER_BUILD_GUI=ON `
37+
-DV8_READER_BUILD_CLI=OFF `
3838
-DV8_READER_BUILD_TESTS=OFF `
3939
-DCMAKE_BUILD_TYPE=Release
4040
4141
- name: Build project
4242
run: |
4343
cmake --build build --config Release -j
4444
45-
- name: Verify zlibstatic.lib
45+
- name: Verify v8_reader_wx.exe and zlibstatic.lib
4646
run: |
47+
Get-ChildItem -Recurse "build" -Filter "*.exe" | Select-Object FullName
4748
Get-ChildItem -Recurse "build" -Filter "*.lib" | Select-Object FullName
48-
if ((Test-Path "build/lib/zlibstatic.lib") -or (Test-Path "build/zlib_build/Release/zlibstatic.lib") -or (Test-Path "build/Release/zlibstatic.lib")) {
49-
Write-Host "SUCCESS: zlibstatic.lib created"
49+
$exe_found = (Test-Path "build/bin/v8_reader_wx.exe") -or (Test-Path "build/Release/v8_reader_wx.exe")
50+
$lib_found = (Test-Path "build/lib/zlibstatic.lib") -or (Test-Path "build/zlib_build/Release/zlibstatic.lib") -or (Test-Path "build/Release/zlibstatic.lib")
51+
52+
if ($exe_found -and $lib_found) {
53+
Write-Host "SUCCESS: v8_reader_wx.exe and zlibstatic.lib created"
54+
ls build/bin/
5055
ls build/lib/
5156
} else {
52-
Write-Error "FAILED: zlibstatic.lib not found"
57+
if (-not $exe_found) { Write-Error "FAILED: v8_reader_wx.exe not found" }
58+
if (-not $lib_found) { Write-Error "FAILED: zlibstatic.lib not found" }
5359
exit 1
5460
}
5561
5662
- name: Upload artifact
5763
uses: actions/upload-artifact@v4
5864
with:
59-
name: zlibstatic-windows
65+
name: v8-reader-wx-windows
6066
path: |
67+
build/bin/v8_reader_wx.exe
68+
build/Release/v8_reader_wx.exe
6169
build/lib/zlibstatic.lib
6270
build/zlib_build/Release/zlibstatic.lib
6371
build/Release/zlibstatic.lib
@@ -81,34 +89,37 @@ jobs:
8189
- name: Install dependencies
8290
run: |
8391
sudo apt-get update
84-
sudo apt-get install -y cmake build-essential
92+
sudo apt-get install -y cmake build-essential libwxgtk3.2-dev wx-common
8593
8694
- name: Configure CMake
8795
run: |
8896
cmake -B build \
8997
-S . \
90-
-DV8_READER_BUILD_GUI=OFF \
91-
-DV8_READER_BUILD_CLI=ON \
98+
-DV8_READER_BUILD_GUI=ON \
99+
-DV8_READER_BUILD_CLI=OFF \
92100
-DV8_READER_BUILD_TESTS=OFF \
93101
-DCMAKE_BUILD_TYPE=Release
94102
95-
- name: Build zlibstatic
103+
- name: Build project
96104
run: |
97-
cmake --build build --target zlibstatic -j$(nproc)
105+
cmake --build build -j$(nproc)
98106
99-
- name: Verify libz.a
107+
- name: Verify v8_reader_wx and libz.a
100108
run: |
101-
if [ -f "build/lib/libz.a" ]; then
102-
echo "SUCCESS: libz.a created"
109+
if [ -f "build/bin/v8_reader_wx" ] && [ -f "build/lib/libz.a" ]; then
110+
echo "SUCCESS: v8_reader_wx and libz.a created"
111+
ls -la build/bin/
103112
ls -la build/lib/
104113
else
105-
echo "FAILED: libz.a not found"
114+
echo "FAILED: v8_reader_wx or libz.a not found"
106115
exit 1
107116
fi
108117
109118
- name: Upload artifact
110119
uses: actions/upload-artifact@v4
111120
with:
112-
name: zlibstatic-linux
113-
path: build/lib/libz.a
121+
name: v8-reader-wx-linux
122+
path: |
123+
build/bin/v8_reader_wx
124+
build/lib/libz.a
114125
retention-days: 7

CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ option(V8_READER_BUILD_GUI "Собрать GUI приложение на wxWidge
1313
option(V8_READER_BUILD_CLI "Собрать консольное приложение" OFF)
1414
option(V8_READER_BUILD_TESTS "Собрать тесты" OFF)
1515

16+
# Имя исполняемого файла
17+
set(V8_READER_GUI_NAME "v8_reader_wx")
18+
1619
# Пути
1720
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
1821
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -112,27 +115,28 @@ if(V8_READER_BUILD_GUI)
112115
"${CMAKE_CURRENT_SOURCE_DIR}/apps/gui/*.h"
113116
)
114117

115-
add_executable(v8_reader_gui
118+
add_executable(v8_reader_wx
116119
${GUI_SOURCES}
117120
${GUI_HEADERS}
118121
)
119122

120-
target_link_libraries(v8_reader_gui
123+
target_link_libraries(v8_reader_wx
121124
PRIVATE
122125
v8_reader_lib
123126
${wxWidgets_LIBRARIES}
124127
)
125128

126-
target_include_directories(v8_reader_gui PRIVATE
129+
target_include_directories(v8_reader_wx PRIVATE
127130
${wxWidgets_INCLUDE_DIRS}
128131
)
129132

130-
target_compile_definitions(v8_reader_gui PRIVATE
133+
target_compile_definitions(v8_reader_wx PRIVATE
131134
${wxWidgets_DEFINITIONS}
132135
)
133136

134-
set_target_properties(v8_reader_gui PROPERTIES
137+
set_target_properties(v8_reader_wx PROPERTIES
135138
WIN32_EXECUTABLE TRUE # Для Windows создаёт GUI приложение без консоли
139+
OUTPUT_NAME "${V8_READER_GUI_NAME}" # Имя исполняемого файла
136140
)
137141
else()
138142
message(FATAL_ERROR "wxWidgets не найден. Отключите V8_READER_BUILD_GUI или установите wxWidgets.")
@@ -219,7 +223,7 @@ install(TARGETS v8_reader_lib
219223
)
220224

221225
if(V8_READER_BUILD_GUI)
222-
install(TARGETS v8_reader_gui
226+
install(TARGETS v8_reader_wx
223227
RUNTIME DESTINATION bin
224228
)
225229
endif()
@@ -239,7 +243,7 @@ message(STATUS "===========================================")
239243
message(STATUS "v8_reader конфигурация сборки:")
240244
message(STATUS " Версия: ${PROJECT_VERSION}")
241245
message(STATUS " Стандарт C++: ${CMAKE_CXX_STANDARD}")
242-
message(STATUS " GUI приложение: ${V8_READER_BUILD_GUI}")
246+
message(STATUS " GUI приложение: ${V8_READER_BUILD_GUI} (имя: ${V8_READER_GUI_NAME})")
243247
message(STATUS " CLI приложение: ${V8_READER_BUILD_CLI}")
244248
message(STATUS " Тесты: ${V8_READER_BUILD_TESTS}")
245249
message(STATUS "===========================================")

0 commit comments

Comments
 (0)