From a297cdc3e8e23cf5ff705ec424043e79a3a9f2ea Mon Sep 17 00:00:00 2001
From: Jan Christoph Uhde <ObiWahn@users.noreply.github.com>
Date: Mon, 11 Dec 2017 16:40:50 +0100
Subject: [PATCH] check alternative registry key if the first one is not found
 (#3973)

---
 configure/windows_common.ps1                | 12 +++++++++++-
 configure/windows_vs2015_RelWithDebInfo.ps1 |  2 +-
 configure/windows_vs2017_Debug.ps1          |  2 +-
 configure/windows_vs2017_RelWithDebInfo.ps1 |  2 +-
 configure/windows_vs2017_Release.ps1        |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/configure/windows_common.ps1 b/configure/windows_common.ps1
index e0d77fb413..8646ffb538 100644
--- a/configure/windows_common.ps1
+++ b/configure/windows_common.ps1
@@ -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"
diff --git a/configure/windows_vs2015_RelWithDebInfo.ps1 b/configure/windows_vs2015_RelWithDebInfo.ps1
index 6e17f0430c..0094a8837c 100644
--- a/configure/windows_vs2015_RelWithDebInfo.ps1
+++ b/configure/windows_vs2015_RelWithDebInfo.ps1
@@ -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 }
diff --git a/configure/windows_vs2017_Debug.ps1 b/configure/windows_vs2017_Debug.ps1
index d5be6328db..f786fcb006 100644
--- a/configure/windows_vs2017_Debug.ps1
+++ b/configure/windows_vs2017_Debug.ps1
@@ -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 }
diff --git a/configure/windows_vs2017_RelWithDebInfo.ps1 b/configure/windows_vs2017_RelWithDebInfo.ps1
index d4d5de26e8..8bcc2d83f9 100644
--- a/configure/windows_vs2017_RelWithDebInfo.ps1
+++ b/configure/windows_vs2017_RelWithDebInfo.ps1
@@ -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 }
diff --git a/configure/windows_vs2017_Release.ps1 b/configure/windows_vs2017_Release.ps1
index 0e3b76df46..c2ad65f825 100644
--- a/configure/windows_vs2017_Release.ps1
+++ b/configure/windows_vs2017_Release.ps1
@@ -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 }