# HG changeset patch # User Stefan Vogel # Date 1172850049 -3600 # Node ID fc34b59eca009916d24ad7c3fcf04bf71e14f753 # Parent cad3e5afc906e952668ea2907a000a555b2e25e5 Don not try to load a class library already linked to the executable diff -r cad3e5afc906 -r fc34b59eca00 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!