From c5ada288c2c46d8c6f6d80b12bc2a3824b12d66a Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 12 Dec 2018 12:46:28 -0800 Subject: [PATCH] updated script Signed-off-by: Nikolaj Bjorner --- scripts/mk_util.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 7d9050f6d..9076b582f 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1946,19 +1946,19 @@ class DotNetCoreDLLComponent(Component): [ { "SourceLocationType": "UNC", - "SourceRootDirectory": "c:\\\\ESRP\\\\input", + "SourceRootDirectory": "%s", "DestinationLocationType": "UNC", "DestinationRootDirectory": "c:\\\\ESRP\\\\output", "SignRequestFiles": [ { "CustomerCorrelationId": "%s", - "SourceLocation": "%s\\\\libz3.dll", - "DestinationLocation": "%s\\\\libz3.dll" + "SourceLocation": "libz3.dll", + "DestinationLocation": "libz3.dll" }, { "CustomerCorrelationId": "%s", - "SourceLocation": "%s\\\\Microsoft.Z3.dll", - "DestinationLocation": "%s\\\\Microsoft.Z3.dll" + "SourceLocation": "Microsoft.Z3.dll", + "DestinationLocation": "Microsoft.Z3.dll" } ], "SigningInfo": { @@ -1987,13 +1987,15 @@ class DotNetCoreDLLComponent(Component): } } ] -} """ % (guid, path, path, guid, path, path) +} """ % (path, guid, guid) assemblySign = os.path.join(os.path.abspath(BUILD_DIR), 'dotnet', 'assembly-sign-input.json') with open(assemblySign, 'w') as ous: ous.write(assemblySignStr) outputFile = os.path.join(os.path.abspath(BUILD_DIR), 'dotnet', "esrp-out.json") esrpCmdLine = ["esrpclient.exe", "sign", "-a", "C:\\esrp\\config\\authorization.json", "-p", "C:\\esrp\\config\\policy.json", "-i", assemblySign, "-o", outputFile] MakeRuleCmd.write_cmd(out, ' '.join(esrpCmdLine)) + MakeRuleCmd.write_cmd(out, "move /Y C:\\esrp\\output\\libz3.dll .") + MakeRuleCmd.write_cmd(out, "move /Y C:\\esrp\\output\\Microsoft.Z3.dll .") def main_component(self):