Skip to content

Commit b5fd3cb

Browse files
PA3MEPPA3MEP
committed
Modify RunTimes?. Ticket IB-3728
1 parent 9af3281 commit b5fd3cb

File tree

1 file changed

+129
-57
lines changed

1 file changed

+129
-57
lines changed

‎Eesti_ID_kaart.wxs‎

Lines changed: 129 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,56 @@
3636
<Property Id="ARPPRODUCTICON" Value="IDIcon"/>
3737
<Property Id="ARPURLINFOABOUT" Value="http://www.ria.ee/"/>
3838
<Property Id="ARPURLUPDATEINFO" Value="http://www.ria.ee"/>
39-
40-
<Property Id="CPP_09_INSTALLED_X86">
41-
<DirectorySearch Id="CheckSysDir_09_X86" Path="SystemFolder" Depth="0">
42-
<FileSearch Id="CheckFile_09_X86" Name="msvcp90.dll"/>
39+
40+
<Property Id="CRT_10_INSTALLED_X86">
41+
<DirectorySearch Id="CRT_CheckSysDir_10_X86" Path="SystemFolder" Depth="0">
42+
<FileSearch Id="CRT_CheckFile_10_X86" Name="msvcr100.dll"/>
43+
</DirectorySearch>
44+
</Property>
45+
<Property Id="CRT_11_INSTALLED_X86">
46+
<DirectorySearch Id="CRT_CheckSysDir_11_X86" Path="SystemFolder" Depth="0">
47+
<FileSearch Id="CRT_CheckFile_11_X86" Name="msvcr110.dll"/>
48+
</DirectorySearch>
49+
</Property>
50+
<Property Id="CRT_12_INSTALLED_X86">
51+
<DirectorySearch Id="CRT_CheckSysDir_12_X86" Path="SystemFolder" Depth="0">
52+
<FileSearch Id="CRT_CheckFile_12_X86" Name="msvcr120.dll"/>
53+
</DirectorySearch>
54+
</Property>
55+
<Property Id="ATL_10_INSTALLED_X86">
56+
<DirectorySearch Id="ATL_CheckSysDir_10_X86" Path="SystemFolder" Depth="0">
57+
<FileSearch Id="ATL_CheckFile_10_X86" Name="atl100.dll"/>
58+
</DirectorySearch>
59+
</Property>
60+
<Property Id="ATL_11_INSTALLED_X86">
61+
<DirectorySearch Id="ATL_CheckSysDir_11_X86" Path="SystemFolder" Depth="0">
62+
<FileSearch Id="ATL_CheckFile_11_X86" Name="atl110.dll"/>
63+
</DirectorySearch>
64+
</Property>
65+
66+
<Property Id="CRT_10_INSTALLED_X64">
67+
<DirectorySearch Id="CRT_CheckSysDir_10_X64" Path="System64Folder" Depth="0">
68+
<FileSearch Id="CRT_CheckFile_10_X64" Name="msvcr100.dll"/>
4369
</DirectorySearch>
4470
</Property>
45-
<Property Id="CPP_10_INSTALLED_X86">
46-
<DirectorySearch Id="CheckSysDir_10_X86" Path="SystemFolder" Depth="0">
47-
<FileSearch Id="CheckFile_10_X86" Name="msvcp100.dll"/>
71+
<Property Id="CRT_11_INSTALLED_X64">
72+
<DirectorySearch Id="CRT_CheckSysDir_11_X64" Path="System64Folder" Depth="0">
73+
<FileSearch Id="CRT_CheckFile_11_X64" Name="msvcr110.dll"/>
4874
</DirectorySearch>
4975
</Property>
50-
<Property Id="CPP_11_INSTALLED_X86">
51-
<DirectorySearch Id="CheckSysDir_11_X86" Path="SystemFolder" Depth="0">
52-
<FileSearch Id="CheckFile_11_X86" Name="msvcp110.dll"/>
76+
<Property Id="CRT_12_INSTALLED_X64">
77+
<DirectorySearch Id="CRT_CheckSysDir_12_X64" Path="System64Folder" Depth="0">
78+
<FileSearch Id="CRT_CheckFile_12_X64" Name="msvcr120.dll"/>
5379
</DirectorySearch>
5480
</Property>
55-
<Property Id="CPP_12_INSTALLED_X86">
56-
<DirectorySearch Id="CheckSysDir_12_X86" Path="SystemFolder" Depth="0">
57-
<FileSearch Id="CheckFile_12_X86" Name="msvcp120.dll"/>
81+
<Property Id="ATL_10_INSTALLED_X64">
82+
<DirectorySearch Id="ATL_CheckSysDir_10_X64" Path="System64Folder" Depth="0">
83+
<FileSearch Id="ATL_CheckFile_10_X64" Name="atl100.dll"/>
84+
</DirectorySearch>
85+
</Property>
86+
<Property Id="ATL_11_INSTALLED_X64">
87+
<DirectorySearch Id="ATL_CheckSysDir_11_X64" Path="System64Folder" Depth="0">
88+
<FileSearch Id="ATL_CheckFile_11_X64" Name="atl110.dll"/>
5889
</DirectorySearch>
5990
</Property>
6091

