Skip to content

Commit

Permalink
Revert "尝试将代码页更改为936以解决显示乱码和本地构建错误"
Browse files Browse the repository at this point in the history
This reverts commit f5e371f.
  • Loading branch information
wmhn1872265132 committed Mar 29, 2024
1 parent f5e371f commit 80aa7db
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions 执行脚本.bat
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
@echo off
chcp 936
chcp 65001

Rem 删除已经存在的懒人版相关文件
Rem 删除已经存在的懒人版相关文件
IF EXIST "%~dp0Output" (rd /s /q "%~dp0Output")
IF EXIST "%~dp0Temp" (rd /s /q "%~dp0Temp")

Rem 创建便携版 NVDA
Rem 创建便携版 NVDA
for /r "%~dp0Resource" %%i in (nvda_20*.exe) do (
%%i --create-portable-silent --portable-path="%~dp0Temp\NVDA"
)

Rem 生成文档的 txt 版本
Rem 生成文档的 txt 版本
MKDir "%~dp0Output"
COPY /B /V /Y "%~dp0documentation\changes.md" "%~dp0Output\更新日志.txt"
COPY /B /V /Y "%~dp0documentation\ReadMe.md" "%~dp0Output\说明.txt"
COPY /B /V /Y "%~dp0documentation\changes.md" "%~dp0Output\更新日志.txt"
COPY /B /V /Y "%~dp0documentation\ReadMe.md" "%~dp0Output\说明.txt"

if "%1" == "GITHUB_ACTIONS" (
@echo on
Expand All @@ -22,32 +22,33 @@ if "%1" == "GITHUB_ACTIONS" (
GOTO Local
)

Rem GitHub Actions 构建流程
Rem GitHub Actions 构建流程
:GitHub
Rem 开始生成
Rem 开始生成
set VersionDate=%date:~-4%.%date:~-10,2%.%date:~-7,2%
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0便携版安装脚本.iss"
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0懒人版安装脚本.iss"
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0恢复备份的 NVDA 配置.iss"
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0便携版安装脚本.iss"
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0懒人版安装脚本.iss"
"%~dp0Tools\InnoSetup\ISCC" /Q "%~dp0恢复备份的 NVDA 配置.iss"
GOTO Archive

Rem 本地构建流程
Rem 本地构建流程
:Local
Rem 运行 NVDA
Rem 运行 NVDA
if /i %PROCESSOR_IDENTIFIER:~0,3%==x86 (
Start /D "%ProgramFiles%\NVDA" NVDA
) else (
Start /D "%ProgramFiles(x86)%\NVDA" NVDA
)

Rem 开始生成
set VersionDate=%date:~3,4%.%date:~8,2%.%date:~11,2%"%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0便携版安装脚本.iss"
"%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0懒人版安装脚本.iss"
"%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0恢复备份的 NVDA 配置.iss"
Rem 开始生成
set VersionDate=%date:~3,4%.%date:~8,2%.%date:~11,2%"
%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0便携版安装脚本.iss"
"%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0懒人版安装脚本.iss"
"%~dp0Tools\InnoSetup\Compil32" /cc "%~dp0恢复备份的 NVDA 配置.iss"

:Archive
Rem 生成程序压缩文件
"%~dp0Tools\7Zip\7z.exe" a -y -tzip "%~dp0Output\Archive\NVDA_Lazy_Edition_%VersionDate%.zip" "%~dp0Output\NVDA 懒人版.exe" "%~dp0Output\更新日志.txt" "%~dp0Output\说明.txt" "%~dp0Output\NVDA 配置恢复工具.exe"
"%~dp0Tools\7Zip\7z.exe" a -y -tzip "%~dp0Output\Archive\Source_Code_And_Dependency_Files_%VersionDate%.zip" "%~dp0documentation" "%~dp0Resource" "%~dp0Tools" "%~dp0userConfig" "%~dp0ReadMe.md" "%~dp0便携版安装脚本.iss" "%~dp0恢复备份的 NVDA 配置.iss" "%~dp0懒人版安装脚本.iss" "%~dp0执行脚本.bat"
Rem 生成程序压缩文件
"%~dp0Tools\7Zip\7z.exe" a -y -tzip "%~dp0Output\Archive\NVDA_Lazy_Edition_%VersionDate%.zip" "%~dp0Output\NVDA 懒人版.exe" "%~dp0Output\更新日志.txt" "%~dp0Output\说明.txt" "%~dp0Output\NVDA 配置恢复工具.exe"
"%~dp0Tools\7Zip\7z.exe" a -y -tzip "%~dp0Output\Archive\Source_Code_And_Dependency_Files_%VersionDate%.zip" "%~dp0documentation" "%~dp0Resource" "%~dp0Tools" "%~dp0userConfig" "%~dp0ReadMe.md" "%~dp0便携版安装脚本.iss" "%~dp0恢复备份的 NVDA 配置.iss" "%~dp0懒人版安装脚本.iss" "%~dp0执行脚本.bat"

Exit

0 comments on commit 80aa7db

Please sign in to comment.