コード署名 #435

nvdajp · Feb 2, 2024 · 2cdc8d6 · 2cdc8d6
1 parent 30c15ae
commit 2cdc8d6
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 11 deletions.
diff --git a/jptools/certBuild2023.cmd b/jptools/certBuild2023.cmd
@@ -19,7 +19,7 @@ cd ..\..
 
 call jptools\setupMiscDepsJp.cmd
 
-set SIGNTOOL="C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool.exe"
+set SIGNTOOL="C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\signtool.exe"
 
 %SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 source\synthDrivers\jtalk\libmecab.dll
 @if not "%ERRORLEVEL%"=="0" goto onerror
@@ -29,6 +29,38 @@ timeout /T 5 /NOBREAK
 @if not "%ERRORLEVEL%"=="0" goto onerror
 timeout /T 5 /NOBREAK
 
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 miscDeps\python\brlapi-0.8.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 miscDeps\python\libgcc_s_dw2-1.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 miscDeps\source\brailleDisplayDrivers\lilli.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 .venv\Lib\site-packages\wx\wxbase32u_net_vc140.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 .venv\Lib\site-packages\wx\wxbase32u_vc140.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 .venv\Lib\site-packages\wx\wxmsw32u_core_vc140.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 .venv\Lib\site-packages\wx\wxmsw32u_html_vc140.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
+%SIGNTOOL% sign /a /fd SHA256 /tr %TIMESERVER% /td SHA256 .venv\Lib\site-packages\wx\wxmsw32u_stc_vc140.dll
+@if not "%ERRORLEVEL%"=="0" goto onerror
+timeout /T 5 /NOBREAK
+
 set SCONSARGS=certTimestampServer=%TIMESERVER% version=%VERSION% updateVersionType=%UPDATEVERSIONTYPE% %SCONSOPTIONS%
 
 call scons.bat source user_docs launcher release=1 publisher=%PUBLISHER% %SCONSARGS%
@@ -49,18 +81,17 @@ del /Q %VERIFYLOG%
 %SIGNTOOL% verify /pa output\*.exe >> %VERIFYLOG%
 @if not "%ERRORLEVEL%"=="0" goto onerror
 
-%SIGNTOOL% verify /pa dist\*.exe >> %VERIFYLOG%
-@if not "%ERRORLEVEL%"=="0" goto onerror
-
+for /r "dist" %%i in (*.dll *.exe) do (
+    %SIGNTOOL% verify /pa "%%i" >> %VERIFYLOG%
+    @if not "%ERRORLEVEL%"=="0" goto onerror
+)
 for /r "dist\synthDrivers\jtalk" %%i in (*.dll *.exe) do (
     %SIGNTOOL% verify /pa "%%i" >> %VERIFYLOG%
     @if not "%ERRORLEVEL%"=="0" goto onerror
 )
 for /r "dist\lib" %%i in (*.dll *.exe) do (
-    if "%%~nxi" neq "Microsoft.UI.UIAutomation.dll" (
-        %SIGNTOOL% verify /pa "%%i" >> %VERIFYLOG%
-        @if not "%ERRORLEVEL%"=="0" goto onerror
-    )
+    %SIGNTOOL% verify /pa "%%i" >> %VERIFYLOG%
+    @if not "%ERRORLEVEL%"=="0" goto onerror
 )
 for /r "dist\lib64" %%i in (*.dll *.exe) do (
     %SIGNTOOL% verify /pa "%%i" >> %VERIFYLOG%

diff --git a/nvdaHelper/archBuild_sconscript b/nvdaHelper/archBuild_sconscript
@@ -216,7 +216,9 @@ if TARGET_ARCH=='x86':
 	if signExec:
 		env.AddPostAction(win10localLib[0],[signExec])
 	env.Install(libInstallDir,win10localLib)
-	MSUIA_lib_outDir,MSUIA_include_outDir = thirdPartyEnv.SConscript('microsoft-ui-uiautomation/sconscript')
+	MSUIA_lib_outDir, MSUIA_include_outDir, MSUIA_wrapper_libs = thirdPartyEnv.SConscript('microsoft-ui-uiautomation/sconscript')
+	if signExec:
+		env.AddPostAction(MSUIA_wrapper_libs[0], signExec)
 	Export('MSUIA_lib_outDir')
 	Export('MSUIA_include_outDir')
 	UIARemoteLib=env.SConscript('UIARemote/sconscript')
@@ -243,5 +245,7 @@ if TARGET_ARCH in ('x86_64', 'arm64'):
 	env.Install(libInstallDir,remoteLoaderProgram)
 
 if TARGET_ARCH=='x86':
-	thirdPartyEnv.SConscript('espeak/sconscript')
+	espeakLib = thirdPartyEnv.SConscript('espeak/sconscript')
+	if signExec:
+		thirdPartyEnv.AddPostAction(espeakLib, signExec)
 	thirdPartyEnv.SConscript('liblouis/sconscript')
diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript
@@ -501,3 +501,5 @@ espeakDataSource=espeakRepo.Dir('espeak-ng-data')
 # also install the lang and voices/!v directories. Exclude the voices/mb directory since we are not using mbrola.
 env.RecursiveInstall(targetEspeakDataDir.Dir('lang'),espeakDataSource.Dir('lang').abspath)
 env.RecursiveInstall(targetEspeakDataDir.Dir('voices').Dir('!v'),espeakDataSource.Dir('voices').Dir('!v').abspath)
+
+Return('espeakLib')
diff --git a/nvdaHelper/microsoft-ui-uiautomation/sconscript b/nvdaHelper/microsoft-ui-uiautomation/sconscript
@@ -135,4 +135,4 @@ MSUIA_abstraction_headers = env.Install(
 
 env.Depends(MSUIA_abstraction_headers,[MSUIA_wrapper_header,MSUIA_wrapper_impl])
 
-Return(['MSUIA_lib_outDir','MSUIA_include_outDir'])
+Return(['MSUIA_lib_outDir', 'MSUIA_include_outDir', 'MSUIA_wrapper_libs'])