Skip to content

Commit e9f0c68

Browse files
coder4869coder4869
committed
reorder scripts
1 parent df79bdd commit e9f0c68

26 files changed

+49
-29
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ plugins/templates/android/**/build
1515

1616
app/tools/glog-*
1717
app/tools/spdlog-*
18-
app/scripts/pkg/vc_redist
18+
app/scripts/pkg-win/vc_redist
1919
app/*.exe

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## [2025.03.26] - v1.0.2.4
2+
### Windows: optimize packaging scripts
13

24
## [2025.03.22] - v1.0.1.0
35
### [new feature] Windows: add nsis base pkg(including auto pkg-vs_redist， installed version check)

‎app/pkg-win-nsis.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ echo start packaging exe installer
44
::set var
55
SET PROJ_NAME=DevAssistant
66
SET ROOT_DIR=%~dp0
7-
SET SCRIPT_DIR=%~dp0\scripts\pkg
7+
SET SCRIPT_DIR=%~dp0\scripts\pkg-win
88
SET BIN_DIR="%ROOT_DIR%\bin64\bin64"
99

1010
::echo var
@@ -23,11 +23,11 @@ call %SCRIPT_DIR%\vs-env.bat
2323

2424
set VERSION="1.0.2.4"
2525
echo packaging %VERSION% for "x64"
26-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x64" %SCRIPT_DIR%/pkg-win-nsis.nsi
26+
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"
28-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x86" %SCRIPT_DIR%/pkg-win-nsis.nsi
28+
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x86" %SCRIPT_DIR%/pkg-win-nsis.nsi
2929
echo packaging %VERSION% for "arm64"
30-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="arm64" %SCRIPT_DIR%/pkg-win-nsis.nsi
30+
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="arm64" %SCRIPT_DIR%/pkg-win-nsis.nsi
3131

3232
move "%SCRIPT_DIR%\%PROJ_NAME%*.exe" "%ROOT_DIR%"
3333

‎app/scripts/pkg/PkgFunc_Win.nsh renamed to ‎app/scripts/pkg-win/PkgFunc_Win.nsh

File renamed without changes.

‎app/scripts/pkg/pkg-win-nsis.nsi renamed to ‎app/scripts/pkg-win/pkg-win-nsis.nsi

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
Unicode true
55

66
;------------ Defines ------------
7-
var PRODUCT_VERSION ;"1.0.2.0"
8-
var /GLOBAL OS_ARCH ; "x64" / "x86" / "arm64"
7+
var PRODUCT_VERSION ; "1.0.0.0"
8+
var PRODUCT_NAME ; "DevAssistant"
9+
var /GLOBAL OS_ARCH ; "x64" / "x86" / "arm64"
910

10-
;!define PRODUCT_VERSION "1.0.1.3"
11-
!define PRODUCT_NAME "DevAssistant"
11+
;!define PRODUCT_VERSION "1.0.0.0"
12+
;!define PRODUCT_NAME "DevAssistant"
1213
!define PRODUCT_COMPANY "coder4869"
1314
!define BIN_DIR "..\..\bin64"
1415
!define LICENSE_FILE "..\..\data\doc\License.txt"
15-
!define INSTALL_ICON "..\..\data\resource\logo.ico"
16-
!define UNINSTALL_ICON "..\..\data\resource\uninstall.ico"
16+
!define INSTALL_ICON "..\..\data\Resource\logo.ico"
17+
!define UNINSTALL_ICON "..\..\data\Resource\uninstall.ico"
1718
!define COMPANY_WEB "http://www.yourcompany.com"
1819
!define PRODUCT_REG_AUTORUN_KEY "${PRODUCT_NAME}"
1920

‎app/scripts/pkg/vs-env.bat renamed to ‎app/scripts/pkg-win/vs-env.bat

File renamed without changes.

‎plugins/project/project/cmake/cmake-win/win_func.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ set(CURRENT_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
55
# var META_FILES required
66
function(WIN_ADD_META)
77
if (WIN32)
8-
set(ICON_FILE ${CURRENT_CMAKE_DIR}/res/AppIcon.ico)
8+
# set(ICON_FILE ${CURRENT_CMAKE_DIR}/res/AppIcon.ico)
9+
set(ICON_FILE ${CURRENT_CMAKE_DIR}/../../../data/Resource/logo.ico)
910

1011
configure_file("${CURRENT_CMAKE_DIR}/res/windows_metafile.rc.in" "windows_metafile.rc")
1112
set(RES_FILES "windows_metafile.rc")

‎plugins/project/project/doc/License.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
License tobe determind

‎plugins/project/project/pkg/Note.md renamed to ‎plugins/project/project/pkg-win/Note.md

File renamed without changes.

‎plugins/project/project/pkg/PkgFunc_Win.nsh renamed to ‎plugins/project/project/pkg-win/PkgFunc_Win.nsh

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x64-ansi/ExecDos.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-ansi/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x64-unicode/ExecDos.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-unicode/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x86-ansi/ExecDos.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x86-ansi/ShellLink.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ShellLink.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x86-unicode/ExecDos.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/Plugins/x86-unicode/ShellLink.dll renamed to ‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ShellLink.dll

File renamed without changes.

‎plugins/project/project/pkg/nsis-3.11/nsis-3.11-setup.exe renamed to ‎plugins/project/project/pkg-win/nsis-3.11/nsis-3.11-setup.exe

File renamed without changes.

‎plugins/project/project/pkg/pkg-win-nsis.bat renamed to ‎plugins/project/project/pkg-win/pkg-win-nsis.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
echo start packaging exe installer
33

44
::set var
5-
SET PROJ_NAME=DevAssistant
5+
SET PROJ_NAME=_PROJ_NAME_
66
SET ROOT_DIR=%~dp0
7-
SET SCRIPT_DIR=%~dp0\scripts\pkg
7+
SET SCRIPT_DIR=%~dp0\scripts\pkg-win
88
SET BIN_DIR="%ROOT_DIR%\bin64\bin64"
99

1010
::echo var
@@ -21,13 +21,13 @@ 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.0.2.3"
24+
set VERSION="1.0.2.4"
2525
echo packaging %VERSION% for "x64"
26-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x64" %SCRIPT_DIR%/pkg-win-nsis.nsi
26+
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"
28-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x86" %SCRIPT_DIR%/pkg-win-nsis.nsi
28+
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x86" %SCRIPT_DIR%/pkg-win-nsis.nsi
2929
echo packaging %VERSION% for "arm64"
30-
makensis /INPUTCHARSET UTF8 /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="arm64" %SCRIPT_DIR%/pkg-win-nsis.nsi
30+
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="arm64" %SCRIPT_DIR%/pkg-win-nsis.nsi
3131

3232
move "%SCRIPT_DIR%\%PROJ_NAME%*.exe" "%ROOT_DIR%"
3333

‎plugins/project/project/pkg/pkg-win-nsis.nsi renamed to ‎plugins/project/project/pkg-win/pkg-win-nsis.nsi

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
Unicode true
55

66
;------------ Defines ------------
7-
var PRODUCT_VERSION ;"1.0.2.0"
8-
var /GLOBAL OS_ARCH ; "x64" / "x86" / "arm64"
7+
var PRODUCT_VERSION ; "1.0.0.0"
8+
var PRODUCT_NAME ; "DevAssistant"
9+
var /GLOBAL OS_ARCH ; "x64" / "x86" / "arm64"
910

10-
;!define PRODUCT_VERSION "1.0.1.3"
11-
!define PRODUCT_NAME "DevAssistant"
11+
;!define PRODUCT_VERSION "1.0.0.0"
12+
;!define PRODUCT_NAME "DevAssistant"
1213
!define PRODUCT_COMPANY "coder4869"
1314
!define BIN_DIR "..\..\bin64"
1415
!define LICENSE_FILE "..\..\data\doc\License.txt"
15-
!define INSTALL_ICON "..\..\data\resource\logo.ico"
16-
!define UNINSTALL_ICON "..\..\data\resource\uninstall.ico"
16+
!define INSTALL_ICON "..\..\data\Resource\logo.ico"
17+
!define UNINSTALL_ICON "..\..\data\Resource\uninstall.ico"
1718
!define COMPANY_WEB "http://www.yourcompany.com"
1819
!define PRODUCT_REG_AUTORUN_KEY "${PRODUCT_NAME}"
1920

‎plugins/project/project/pkg/vs-env.bat renamed to ‎plugins/project/project/pkg-win/vs-env.bat

File renamed without changes.

‎plugins/project/project/project.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313

1414
PROJECT_BUILD_DIR = PROJECT_BASE_DIR + "/build"
1515
PROJECT_CMAKE_DIR = PROJECT_BASE_DIR + "/cmake"
16-
PROJECT_PACKAGE_DIR = PROJECT_BASE_DIR + "/pkg"
16+
PROJECT_RES_DIR = PROJECT_BASE_DIR + "/resource"
17+
PROJECT_DOC_DIR = PROJECT_BASE_DIR + "/doc"
18+
PROJECT_PKG_WIN_DIR = PROJECT_BASE_DIR + "/pkg-win"
1719
MODULE_TEMPLATE_DIR = PROJECT_BASE_DIR + "/template"
20+
PKG_WIN_NSIS = "/pkg-win-nsis.bat"
21+
PKG_WIN_NSIS_PATH = "/pkg-win/pkg-win-nsis.bat"
1822

1923
OPTION_STR_SIZE:int = 20
2024
OPTION_TEMPLATE:str = "# option(MODULE_OPTION \"Build with MODULE_OPTION\" ON)"
@@ -57,6 +61,14 @@ def create(json_config):
5761

5862
@staticmethod
5963
def add_help_dirs(root_dir:str, help_dirs:list, proj_name:str):
64+
if not os.path.exists(root_dir + "/data/Resource"):
65+
os.makedirs(root_dir + "/data/Resource")
66+
pyt_file.File.copy_dir(PROJECT_RES_DIR, root_dir + "/data/Resource")
67+
68+
if not os.path.exists(root_dir + "/data/doc"):
69+
os.makedirs(root_dir + "/data/doc")
70+
pyt_file.File.copy_dir(PROJECT_DOC_DIR, root_dir + "/data/doc")
71+
6072
for k in help_dirs.keys():
6173
help_dir = root_dir + "/" + help_dirs[k]
6274
if not os.path.exists(help_dir):
@@ -71,14 +83,16 @@ def add_scripts_dir(root_dir:str, scripts_dir:str, proj_name:str):
7183
pyt_file.File.copy_to_file(MODULE_TEMPLATE_DIR + "/CMakeLists.txt.PROJ", root_dir + "/CMakeLists.txt")
7284
# prapare ${scripts_dir}/cmake
7385
pyt_file.File.copy_dir(PROJECT_CMAKE_DIR, script_abs_dir + "/cmake" )
74-
# prapare ${scripts_dir}/pkg
75-
pyt_file.File.copy_dir(PROJECT_PACKAGE_DIR, script_abs_dir + "/pkg" )
76-
pyt_file.File.copy_to_file(script_abs_dir + "/pkg/pkg-win-nsis.bat", root_dir + "/pkg-win-nsis.bat" )
77-
os.remove(script_abs_dir + "/pkg/pkg-win-nsis.bat")
86+
# prapare ${scripts_dir}/pkg-win
87+
pyt_file.File.copy_dir(PROJECT_PKG_WIN_DIR, script_abs_dir + "/pkg-win" )
88+
pyt_file.File.copy_to_file(script_abs_dir + PKG_WIN_NSIS_PATH, root_dir + PKG_WIN_NSIS)
89+
os.remove(script_abs_dir + PKG_WIN_NSIS_PATH)
7890
# prepare ${PROJECT}/*.sh *.bat
7991
pyt_file.File.copy_dir(PROJECT_BUILD_DIR, root_dir + "/")
8092

93+
pkglist = os.listdir(PROJECT_PKG_WIN_DIR)
8194
flist = os.listdir(PROJECT_BUILD_DIR)
95+
flist += pkglist
8296
for fitem in flist:
8397
file = root_dir + "/" + fitem
8498
if not os.path.isdir(fitem):

‎plugins/project/project/resource/fail.png

107 KB
Loading

‎plugins/project/project/resource/loading.gif

33 KB
Loading

‎plugins/project/project/resource/logo.ico

66.1 KB
Binary file not shown.

‎plugins/project/project/resource/uninstall.ico

48.3 KB
Binary file not shown.

‎plugins/project/project/resource/warning.png

382 KB
Loading

0 commit comments

Comments
 (0)