Changeset: 6904fbefa2e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6904fbefa2e5
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
Branch: Nov2019
Log Message:
We don't support Visual Studio older than 2017.
diffs (54 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -55,16 +55,13 @@ 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">')
- if vs in ('17', '19'):
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
- d = sorted(os.listdir(msvc))[-1]
- msm = '_CRT_%s.msm' % arch
- for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
- if msm in f:
- fn = f
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="%s\%s\MergeModules\%s"/>' % (msvc, d, fn))
- else:
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
+ d = sorted(os.listdir(msvc))[-1]
+ msm = '_CRT_%s.msm' % arch
+ for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
+ if msm in f:
+ fn = f
+ print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="%s\%s\MergeModules\%s"/>' % (msvc, d, fn))
print(r' <Directory Id="%s">' % folder)
print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">')
print(r' <Directory Id="INSTALLDIR" Name="MonetDB ODBC Driver">')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -114,16 +114,13 @@ def main():
print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>')
print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>')
print(r' <Directory Id="TARGETDIR" Name="SourceDir">')
- if vs in ('17', '19'):
- msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
- d = sorted(os.listdir(msvc))[-1]
- msm = '_CRT_%s.msm' % arch
- for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
- if msm in f:
- fn = f
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="%s\%s\MergeModules\%s"/>' % (msvc, d, fn))
- else:
- print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="C:\Program Files (x86)\Common Files\Merge
Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch))
+ msvc = r'C:\Program Files (x86)\Microsoft Visual
Studio\20%s\Community\VC\Redist\MSVC' % vs
+ d = sorted(os.listdir(msvc))[-1]
+ msm = '_CRT_%s.msm' % arch
+ for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))):
+ if msm in f:
+ fn = f
+ print(r' <Merge Id="VCRedist" DiskId="1" Language="0"
SourceFile="%s\%s\MergeModules\%s"/>' % (msvc, d, fn))
print(r' <Directory Id="%s">' % folder)
print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">')
print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
