[Mobies-commit] [commit] r4152 - GReAT/trunk/InnoSetup

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Jan 25 18:30:28 2013
New Revision: 4152

Log:
Update UdmDll location

Modified:
   GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss

Modified: GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss
==============================================================================
--- GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss	Fri Jan 25 18:26:31 2013	(r4151)
+++ GReAT/trunk/InnoSetup/GReAT_innosetupVS2010.iss	Fri Jan 25 18:30:28 2013	(r4152)
@@ -292,50 +292,21 @@
 
 function CheckVersions(): Boolean;
 var
-  gme_path : String;
-  oGME :  Variant;
-  udm_path : String;
   MS, LS: Cardinal;
 begin
   Result := True;
-#ifdef GMEVER
-  gme_path := GetEnv('GME_ROOT');
-  /////////////////////////////////////////////////////////
-  // CASE #1: No GME installed
-  /////////////////////////////////////////////////////////
-  if gme_path = '' then begin
-    MsgBox('Unable to locate GME r{#GMEVER}.  Please install GME r{#GMEVER} first.', mbError, MB_OK);
-    Result := False;
-  /////////////////////////////////////////////////////////
-  // ELSE: wrong GME installed
-  ////////////////////////////////////////////////////////
-  end else begin
-	  oGME := CreateOleObject('GME.Application');
-    if oGME.Version <> '{#GMEVER}' then begin
-	    Result := MsgBox('This version of GReAT ({#GREATVER}) is recommended for use with GME {#GMEVER}. The currently installed GME version is '+oGME.Version+'.'#13#13+
-        'Are you sure you wish to continue with the installation?', mbConfirmation, MB_YESNO) = idYes;
-    end
-    IDispatchInvoke(oGME, False, 'Exit', []);
-  end;
-#endif
 #ifdef UDMVER
-  udm_path := GetEnv('UDM_PATH');
-  if udm_path = '' then begin
-    MsgBox('Unable to locate UDM {#UDMVER}. Please install UDM first.', mbError, MB_OK);
-    Result := False;
-  end else begin
-    if GetVersionNumbers(ExpandConstant(udm_path + '/bin/{#UDMDLL}'), MS, LS) then begin
-      // MS is checked through dll name
-      if LS < ${#UDM_PATCH} then begin
-        Result := Result and (MsgBox('This version of GReAT ({#GREATVER}) requires UDM {#UDMVER}. ' +
-          'The current version of UDM is ' + Format('%d.%d.%d', [MS shr 16, MS and $FFFF, LS shr 16]) + '. ' +
-          'Are you sure you wish to continue the installation?', mbConfirmation, MB_YESNO) = idYes);
-      end
-    end else begin
-      Result := Result and (MsgBox('This version of GReAT ({#GREATVER}) is recommended for use with UDM {#UDMVER}. ' +
-        'GReAT setup could not find {#UDMDLL} and will not operate correctly without it.'#13#13 +
+  if GetVersionNumbers(ExpandConstant('{sys}{#UDMDLL}'), MS, LS) then begin
+    // MS is checked through dll name
+    if LS < ${#UDM_PATCH} then begin
+      Result := Result and (MsgBox('This version of GReAT ({#GREATVER}) requires UDM {#UDMVER}. ' +
+        'The current version of UDM is ' + Format('%d.%d.%d', [MS shr 16, MS and $FFFF, LS shr 16]) + '. ' +
         'Are you sure you wish to continue the installation?', mbConfirmation, MB_YESNO) = idYes);
     end
+  end else begin
+    Result := Result and (MsgBox('This version of GReAT ({#GREATVER}) is recommended for use with UDM {#UDMVER}. ' +
+      'GReAT setup could not find {#UDMDLL} and will not operate correctly without it.'#13#13 +
+      'Are you sure you wish to continue the installation?', mbConfirmation, MB_YESNO) = idYes);
   end
 #endif
 	if (not has_vs2010) and (not has_vs2008) then begin