MonetDB: Jul2021 - Try to use appropriate environment variable t...

[Sjoerd Mullender]

Changeset: bcb48b85cf30 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bcb48b85cf30
Modified Files:
        NT/mkodbcwxs.py
        NT/mksqlwxs.py
Branch: Jul2021
Log Message:

Try to use appropriate environment variable to find visual studio files.


diffs (62 lines):

diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -41,14 +41,20 @@ def main():
         arch = 'x86'
         libcrypto = ''
         vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
-    with open('CMakeCache.txt') as cache:
-        for line in cache:
-            if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
-                comdir = line.split('=', 1)[1].strip().replace('/', '\\')
-                break
+    vcdir = os.getenv('VCINSTALLDIR')
+    if vcdir is None:
+        vsdir = os.getenv('VSINSTALLDIR')
+        if vsdir is not None:
+            vcdir = os.path.join(vsdir, 'VC')
+    if vcdir is None:
+        if os.path.exists(r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC'):
+            vcdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC'
+        elif os.path.exists(r'C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC'):
+            vcdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC'
         else:
-            comdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community'
-    msvc = os.path.join(comdir, r'VC\Redist\MSVC')
+            print(r"Don't know which visual studio directory to use")
+            return 1
+    msvc = os.path.join(vcdir, r'Redist\MSVC')
     features = []
     print(r'<?xml version="1.0"?>')
     print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -48,14 +48,20 @@ def main():
         arch = 'x86'
         libcrypto = ''
         vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
-    with open('CMakeCache.txt') as cache:
-        for line in cache:
-            if line.startswith('CMAKE_GENERATOR_INSTANCE:INTERNAL='):
-                comdir = line.split('=', 1)[1].strip().replace('/', '\\')
-                break
+    vcdir = os.getenv('VCINSTALLDIR')
+    if vcdir is None:
+        vsdir = os.getenv('VSINSTALLDIR')
+        if vsdir is not None:
+            vcdir = os.path.join(vsdir, 'VC')
+    if vcdir is None:
+        if os.path.exists(r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC'):
+            vcdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC'
+        elif os.path.exists(r'C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC'):
+            vcdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC'
         else:
-            comdir = r'C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community'
-    msvc = os.path.join(comdir, r'VC\Redist\MSVC')
+            print(r"Don't know which visual studio directory to use")
+            return 1
+    msvc = os.path.join(vcdir, r'Redist\MSVC')
     features = []
     extend = []
     debug = []
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list