[commit] r2741 - in trunk: . Install
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Feb 5 11:29:02 CST 2018
Author: ksmyth
Date: Mon Feb 5 11:29:02 2018
New Revision: 2741
Log:
Include vcredist v10 in bundle, not merge modules
Modified:
trunk/.gitignore
trunk/Install/GME.wxs
trunk/Install/GME_bundle.wxs
Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore Mon Feb 5 11:28:57 2018 (r2740)
+++ trunk/.gitignore Mon Feb 5 11:29:02 2018 (r2741)
@@ -444,3 +444,5 @@
/redist/
/GME-*.*.*_src/
/GME-src.zip
+Install/vc_redist.x64.v10.0.40219.325.exe
+Install/vc_redist.x86.v10.0.40219.325.exe
Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs Mon Feb 5 11:28:57 2018 (r2740)
+++ trunk/Install/GME.wxs Mon Feb 5 11:29:02 2018 (r2741)
@@ -318,17 +318,6 @@
<?endif?>
</Directory>
- <DirectoryRef Id='TARGETDIR'>
- <?if $(sys.BUILDARCH)=x86 ?>
- <?endif?>
- <!-- needed for CrashRpt.dll on x86, x64; for libapr-1.dll, libeay32.dll, et al on x86 -->
- <Merge Id="CRT100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_$(sys.BUILDARCH).msm" DiskId="1" />
-
- <?if $(sys.BUILDARCH)=x64 ?>
- <Merge Id="CRT100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
- <?endif?>
- </DirectoryRef>
-
<!-- =========================================================== -->
<!-- FEATURES -->
<!-- =========================================================== -->
@@ -342,13 +331,11 @@
<ComponentGroupRef Id='GME_paradigmsx86' />
<?if $(sys.BUILDARCH)=x64 ?>
<ComponentGroupRef Id='GME_binx64' />
- <MergeRef Id='CRT100_x86' />
<?endif?>
<?if $(sys.BUILDARCH)=x86 ?>
<?endif?>
- <MergeRef Id='CRT100' />
</Feature>
<Feature Id='Samples' Title='Samples' Description='These are sample paradigms and interpreters with source code'
Modified: trunk/Install/GME_bundle.wxs
==============================================================================
--- trunk/Install/GME_bundle.wxs Mon Feb 5 11:28:57 2018 (r2740)
+++ trunk/Install/GME_bundle.wxs Mon Feb 5 11:29:02 2018 (r2741)
@@ -7,6 +7,7 @@
<?define InstallerVersion="500" ?>
<?define Compressed="no" ?>
<?define Vc9RedistVersion="v9.0.30729.4148" ?>
+<?define Vc10RedistVersion="v10.0.40219.325" ?>
<?define VcRedistVersion="v14.0.24123" ?>
<?include GME_inc.wxi ?>
@@ -49,8 +50,8 @@
Result="version"
/>
- <util:FileSearch Id="SearchSystem3"
- Path="[WindowsFolder]System32\ucrtbase.dll"
+ <util:FileSearch Id="SearchSystem3"
+ Path="[System64Folder]\ucrtbase.dll"
Variable="UCRTVERSION64"
Result="version"
/>
@@ -69,6 +70,13 @@
<util:ComponentSearch Id="vcredist_2008sp1_x64_msvcr90" Guid="{3FA0170E-227C-37C7-BAC0-64691A992C81}" Result="directory" Variable="vcredist_2008sp1_x64_msvcr90" />
<util:FileSearch Id="vcredist_2008sp1_x64_versionnumber" After="vcredist_2008sp1_x64_msvcr90" Condition="vcredist_2008sp1_x64_msvcr90" Path="[vcredist_2008sp1_x64_msvcr90]\msvcr90.dll" Result="version" Variable="vcredist_2008sp1_x64_versionnumber" />
+ <!-- n.b. unlike VC9, VC10 redist packages have different UpgradeCodes. But these evaluate to v10.0.40219.0, not v10.0.40219.325-->
+ <!-- util:ProductSearch Id="vcredist_2010sp1_x64_versionnumber" Result="version" Variable="vcredist_2010sp1_x64_versionnumber" UpgradeCode="{5B75F761-BAC8-33BC-A381-464DDDD813A3}" / -->
+ <!-- util:ProductSearch Id="vcredist_2010sp1_x86_versionnumber" Result="version" Variable="vcredist_2010sp1_x86_versionnumber" UpgradeCode="{1F4F1D2A-D9DA-32CF-9909-48485DA06DD5}" / -->
+ <!-- so use the .dll version directly -->
+ <util:FileSearch Id="vcredist_2010sp1_x64_versionnumber" Result="version" Variable="vcredist_2010sp1_x64_versionnumber" Path="[System64Folder]msvcr100.dll"/>
+ <util:FileSearch Id="vcredist_2010sp1_x86_versionnumber" Result="version" Variable="vcredist_2010sp1_x86_versionnumber" Path="[SystemFolder]msvcr100.dll"/>
+
<bal:Condition Message="Installation failed because your version of Windows is too old. $(var.ProductName) requires Windows 7 SP1 or newer."><![CDATA[Installed OR VersionNT > v6.1 OR (VersionNT = v6.1 AND ServicePackLevel >= 1)]]></bal:Condition>
<Chain>
<PackageGroupRef Id="NetFx45Web"/>
@@ -91,6 +99,42 @@
DownloadUrl="https://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/vcredist_x64.exe"
/>
+ <!-- needed for CrashRpt.dll, for libapr-1.dll, libeay32.dll, et al -->
+ <ExePackage Id="vcredist_2010SP1_x86.exe"
+ Name="vc_redist.x86.$(var.Vc10RedistVersion).exe"
+ InstallCommand="/q /norestart"
+ RepairCommand="/q /norestart"
+ UninstallCommand="/q /uninstall /norestart"
+ Protocol="none"
+ Compressed="$(var.Compressed)"
+ Permanent="yes"
+ DetectCondition="vcredist_2010sp1_x86_versionnumber >= $(var.Vc10RedistVersion)"
+ PerMachine="yes"
+ Vital="yes"
+ Cache="no"
+ SuppressSignatureVerification="yes"
+ SourceFile="Redist\VCRedist_2010SP1\vc_redist.x86.$(var.Vc10RedistVersion).exe"
+ DownloadUrl="https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe"
+ />
+
+ <!-- needed for CrashRpt.dll -->
+ <ExePackage Id="vcredist_2010SP1_x64.exe"
+ Name="vc_redist.x64.$(var.Vc10RedistVersion).exe"
+ InstallCommand="/norestart /q"
+ RepairCommand="/norestart /q"
+ UninstallCommand="/norestart /q /uninstall"
+ Protocol="none"
+ Compressed="$(var.Compressed)"
+ Permanent="yes"
+ DetectCondition="vcredist_2010sp1_x64_versionnumber >= $(var.Vc10RedistVersion)"
+ PerMachine="yes"
+ Vital="yes"
+ Cache="no"
+ SuppressSignatureVerification="yes"
+ SourceFile="Redist\VCRedist_2010SP1\vc_redist.x64.$(var.Vc10RedistVersion).exe"
+ DownloadUrl="https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe"
+ />
+
<ExePackage Id="vcredist_2015_x86.exe"
Name="vc_redist.x86.$(var.VcRedistVersion).exe"
InstallCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
More information about the gme-commit
mailing list