Skip to content

Commit 19e84ec

Browse files
coder4869coder4869
committed
linux build output && release doc
1 parent 6d3adc5 commit 19e84ec

File tree

6 files changed

+35
-16
lines changed

6 files changed

+35
-16
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## [2025.04.08] - v1.1.3.1
2+
### [Optimize] linux build output && release doc
13

24
## [2025.04.08] - v1.1.3.0
35
### [Optimize] update platform macro

‎app/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ if(WIN)
1515
# set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64/lib")
1616
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJ_ROOT}/lib")
1717
elseif(LINUX)
18-
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64/bin64")
19-
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64/bin64")
20-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64/bin64")
18+
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64")
19+
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64")
20+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64")
2121
else()
2222
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64")
2323
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64")
@@ -32,7 +32,7 @@ message("CMAKE_TOOLCHAIN_ROOT = ${CMAKE_TOOLCHAIN_ROOT} ")
3232
message("include(${CMAKE_TOOLCHAIN_ROOT}/cmake-core/global.cmake) ")
3333

3434

35-
project(${PROJECT_NAME} VERSION 1.1.3.0)
35+
project(${PROJECT_NAME} VERSION 1.1.3.1)
3636
# set(CMAKE_DEBUG_POSTFIX d)
3737
set(LIB_TYPE SHARED) # SHARED STATIC
3838
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)

‎app/data/doc/Release.md

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,39 @@
11
## Release Notes
22

3+
### Release v1.1
4+
#### 1. Windows
5+
- New features
6+
* 1.pkg-exe: add nsis based exe package scripts.
7+
- Optimize
8+
* 1.Install setting use nsis-pkg-scripts replace C++ code.
9+
* 2.`run_win.bat`: auto detect installed visual studio, replace c++ code update `run_win.bat`.
10+
* 3.build output organization(bin64, lib, logs etc).
11+
12+
#### 2. Linux
13+
- New features
14+
* 1.logger: spdlog add support for ubuntu, centos, openKylin2.0.
15+
* 2.cmake: add qt support for ubuntu, centos, openKylin2.0.
16+
- Optimize
17+
* 1.fix app bugs for ubuntu, centos, openKylin2.0.
18+
19+
320
### Release v1.0
421

522
#### 1. Universal
623
- 1.Create CMake Project by Json Config(Format Refer To `app/conf/project.json`).
724
* Supports platforms: Windows, MacOS, iOS, Android.
825
* Use Python and CMake Plugin(Refer to `plugins`)
9-
- 2.Query Environment Var. Supports Windows, MacOS.
10-
- 3.Add spdlog based multi-platforms logger.
26+
- 2.Logger: Add spdlog based multi-platforms logger.
1127
* Supports platforms: Windows, MacOS, iOS, Android.
12-
- 4.Add `app-auto-start-ability` on operation system start.
13-
* Supports Windows, MacOS(removed).
1428

1529
#### 2. Windows(Only)
16-
- 1.Add Regedit Get and Set Functions.
17-
- 2.Add TrayIcon Based Hide and Show Window Functions.
18-
- 3.Add RightAction based adapter to any `run_win.bat` for VS2019 and VS2022. e.g. `app/run_win.bat`
30+
- 1.Query Environment Var.
31+
- 2.Add Regedit Get and Set Functions.
32+
- 3.Add TrayIcon Based Hide and Show Window Functions.
33+
- 4.Add RightAction based adapter to any `run_win.bat` for VS2019 and VS2022. e.g. `app/run_win.bat`
34+
- 5.Add `app-auto-start-ability` on operation system start.
1935

2036
#### 3. MacOS(Only)
37+
- 1.Query Environment Var.
2138

2239
#### 4. Linux(Only)

‎app/pkg-win-nsis.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ start /wait %QT_HOME%\bin\windeployqt.exe -qmldir %QT_HOME%/qml %BIN_DIR%\%PROJ_
2121

2222
call %SCRIPT_DIR%\vs-env.bat
2323

24-
set VERSION="1.1.3.0"
24+
set VERSION="1.1.3.1"
2525
echo packaging %VERSION% for "x64"
2626
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x64" %SCRIPT_DIR%/pkg-win-nsis.nsi
2727
echo packaging %VERSION% for "x86"

‎app/src/app/DevAssistant/DevAssistant.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ target_link_libraries(${BIN_NAME} PUBLIC ${LIB_FMWKs} ${LIB_DEPS}
7979

8080
# add app res
8181
# APP_ADD_RES("${PROJ_ROOT}/conf/project.json" "conf/")
82-
APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
83-
APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
82+
# APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
83+
# APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
8484
APP_ADD_RES_RECURSE("${PLUGIN_DIR}/project" "data/plugins/project" "${PLUGIN_DIR}/project/*")
8585
APP_ADD_RES_RECURSE("${PLUGIN_DIR}/pytool" "data/plugins/pytool" "${PLUGIN_DIR}/pytool/*")
8686
APP_ADD_RES_RECURSE("${PLUGIN_DIR}/xcode" "data/plugins/xcode" "${PLUGIN_DIR}/xcode/*")

‎app/src/qtmodules/QtHelp/QDAHelpDialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ void QDAHelpDialog::OnHelpShow()
3030
void QDAHelpDialog::OnShowVersion()
3131
{
3232
std::string version = u8R"(
33-
版本号(Version) : v1.1.3.0
33+
版本号(Version) : v1.1.3.1
3434
35-
日期(Date) : 2025/04/08
35+
日期(Date) : 2025/04/09
3636
)";
3737
QMessageBox::information(NULL, QStringLiteral("Version"), QString::fromStdString(version));
3838
}

0 commit comments

Comments
 (0)