Changeset: 8cefb240ffe4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8cefb240ffe4
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
Branch: Jan2022
Log Message:
Merged with Jul2021
diffs (28 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -45,7 +45,9 @@ def main():
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'):
+ if os.path.exists(r'C:\Program Files\Microsoft Visual
Studio\2022\Community\VC'):
+ vcdir = r'C:\Program Files\Microsoft Visual
Studio\2022\Community\VC'
+ elif 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'
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -52,7 +52,9 @@ def main():
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'):
+ if os.path.exists(r'C:\Program Files\Microsoft Visual
Studio\2022\Community\VC'):
+ vcdir = r'C:\Program Files\Microsoft Visual
Studio\2022\Community\VC'
+ elif 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'
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
