[commit] r1873 - in trunk/Install: . Build PIAs PIAs_1.0.1.0
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Thu Mar 22 15:22:51 CDT 2012
Author: ksmyth
Date: Thu Mar 22 15:22:51 2012
New Revision: 1873
Log:
Dont install PIAs if .NET framework is not installed, it will fail
Modified:
trunk/Install/Build/tools.py
trunk/Install/GME_paradigms.wxs
trunk/Install/PIAs/GME.MGA.Core.wxi
trunk/Install/PIAs/GME.MGA.Meta.wxi
trunk/Install/PIAs/GME.MGA.Parser.wxi
trunk/Install/PIAs/GME.MGA.wxi
trunk/Install/PIAs/GME.Util.wxi
trunk/Install/PIAs/GMEPIA.wxi
trunk/Install/PIAs_1.0.1.0/GME.MGA.Core.wxi
trunk/Install/PIAs_1.0.1.0/GME.MGA.Meta.wxi
trunk/Install/PIAs_1.0.1.0/GME.MGA.Parser.wxi
trunk/Install/PIAs_1.0.1.0/GME.MGA.wxi
trunk/Install/PIAs_1.0.1.0/GME.Util.wxi
trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi
trunk/Install/PIAs_1.0.1.0/make
Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/Build/tools.py Thu Mar 22 15:22:51 2012 (r1873)
@@ -18,7 +18,7 @@
WIX_CANDLE_PRG = "candle.exe"
WIX_CANDLE_ARG = "-dPIADir=..\GME\DotNetPIAs_1.0.0.0 -dPIADir.1.0.1.0=..\GME\DotNetPIAs"
WIX_LIGHT_PRG = "light.exe"
-WIX_LIGHT_ARG = "-sw1076 -sw1055 -sw1056 -sice:ICE43 -sice:ICE57 -ext WixUIExtension -ext WixUtilExtension" # See comments in GME.wxs
+WIX_LIGHT_ARG = "-sw1076 -sw1055 -sw1056 -sice:ICE43 -sice:ICE57 -ext WixUIExtension -ext WixUtilExtension -ext WiXNetFxExtension" # See comments in GME.wxs
#
# Classes
Modified: trunk/Install/GME_paradigms.wxs
==============================================================================
--- trunk/Install/GME_paradigms.wxs Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/GME_paradigms.wxs Thu Mar 22 15:22:51 2012 (r1873)
@@ -12,6 +12,12 @@
InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
InstallPrivileges='elevated' InstallScope='perMachine'/>
+
+ <PropertyRef Id="NETFRAMEWORK20"/>
+ <PropertyRef Id="NETFRAMEWORK40FULL"/>
+ <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
+ <Property Id="NETFRAMEWORK">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Property>
+
<!-- =========================================================== -->
<!-- DIRECTORY STRUCTURE -->
<!-- =========================================================== -->
Modified: trunk/Install/PIAs/GME.MGA.Core.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Core.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GME.MGA.Core.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Core">
<Component Id="GME.MGA.Core.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{3BDD7F38-DCF5-46C1-B07E-CF70772C882F}" Permanent="yes">
<File Id="GME.MGA.Core.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Core.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs/GME.MGA.Meta.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Meta.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GME.MGA.Meta.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Meta">
<Component Id="GME.MGA.Meta.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{0BE9DD47-1FEB-4492-88E7-0172D9AA4A30}" Permanent="yes">
<File Id="GME.MGA.Meta.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Meta.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs/GME.MGA.Parser.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Parser.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GME.MGA.Parser.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Parser">
<Component Id="GME.MGA.Parser.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{9DF42C34-5F58-4158-BD50-454864B9DFD6}" Permanent="yes">
<File Id="GME.MGA.Parser.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Parser.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs/GME.MGA.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GME.MGA.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA">
<Component Id="GME.MGA.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{4C5478E1-D9FF-4E93-B87C-B847F398408A}" Permanent="yes">
<File Id="GME.MGA.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs/GME.Util.wxi
==============================================================================
--- trunk/Install/PIAs/GME.Util.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GME.Util.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.Util">
<Component Id="GME.Util.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{074746CF-EA1A-4B45-899E-D4D6C5B6FEB0}" Permanent="yes">
<File Id="GME.Util.dll" KeyPath="yes" Source="$(var.PIADir)\GME.Util.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs/GMEPIA.wxi
==============================================================================
--- trunk/Install/PIAs/GMEPIA.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs/GMEPIA.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME">
<Component Id="GME.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{B4C1E329-1964-4941-901B-077CC0A64A83}" Permanent="yes">
<File Id="GME.dll" KeyPath="yes" Source="$(var.PIADir)\GME.dll" Assembly=".net" />
+ <Condition>NETFRAMEWORK</Condition>
</Component>
</ComponentGroup>
</Fragment>
Modified: trunk/Install/PIAs_1.0.1.0/GME.MGA.Core.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GME.MGA.Core.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GME.MGA.Core.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Core.1.0.1.0">
<Component Id="cmp4D3DABE643C1E5F8C94A9C33F1E1BAA9" Directory="PIADIR.1.0.1.0" Guid="{995757FA-C2F0-406F-BAED-0E97374BCE82}" Permanent="yes">
<File Id="filC56702691135417471E3DD618EFF6E78" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.MGA.Core.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\1.0.1.0" Name="Class" Value="GME.MGA.Core.CoreBinFileClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME.MGA.Core, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/GME.MGA.Meta.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GME.MGA.Meta.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GME.MGA.Meta.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Meta.1.0.1.0">
<Component Id="cmp43D10C69FA68348ED1D503B4D997B09A" Directory="PIADIR.1.0.1.0" Guid="{6B5883EA-1CE2-47B9-A5EB-175CD254143B}" Permanent="yes">
<File Id="fil423710884D4A22D3C76B728361F0EFD8" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.MGA.Meta.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{83BA3244-B758-11D3-ABAE-000000000000}\InprocServer32\1.0.1.0" Name="Class" Value="GME.MGA.Meta.MgaMetaProjectClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{83BA3244-B758-11D3-ABAE-000000000000}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME.MGA.Meta, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{83BA3244-B758-11D3-ABAE-000000000000}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/GME.MGA.Parser.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GME.MGA.Parser.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GME.MGA.Parser.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.Parser.1.0.1.0">
<Component Id="cmpE40AF75B165037629E65E9C4D227EEF2" Directory="PIADIR.1.0.1.0" Guid="{05BC0228-9FDD-4268-B50D-3A0ABB7A41CE}" Permanent="yes">
<File Id="fil05C908F8792B3BFF822569A500C199D0" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.MGA.Parser.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{70C41B25-E3CE-11D3-B37A-005004D38590}\InprocServer32\1.0.1.0" Name="Class" Value="GME.MGA.Parser.MgaMetaParserClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{70C41B25-E3CE-11D3-B37A-005004D38590}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME.MGA.Parser, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{70C41B25-E3CE-11D3-B37A-005004D38590}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/GME.MGA.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GME.MGA.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GME.MGA.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.MGA.1.0.1.0">
<Component Id="cmpBF781B59FC218D303B4729104C1E4234" Directory="PIADIR.1.0.1.0" Guid="{141067BE-706F-482F-8B1B-CF4DC339A091}" Permanent="yes">
<File Id="fil9EB57CB8D9FC1B5084EE2E2D2B5FE97F" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.MGA.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{1DF52E42-BCC0-4439-B3CD-75610AC372A3}\InprocServer32\1.0.1.0" Name="Class" Value="GME.MGA.MgaOClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{1DF52E42-BCC0-4439-B3CD-75610AC372A3}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME.MGA, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{1DF52E42-BCC0-4439-B3CD-75610AC372A3}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/GME.Util.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GME.Util.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GME.Util.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -7,6 +7,7 @@
<ComponentGroup Id="GME.Util.1.0.1.0">
<Component Id="cmp885AB1B6320D6C1595A4F6BC54D799BD" Directory="PIADIR.1.0.1.0" Guid="{3FDF9D4A-688C-48D8-9E03-331B8C7C43D4}" Permanent="yes">
<File Id="fil37E4282FA6433FAB0E7388BDE800E258" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.Util.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{461F30B1-3BF0-11D4-B3F0-005004D38590}\InprocServer32\1.0.1.0" Name="Class" Value="GME.Util.MgaResolverClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{461F30B1-3BF0-11D4-B3F0-005004D38590}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME.Util, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{461F30B1-3BF0-11D4-B3F0-005004D38590}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi Thu Mar 22 15:22:51 2012 (r1873)
@@ -9,6 +9,7 @@
<ComponentGroup Id="GME.1.0.1.0">
<Component Id="cmp1D1602EEEE2DA94C4F88B4DAC0EBDB6F" Directory="PIADIR.1.0.1.0" Guid="{0CD246D6-8928-4F46-B85C-876EE769BCDE}" Permanent="yes">
<File Id="fil389AF60539FC47530EE6BAEE49125C9D" KeyPath="yes" Source="$(var.PIADir.1.0.1.0)\GME.dll" Assembly=".net"/>
+ <Condition>NETFRAMEWORK</Condition>
<RegistryValue Root="HKCR" Key="CLSID\{05403CF4-5C53-49D4-8F63-ED37870ABF1F}\InprocServer32\1.0.1.0" Name="Class" Value="GME.CollectionClass" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{05403CF4-5C53-49D4-8F63-ED37870ABF1F}\InprocServer32\1.0.1.0" Name="Assembly" Value="GME, Version=1.0.1.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
<RegistryValue Root="HKCR" Key="CLSID\{05403CF4-5C53-49D4-8F63-ED37870ABF1F}\InprocServer32\1.0.1.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
Modified: trunk/Install/PIAs_1.0.1.0/make
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/make Thu Mar 22 15:22:27 2012 (r1872)
+++ trunk/Install/PIAs_1.0.1.0/make Thu Mar 22 15:22:51 2012 (r1873)
@@ -8,6 +8,7 @@
mv GME.wxi GMEPIA.wxi
# then add Assembly=".net" to <File
+# and <Condition>NETFRAMEWORK</Condition> under <Component>
# then remove <RegistryValues from previous versions (for the same version of the typelib)
# <DirectoryRef Id="INSTALLDIR_BIN">
#<Directory Id="PIADIR.1.0.1.0" Name="PIA1.0.1.0"/>
More information about the gme-commit
mailing list