Changeset: 9dda4cd21431 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9dda4cd21431
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
Branch: default
Log Message:
Look in the cmake cache file to find location of compiler files.
diffs (54 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -41,7 +41,14 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ 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
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -57,7 +64,6 @@ def main():
print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall"
ExeCommand="/Install" Execute="deferred" Impersonate="no"/>')
print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall"
ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -48,7 +48,14 @@ def main():
arch = 'x86'
libcrypto = ''
vcpkg = r'C:\vcpkg\installed\x86-windows\{}'
- vs = '2019'
+ 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
+ else:
+ comdir = r'C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community'
+ msvc = os.path.join(comdir, r'VC\Redist\MSVC')
features = []
extend = []
debug = []
@@ -102,7 +109,6 @@ def main():
print(r' <Property Id="ARPPRODUCTICON" Value="share\monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\{}\Community\VC\Redist\MSVC'.format(vs)
d = sorted(os.listdir(msvc))[-1]
msm = '_CRT_{}.msm'.format(arch)
for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