@@ -170,24 +201,6 @@
170201
</Directory>
171202

172203
<DirectoryRef Id="TARGETDIR">
173-
<Merge Id='CRT' Language='0' SourceFile='$(env.MergeModules)\Microsoft_$(var.MergeVersion)_CRT_x86.msm' DiskId='1'/>
174-
<!--Merge Id='ATL' Language='0' SourceFile='$(env.MergeModules)\Microsoft_$(var.MergeVersion)_ATL_x86.msm' DiskId='1'/-->
175-
<!-- VS2008 Runtime for 3.8 minidriver -->
176-
<Merge Id='CRT90' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC90_CRT_x86.msm' DiskId='1'/>
177-
<Merge Id='ATL90' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC90_ATL_x86.msm' DiskId='1'/>
178-
<!-- VS2010 Runtime for 3.8 shell extention -->
179-
<Merge Id='CRT100' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC100_CRT_x86.msm' DiskId='1'/>
180-
<Merge Id='ATL100' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC100_ATL_x86.msm' DiskId='1'/>
181-
182-
<?if $(var.Platform) = "x64" ?>
183-
<Merge Id='CRT64' Language='0' SourceFile='$(env.MergeModules)\Microsoft_$(var.MergeVersion)_CRT_x64.msm' DiskId='1'/>
184-
<!--Merge Id='ATL64' Language='0' SourceFile='$(env.MergeModules)\Microsoft_$(var.MergeVersion)_ATL_x64.msm' DiskId='1'/-->
185-
<Merge Id='CRT6490' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC90_CRT_x86_x64.msm' DiskId='1'/>
186-
<Merge Id='ATL6490' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC90_ATL_x86_x64.msm' DiskId='1'/>
187-
<Merge Id='CRT64100' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC100_CRT_x64.msm' DiskId='1'/>
188-
<Merge Id='ATL64100' Language='0' SourceFile='$(env.MergeModules)\Microsoft_VC100_ATL_x64.msm' DiskId='1'/>
189-
<?endif ?>
190-
191204
<Component Id="Path" Guid="{6CA961A4-C564-4150-8448-B2B1E15CCC04}">
192205
<Environment Id="PATH" Name="PATH" Value="[APPLICATIONFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
193206
</Component>
@@ -278,35 +291,94 @@
278291
<Feature Id="minidrive" Title="Minidriver" AllowAdvertise="no" Display="hidden" Level="1">
279292
<ComponentGroupRef Id="minidriver"/>
280293
</Feature>
294+
<DirectoryRef Id="SystemFolder">
295+
<Component Id="msvcr120.dll_x86" Guid="0ADF75A7-1492-417A-A6CE-C202D46735EB" Win64="no">
296+
<Condition>NOT CRT_12_INSTALLED_X86</Condition>
297+
<File Id="msvcr120.dll_x86" Source="Runtime\x86\msvcr120.dll" Checksum="yes" Vital="yes"/>
298+
<File Id="msvcp120.dll_x86" Source="Runtime\x86\msvcp120.dll" Checksum="yes" Vital="yes"/>
299+
</Component>
300+
</DirectoryRef>
301+
<DirectoryRef Id="SystemFolder">
302+
<Component Id="msvcr110.dll_x86" Guid="4BCD7C7B-F46D-4B8D-9E4D-98167B45ADB0" Win64="no">
303+
<Condition>NOT CRT_11_INSTALLED_X86</Condition>
304+
<File Id="msvcr110.dll_x86" Source="Runtime\x86\msvcr110.dll" Checksum="yes" Vital="yes"/>
305+
<File Id="msvcp110.dll_x86" Source="Runtime\x86\msvcp110.dll" Checksum="yes" Vital="yes"/>
306+
</Component>
307+
</DirectoryRef>
308+
<DirectoryRef Id="SystemFolder">
309+
<Component Id="msvcr100.dll_x86" Guid="92D9435D-5C8A-4A51-92E6-A94819BBDFC7" Win64="no">
310+
<Condition>NOT CRT_10_INSTALLED_X86</Condition>
311+
<File Id="msvcr100.dll_x86" Source="Runtime\x86\msvcr100.dll" Checksum="yes" Vital="yes"/>
312+
<File Id="msvcp100.dll_x86" Source="Runtime\x86\msvcp100.dll" Checksum="yes" Vital="yes"/>
313+
</Component>
314+
</DirectoryRef>
281315

