[JVCL-Checkins] SF.net SVN: jvcl: [10977] trunk/jvcl/install/JVCLInstall/JVCLData.pas

[<ob...@us...>]

Revision: 10977
          http://svn.sourceforge.net/jvcl/?rev=10977&view=rev
Author:   obones
Date:     2006-10-16 00:43:22 -0700 (Mon, 16 Oct 2006)

Log Message:
-----------
LoadPackage may trigger an exception.

Modified Paths:
--------------
    trunk/jvcl/install/JVCLInstall/JVCLData.pas

Modified: trunk/jvcl/install/JVCLInstall/JVCLData.pas
===================================================================
--- trunk/jvcl/install/JVCLInstall/JVCLData.pas	2006-10-12 20:26:51 UTC (rev 10976)
+++ trunk/jvcl/install/JVCLInstall/JVCLData.pas	2006-10-16 07:43:22 UTC (rev 10977)
@@ -446,7 +446,13 @@
   FJclLinkMapFile := nil;
   for I := 0 to FTargets.Count - 1 do
   begin
-    FJclLibrary := LoadPackage(PChar(TargetConfig[I].VersionedJclBpl('Jcl.bpl')));
+    try
+      FJclLibrary := LoadPackage(PChar(TargetConfig[I].VersionedJclBpl('Jcl.bpl')));
+    except
+      // In case of an exception, the only thing we can do is decide not to use the BPL.
+      FJclLibrary := 0;
+    end;
+    
     if FJclLibrary <> 0 then
     begin
       FJclLinkMapFile := GetProcAddress(FJclLibrary,PChar(JclLinkMapFileExportName));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.