[Mobies-commit] [commit] r3728 - UDM/trunk/InnoSetup

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed May 11 14:12:21 2011
New Revision: 3728

Log:
GACing UdmCli: dont try if the user doesnt have .NET framework installed

Modified:
   UDM/trunk/InnoSetup/udm_innosetupVS2008.iss

Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Wed May 11 11:54:42 2011	(r3727)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Wed May 11 14:12:21 2011	(r3728)
@@ -46,12 +46,13 @@
 Name: english; MessagesFile: compiler:Default.isl
 
 [Types]
-Name: Full; Description: Full; Flags: iscustom
+Name: Full; Description: Full
 Name: Typical; Description: Typical
+Name: Custom; Description: Custom; Flags: iscustom
 
 [Components]
-Name: Core; Description: Core UDM; Types: Typical Full; Flags: fixed
-Name: C; Description: C++ UDM; Types: Typical Full; Flags: fixed
+Name: Core; Description: Core UDM; Types: Typical Full Custom; Flags: fixed
+Name: C; Description: C++ UDM; Types: Typical Full Custom; Flags: fixed
 Name: Clibs; Description: C++ UDM Static Libraries (deprecated); Types: Typical Full
 Name: Java; Description: Java UDM; Types: Full Typical
 Name: Python; Description: Python UDM; Types: Full Typical
@@ -104,7 +105,7 @@
 Source: {#UDMPATH}\Build\Win32\VC9\Release\UdmSwig.dll; DestDir: {app}\bin; Components: Java; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Release\{#UDMDLLVS10}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Debug\{#UDMDLLDVS10}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
-Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCli.dll; DestDir: {app}\bin; Flags: "sharedfile uninsnosharedfileprompt"; Components: CS
+Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCli.dll; DestDir: {app}\bin; StrongAssemblyName: "UdmCli, Version=3.2.7.0, Culture=neutral, PublicKeyToken=9b61694741cb5693, ProcessorArchitecture=x86"; Flags: "gacinstall sharedfile uninsnosharedfileprompt"; Components: CS
 Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCliBridge.dll; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
 Source: {#UDMPATH}\src\UdmCliGen\dist\UdmCliGen.exe; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Release\udm.pyd; DestDir: {app}\bin; Components: Python CS; Flags: ignoreversion
@@ -206,6 +207,7 @@
 Root: HKCU; Subkey: Environment; ValueType: string; ValueName: UDM_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: not System
 Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: UDM_PATH; ValueData: {app}; Flags: uninsdeletevalue deletevalue; Components: System
 Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: UDM_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: System
+Root: HKLM; Subkey: SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\UdmCli; ValueType: string; ValueData: "C:\Windows\assembly\GAC_32\UdmCli\3.2.7.0__9b61694741cb5693"; Flags: uninsdeletevalue deletevalue
 
 
 [Run]
@@ -340,6 +342,7 @@
 var
   MyComponents : String;
   MyCompLen : Integer;
+  i : Integer;
 begin
   Result := True;
   if CurPageID = wpSelectComponents then begin
@@ -352,6 +355,14 @@
     end;
   end;
   if (CurPageID = wpInfoBefore) and not WizardSilent() then begin
+  // If .NET framework is not present, deselect C# UDM component
+  //   (GACing UdmCli.dll fails if the target doesn't have the .NET framework.)
+    for i := 1 to 100 do
+      if WizardForm.ComponentsList.ItemCaption[i] = 'C# UDM' then
+        break;
+    if not RegKeyExists(HKLM,'SOFTWARE\Microsoft\.NETFramework\policy\v2.0') then
+      WizardForm.ComponentsList.Checked[i] := False;
+
     Result := CheckVersions();
   end;
 end;