Merge pull request #443 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
dlang · Feb 26, 2020 · c56b3f0 · c56b3f0
2 parents 562d0b4 + 9afd857
commit c56b3f0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d
@@ -139,32 +139,27 @@ struct Box
 
  void scp(string src, string tgt)
  {
- if (os == OS.windows)
+ version(NoVagrant)
  {
- version(NoVagrant)
- {
- if (src.startsWith("default:"))
- src = _tmpdir ~ "/" ~ src[8..$];
- if (tgt.startsWith("default:"))
- tgt = _tmpdir ~ "/" ~ tgt[8..$];
-
- string[] srcs = split(src, " ");
- foreach(s; srcs)
- if (std.file.isFile(s))
- copyFile(s, buildPath(tgt, baseName(s)));
- else
- copyDirectory(s, tgt);
- }
- else
- {
- // run scp with retry as fetching sth. fails (Windows OpenSSH-server)
- auto cmd = "scp -r -F "~sshcfg~" "~src~" "~tgt~" > /dev/null";
- if (runStatus(cmd) && runStatus(cmd))
- run(cmd);
- }
+ if (src.startsWith("default:"))
+ src = _tmpdir ~ "/" ~ src[8..$];
+ if (tgt.startsWith("default:"))
+ tgt = _tmpdir ~ "/" ~ tgt[8..$];
+
+ string[] srcs = split(src, " ");
+ foreach(s; srcs)
+ if (std.file.isFile(s))
+ copyFile(s, buildPath(tgt, baseName(s)));
+ else
+ copyDirectory(s, tgt);
  }
  else
- run("rsync -a -e 'ssh -F "~sshcfg~"' "~src~" "~tgt);
+ {
+ // run scp with retry as fetching sth. fails (Windows OpenSSH-server)
+ auto cmd = "scp -r -F "~sshcfg~" "~src~" "~tgt~" > /dev/null";
+ if (runStatus(cmd) && runStatus(cmd))
+ run(cmd);
+ }
  }
 
 private:

diff --git a/create_dmd_release/codesign/sign.ps1 b/create_dmd_release/codesign/sign.ps1
@@ -11,13 +11,16 @@ if ($sig.Status -eq 'Valid' -and $sig.SignerCertificate.Thumbprint -eq "$fingerp
  exit
 }
 
+$key = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots'
+$sdkdir = (Get-ItemProperty -Path $key -Name KitsRoot10).KitsRoot10
+
 # need an interactive logon to access the certificate store
 # as sshd just creates a network logon for pubkey authenticated users
 # also see https://github.com/PowerShell/Win32-OpenSSH/issues/996
 $ps = new-object System.Diagnostics.Process
 $ps.StartInfo.UserName = 'vagrant'
 $ps.StartInfo.Password = ConvertTo-SecureString 'vagrant' -AsPlainText -Force
-$ps.StartInfo.Filename = "$env:SDKDIR\Bin\signtool.exe"
+$ps.StartInfo.Filename = "$sdkdir\App Certification Kit\signtool.exe"
 $ps.StartInfo.Arguments = "sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /f $cert /p $pw $file"
 $ps.StartInfo.UseShellExecute = $False
 $ps.StartInfo.RedirectStandardOutput = $True

diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d
@@ -364,6 +364,7 @@ void buildAll(Bits bits, string branch, bool dmdOnly=false)
 
  auto msvcVarsX64 = "";
  auto msvcVarsX86 = "";
+ auto msvcVars = "";
  auto msvcEnv = "";
  version(Windows)
  {
@@ -385,8 +386,8 @@ void buildAll(Bits bits, string branch, bool dmdOnly=false)
  auto vcVars = quote(environment["VSINSTALLDIR"] ~ `VC\Auxiliary\Build\vcvarsall.bat`);
  msvcVarsX64 = vcVars~" x64 && ";
  msvcVarsX86 = vcVars~" x86 && ";
+ msvcVars = bits == Bits.bits64 ? msvcVarsX64 : msvcVarsX86;
  }
- auto msvcVars = bits == Bits.bits64 ? msvcVarsX64 : msvcVarsX86;
  }
 
  auto targetMakefile = bits == Bits.bits32? makefile : makefile64;
@@ -451,13 +452,13 @@ void buildAll(Bits bits, string branch, bool dmdOnly=false)
 
  info("Building Druntime "~bitsDisplay);
  changeDir(cloneDir~"/druntime");
- run(msvcVarsX64~makecmd~pic~msvcEnv~makeTargetDruntime);
+ run(msvcVars~makecmd~pic~msvcEnv~makeTargetDruntime);
  removeFiles(cloneDir~"/druntime", "*{"~obj~"}", SpanMode.depth,
  file => !file.baseName.startsWith("minit"));
 
  info("Building Phobos "~bitsDisplay);
  changeDir(cloneDir~"/phobos");
- run(msvcVarsX64~makecmd~pic~msvcEnv);
+ run(msvcVars~makecmd~pic~msvcEnv);
 
  version(OSX) if(bits == Bits.bits64)
  {
@@ -515,7 +516,7 @@ void buildAll(Bits bits, string branch, bool dmdOnly=false)
  {
  // v1.20+
  version (Windows)
- run(msvcVars~"SET DMD="~hostDMD~" && "~hostDMD~" -run build.d -O -w -m"~bitsStr);
+ run(msvcVars~"SET DMD="~hostDMD~" && "~hostDMD~" -m"~bitsStr~" -run build.d -O -w -m"~bitsStr);
  else
  run("DMD="~hostDMD~" "~hostDMD~" -run build.d -O -w -m"~bitsStr);
  }