diff -r 16c890248840 -r ff3118874df3 ProjectDefinition.st --- a/ProjectDefinition.st Wed Sep 14 11:25:43 2011 +0200 +++ b/ProjectDefinition.st Wed Sep 14 15:39:47 2011 +0200 @@ -6390,34 +6390,44 @@ !ProjectDefinition class methodsFor:'sanity checks'! validateDescription - |emptyProjects nonProjects emptyOrNonProjects| + |emptyProjects nonProjects emptyOrNonProjects classesInImage classesInDescription| emptyProjects := Set withAll:self subProjects. Smalltalk allClassesDo:[:cls | - emptyProjects remove:(cls package) ifAbsent:[]. + emptyProjects remove:(cls package) ifAbsent:[]. ]. nonProjects := self subProjects select:[:p | - (ProjectDefinition definitionClassForPackage: p) isNil - ]. + (ProjectDefinition definitionClassForPackage: p) isNil + ]. emptyOrNonProjects := Set withAll:emptyProjects. emptyOrNonProjects addAll:nonProjects. emptyOrNonProjects notEmpty ifTrue:[ - (Dialog - confirm:('The following projects are non-existent, empty or without description:\\ ' - , ((emptyOrNonProjects - asSortedCollection - collect:[:p | p allBold]) - asStringWith:'\ ') - , '\\Continue ?') withCRs - yesLabel:'OK' noLabel:'Cancel') - ifFalse:[ - AbortSignal raise - ]. + (Dialog + confirm:('The following projects are non-existent, empty or without description:\\ ' + , ((emptyOrNonProjects + asSortedCollection + collect:[:p | p allBold]) + asStringWith:'\ ') + , '\\Continue ?') withCRs + yesLabel:'OK' noLabel:'Cancel') + ifFalse:[ + AbortSignal raise + ]. ]. - "Modified: / 19-09-2006 / 20:30:39 / cg" + classesInImage := Smalltalk allClasses select:[:cls | cls package = package]. + classesInDescription := self classes asIdentitySet. + classesInImage ~= classesInDescription ifTrue:[ + Dialog warn:'The set of classes in the image is different from the listed classes in the project definition' + ]. + + " + squeak_vmMaker validateDescription + " + + "Modified: / 14-09-2011 / 15:39:40 / cg" ! ! !ProjectDefinition class methodsFor:'testing'! @@ -6489,11 +6499,11 @@ !ProjectDefinition class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.355 2011-09-13 11:56:22 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.356 2011-09-14 13:39:47 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.355 2011-09-13 11:56:22 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.356 2011-09-14 13:39:47 cg Exp $' ! version_SVN