Don not try to load a class library already linked to the executable
authorStefan Vogel <sv@exept.de>
Fri, 02 Mar 2007 16:40:49 +0100
changeset 10430 fc34b59eca00
parent 10429 cad3e5afc906
child 10431 6b7467f6d2d2
Don not try to load a class library already linked to the executable
ProjectDefinition.st
--- a/ProjectDefinition.st	Fri Mar 02 16:38:43 2007 +0100
+++ b/ProjectDefinition.st	Fri Mar 02 16:40:49 2007 +0100
@@ -3464,9 +3464,18 @@
 !
 
 loadClassLibrary
-    "try to load a binary class library"
-
-    ^ Smalltalk fileInClassLibrary:self libraryName inPackage:self package
+    "try to load a binary class library
+     Return true if ok, false if not."
+
+    |libraryName|
+
+    libraryName := self libraryName.
+
+    (Smalltalk isClassLibraryLoaded:libraryName) ifTrue:[
+        "already loaded"
+        ^ true 
+    ].  
+    ^ Smalltalk fileInClassLibrary:libraryName inPackage:self package
 !
 
 loadExtensions
@@ -3751,7 +3760,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.153 2007-03-01 19:28:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.154 2007-03-02 15:40:49 stefan Exp $'
 ! !
 
 ProjectDefinition initialize!