Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61744fa0225a
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0393f11c3269
Choose a head ref
  • 10 commits
  • 6 files changed
  • 2 contributors

Commits on Jun 2, 2019

  1. vswhere

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    155e69e View commit details
  2. build scripts

    eggrobin committed Jun 2, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    6cdf4df View commit details
  3. more build scripts

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    a65db6e View commit details
  4. one version

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    1b1b38c View commit details
  5. newline

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    e5cdfe1 View commit details
  6. crlf

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    ef0f56f View commit details
  7. powershell is hard

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    41d18b5 View commit details
  8. 15.9.3 preview 1

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    45919ae View commit details
  9. after pleroy's review

    eggrobin committed Jun 2, 2019
    Copy the full SHA
    cea0d81 View commit details
  10. Merge pull request #2190 from eggrobin/vswhere

    Vswhere
    pleroy authored Jun 2, 2019
    Copy the full SHA
    0393f11 View commit details
14 changes: 14 additions & 0 deletions build_for_benchmarking.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
$ErrorActionPreference = "Stop"

$msbuild = &".\find_msbuild.ps1"

&$msbuild `
/t:benchmarks;Scripts\benchmark_automation `
/m `
/property:Configuration=Release `
/property:Platform=x64 `
Principia.sln

if (!$?) {
exit 1
}
File renamed without changes.
27 changes: 27 additions & 0 deletions find_msbuild.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
$version = "15.9.3"
$preview = "1"

$vswhere = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
$names = &$vswhere `
-prerelease `
-all `
-requires Microsoft.Component.MSBuild `
-property installationName

$msbuildpaths = &$vswhere `
-prerelease `
-all `
-requires Microsoft.Component.MSBuild `
-find MSBuild\**\Bin\MSBuild.exe

$i = 0;
foreach ($name in $names) {
if ($name.startswith("VisualStudioPreview/$version-pre.$preview.")) {
return $msbuildpaths[$i]
}
++$i
}

write-error(
"Could not find Visual Studio version $version preview $preview;" +
" found the following versions:`n$([string]::join("`n", $names))")
13 changes: 0 additions & 13 deletions multi_processor_compilation.props

This file was deleted.

7 changes: 5 additions & 2 deletions rebuild_all_solutions.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
$msbuild = join-path -path (Get-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7")."15.0" -childpath "MSBuild\15.0\Bin\msbuild.exe"
$ErrorActionPreference = "Stop"

$msbuild = &".\Principia\find_msbuild.ps1"

$dependencies = @(".\Google\glog\google-glog.sln",
".\Google\googletest\googletest\msvc\2017\gtest.sln",
".\Google\googletest\googlemock\msvc\2017\gmock.sln",
@@ -35,7 +38,7 @@ function build_solutions($solutions) {
foreach ($configuration in "Debug", "Release") {
foreach ($platform in "x64") {
foreach ($solution in $solutions) {
&$msbuild /t:"Clean;Build" /m /property:VisualStudioVersion=15.0 /property:Configuration=$configuration /property:Platform=$platform $solution
&$msbuild /t:"Clean;Build" /m /property:Configuration=$configuration /property:Platform=$platform $solution
if (!$?) {
exit 1
}
12 changes: 12 additions & 0 deletions rebuild_debug_and_release_in_parallel.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$ErrorActionPreference = "Stop"

$msbuild = &".\find_msbuild.ps1"

&$msbuild `
/t:"Clean;Build" `
/m `
.\debug_and_release_in_parallel.xml

if (!$?) {
exit 1
}