Skip to content

Commit

Permalink
Merge branch 't4374' into next. Incubates #4374
Browse files Browse the repository at this point in the history
Also put back nvda_eoaProxy.exe for signing which was accidentally removed in last commit.
  • Loading branch information
michaelDCurran committed Aug 12, 2014
2 parents 1104960 + 26b9328 commit a27cc42
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions sconstruct
Expand Up @@ -120,6 +120,8 @@ if certPassword:
if certTimestampServer:
signExecCmd.extend(("/t", certTimestampServer))
def signExec(target,source,env):
print [str(x) for x in target]
#sys.exit(1)
# #3795: signtool can quite commonly fail with timestamping, so allow it to try up to 3 times with a 1 second delay between each try.
res=0
for count in xrange(3):
Expand Down Expand Up @@ -214,8 +216,8 @@ def NVDADistGenerator(target, source, env, for_signature):
if env.get("uiAccess"):
buildCmd.append("--enable-uiAccess")
if certFile:
for prog in "nvda_noUIAccess.exe", "nvda_uiAccess.exe", "nvda_slave.exe", "nvda_service.exe":
action.append(lambda target,source,env: signExec([target[0].File(prog)],source,env))
for prog in "nvda_noUIAccess.exe", "nvda_uiAccess.exe", "nvda_slave.exe", "nvda_service.exe", "nvda_eoaProxy.exe":
action.append(lambda target,source,env, progByVal=prog: signExec([target[0].File(progByVal)],source,env))

for ext in "", "c", "o":
action.append(Delete(buildVersionFn + ext))
Expand Down

0 comments on commit a27cc42

Please sign in to comment.