1
0
Fork 0

check alternative registry key if the first one is not found (#3973)

This commit is contained in:
Jan Christoph Uhde 2017-12-11 16:40:50 +01:00 committed by Jan
parent 5a4613c0bf
commit a297cdc3e8
5 changed files with 15 additions and 5 deletions

View File

@ -14,7 +14,17 @@ $PSDefaultParameterValues['*:ErrorAction']='Stop'
$arango_source = split-path -parent $script_path
$vcpath=$(Get-ItemProperty HKLM:\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7)."$vc_version"
$registry_base = "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS"
if(Test-Path "${registry_base}\VC7") {
$vcpath=$(Get-ItemProperty "${registry_base}\VC7")."$vc_version"
} elseif(Test-Path "${registry_base}\VS7") {
$vcpath=$(Get-ItemProperty "${registry_base}\VS7")."$vc_version"
} else {
echo "unable to find VisualStudio Registry Key"
exit 1
}
$env:GYP_MSVS_OVERRIDE_PATH="${vcpath}\bin"
$env:CC="${vcpath}\bin\cl.exe"
$env:CXX="${vcpath}\bin\cl.exe"

View File

@ -3,7 +3,7 @@
.SYNOPSIS
Configures and builds ArangoDB
.EXAMPLE
mkdir arango-build; cd arangod-build; ../arangodb/scripts/configure/<this_file> [-build] [cmake params]
mkdir arango-build; cd arangod-build; ../arangodb/configure/<this_file> [-build] [cmake params]
#>
param([switch] $build)
if ($build) { $do_build = $TRUE } else { $do_build = $FALSE }

View File

@ -3,7 +3,7 @@
.SYNOPSIS
Configures and builds ArangoDB
.EXAMPLE
mkdir arango-build; cd arangod-build; ../arangodb/scripts/configure/<this_file> [-build] [cmake params]
mkdir arango-build; cd arangod-build; ../arangodb/configure/<this_file> [-build] [cmake params]
#>
param([switch] $build)
if ($build) { $do_build = $TRUE } else { $do_build = $FALSE }

View File

@ -3,7 +3,7 @@
.SYNOPSIS
Configures and builds ArangoDB
.EXAMPLE
mkdir arango-build; cd arangod-build; ../arangodb/scripts/configure/<this_file> [-build] [cmake params]
mkdir arango-build; cd arangod-build; ../arangodb/configure/<this_file> [-build] [cmake params]
#>
param([switch] $build)
if ($build) { $do_build = $TRUE } else { $do_build = $FALSE }

View File

@ -3,7 +3,7 @@
.SYNOPSIS
Configures and builds ArangoDB
.EXAMPLE
mkdir arango-build; cd arangod-build; ../arangodb/scripts/configure/<this_file> [-build] [cmake params]
mkdir arango-build; cd arangod-build; ../arangodb/configure/<this_file> [-build] [cmake params]
#>
param([switch] $build)
if ($build) { $do_build = $TRUE } else { $do_build = $FALSE }