282-
<Feature Id="VCRedist" Title="Visual C++ 11.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
283-
<MergeRef Id="CRT"/>
284-
<!--MergeRef Id="ATL"/-->
285-
<?if $(var.Platform) = "x64" ?>
286-
<MergeRef Id="CRT64"/>
287-
<!--MergeRef Id="ATL64"/-->
288-
<?endif ?>
289-
</Feature>
290-
291-
<Feature Id="VCRedist10" Title="Visual C++ 10.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
292-
<Condition Level="0">NOT CPP_10_INSTALLED_x86</Condition>
293-
<MergeRef Id="CRT100"/>
294-
<MergeRef Id="ATL100"/>
295-
<?if $(var.Platform) = "x64" ?>
296-
<MergeRef Id="CRT64100"/>
297-
<MergeRef Id="ATL64100"/>
298-
<?endif ?>
316+
<DirectoryRef Id="SystemFolder">
317+
<Component Id="atl100.dll_x86" Guid="D5FA6F7D-1270-457D-95FE-9E41C06175C7" Win64="no">
318+
<Condition>NOT ATL_10_INSTALLED_X86</Condition>
319+
<File Id="atl100.dll_x86" Source="Runtime\x86\atl100.dll" Checksum="yes" Vital="yes"/>
320+
</Component>
321+
</DirectoryRef>
322+
<DirectoryRef Id="SystemFolder">
323+
<Component Id="atl110.dll_x86" Guid="CF5274C9-9D81-4D5F-9871-F3667372273C" Win64="no">
324+
<Condition>NOT ATL_11_INSTALLED_X86</Condition>
325+
<File Id="atl110.dll_x86" Source="Runtime\x86\atl110.dll" Checksum="yes" Vital="yes"/>
326+
</Component>
327+
</DirectoryRef>
328+
329+
<DirectoryRef Id="System64Folder">
330+
<Component Id="msvcr120.dll_x64" Guid="74CCB83C-31F8-4790-AEB5-71364FDA52AA" Win64="yes">
331+
<Condition>NOT CRT_12_INSTALLED_X64</Condition>
332+
<File Id="msvcr120.dll_x64" Source="Runtime\x64\msvcr120.dll" Checksum="yes" Vital="yes"/>
333+
<File Id="msvcp120.dll_x64" Source="Runtime\x64\msvcp120.dll" Checksum="yes" Vital="yes"/>
334+
</Component>
335+
</DirectoryRef>
336+
<DirectoryRef Id="System64Folder">
337+
<Component Id="msvcr110.dll_x64" Guid="4A2AAF9C-BF01-4B70-8F8D-D5DECE1448FC" Win64="yes">
338+
<Condition>NOT CRT_11_INSTALLED_X64</Condition>
339+
<File Id="msvcr110.dll_x64" Source="Runtime\x64\msvcr110.dll" Checksum="yes" Vital="yes"/>
340+
<File Id="msvcp110.dll_x64" Source="Runtime\x64\msvcp110.dll" Checksum="yes" Vital="yes"/>
341+
</Component>
342+
</DirectoryRef>
343+
<DirectoryRef Id="System64Folder">
344+
<Component Id="msvcr100.dll_x64" Guid="840D6314-B49C-4EE5-A764-A8BEB03E0BD8" Win64="yes">
345+
<Condition>NOT CRT_10_INSTALLED_X64</Condition>
346+
<File Id="msvcr100.dll_x64" Source="Runtime\x64\msvcr100.dll" Checksum="yes" Vital="yes"/>
347+
<File Id="msvcp100.dll_x64" Source="Runtime\x64\msvcp100.dll" Checksum="yes" Vital="yes"/>
348+
</Component>
349+
</DirectoryRef>
350+
351+
<DirectoryRef Id="System64Folder">
352+
<Component Id="atl100.dll_x64" Guid="ECB62CE0-D59F-44A0-A094-9B8B284C02F2" Win64="yes">
353+
<Condition>NOT ATL_10_INSTALLED_X64</Condition>
354+
<File Id="atl100.dll_x64" Source="Runtime\x64\atl100.dll" Checksum="yes" Vital="yes"/>
355+
</Component>
356+
</DirectoryRef>
357+
<DirectoryRef Id="System64Folder">
358+
<Component Id="atl110.dll_x64" Guid="1A2D3BB8-986F-4CBA-840A-7B3FEF39CC39" Win64="yes">
359+
<Condition>NOT ATL_11_INSTALLED_X64</Condition>
360+
<File Id="atl110.dll_x64" Source="Runtime\x64\atl110.dll" Checksum="yes" Vital="yes"/>
361+
</Component>
362+
</DirectoryRef>
363+
364+
<Feature Id="Runtimes_X86" Title="Visual C++ 12.0 Runtime CRT 86" AllowAdvertise="no" Display="hidden" Level="1">
365+
<!-- <ComponentRef Id="msvcr90.dll_x86"/> -->
366+
<ComponentRef Id="msvcr100.dll_x86"/>
367+
<ComponentRef Id="msvcr110.dll_x86"/>
368+
<ComponentRef Id="msvcr120.dll_x86"/>
369+
<ComponentRef Id="atl100.dll_x86"/>
370+
<ComponentRef Id="atl110.dll_x86"/>
299371
</Feature>
300-
301-
<Feature Id="VCRedist90" Title="Visual C++ 9.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
302-
<Condition Level="0">NOT CPP_09_INSTALLED_x86</Condition>
303-
<MergeRef Id="CRT90"/>
304-
<MergeRef Id="ATL90"/>
305-
<?if $(var.Platform) = "x64" ?>
306-
<MergeRef Id="CRT6490"/>
307-
<MergeRef Id="ATL6490"/>
308-
<?endif ?>
372+
373+
<Feature Id="Runtimes_X64" Title="Visual C++ 12.0 Runtime CRT 64" AllowAdvertise="no" Display="hidden" Level="1">
374+
<!-- <ComponentRef Id="msvcr90.dll_x64"/> -->
375+
<ComponentRef Id="msvcr100.dll_x64"/>
376+
<ComponentRef Id="msvcr110.dll_x64"/>
377+
<ComponentRef Id="msvcr120.dll_x64"/>
378+
<ComponentRef Id="atl100.dll_x64"/>
379+
<ComponentRef Id="atl110.dll_x64"/>
309380
</Feature>
381+
310382

311383
<!-- Install to all users -->
312384
<Property Id="ALLUSERS" Value="1"/>

0 commit comments

Comments
 (0)