--- a/ProjectDefinition.st Fri Jan 31 02:04:30 2014 +0000
+++ b/ProjectDefinition.st Sun Feb 02 14:16:24 2014 +0000
@@ -2589,7 +2589,6 @@
! !
-
!ProjectDefinition class methodsFor:'description - project information'!
applicationAdditionalIconFileNames
@@ -3249,7 +3248,9 @@
].
wasLoaded ifFalse:[
- cls unload
+ UserPreferences current autoUnloadAutoloadedClassesInProjectDefinition ifTrue:[
+ cls unload
+ ]
]
].
s cr.
@@ -3275,7 +3276,7 @@
"
"Created: / 09-08-2006 / 11:24:39 / fm"
- "Modified: / 21-01-2012 / 12:42:57 / cg"
+ "Modified: / 28-01-2014 / 21:43:56 / cg"
!
generate_autopackage_default_dot_apspec
@@ -3840,7 +3841,7 @@
"answer a dictionary
category -> classNames topological sorted"
- |classes classNames mapping|
+ |classes classNames mapping alreadyWarned|
mapping := Dictionary new.
@@ -3853,7 +3854,7 @@
].
mapping at:'COMMON' put:classNames.
-
+ alreadyWarned := false.
OperatingSystem knownPlatformNames do:[:platformID |
|platformClasses platformClassNames|
@@ -3866,9 +3867,14 @@
platformClassNames
select:[:nm | |cls| cls := Smalltalk classNamed:nm. cls isNil or:[cls isLoaded not]]
thenDo:[:nm | Transcript tab; showCR:nm].
- (Dialog confirm:('Dependencies (and therefore build-order) might be incorrect\(some classes for platform ''%1'' are not present or autoloaded; see Transcript).\\Continue anyway without recomputing the order for this platform''s classes?' withCRs bindWith:platformID))
- ifFalse:[
- AbortOperationRequest raise.
+ UserPreferences current suppressProjectDefinitionWarnings ifFalse:[
+ alreadyWarned ifFalse:[
+ (Dialog confirm:('Dependencies (and therefore build-order) might be incorrect\(some classes for platform ''%1'' are not present or autoloaded; see Transcript).\\Continue anyway without recomputing the compilation order for this platform''s classes?' withCRs bindWith:platformID))
+ ifFalse:[
+ AbortOperationRequest raise.
+ ].
+ ].
+ alreadyWarned := true
].
] ifFalse:[
classes := Class classesSortedByLoadOrder:platformClasses.
@@ -3887,7 +3893,7 @@
"
"Created: / 09-08-2006 / 11:24:39 / fm"
- "Modified: / 25-11-2011 / 16:41:47 / cg"
+ "Modified: / 28-01-2014 / 21:40:23 / cg"
!
commonSymbolsFlag
@@ -5254,16 +5260,20 @@
].
nonExistantClasses notEmpty ifTrue:[
- (Dialog confirm:(Dialog classResources
- stringWithCRs:'"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.\\Continue anyway?'
- with:nonExistantClasses anElement allBold))
- ifFalse:[
- AbortOperationRequest raise.
+ Transcript showCR:('"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.' bindWith:nonExistantClasses).
+ UserPreferences current suppressProjectDefinitionWarnings ifFalse:[
+ (Dialog confirm:(Dialog classResources
+ stringWithCRs:'"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.\\Continue anyway?'
+ with:nonExistantClasses anElement allBold)) ifFalse:[
+ AbortOperationRequest raise.
+ ].
].
^ false.
].
^ true
+
+ "Modified: / 28-01-2014 / 21:44:37 / cg"
!
classNamesAndAttributesAsSpecArray
@@ -5375,9 +5385,12 @@
cls := Smalltalk classNamed:eachName.
cls isNil ifTrue:[
- self warn:('Missing/invalid class: %1\\%2'
- bindWith:eachName
- with:('Warning: The class is skipped in the list of compiled classes.' allBold)) withCRs.
+ Transcript showCR:('Warning: Missing/invalid class: %1 - the class is skipped in the list of compiled classes.').
+ UserPreferences current suppressProjectDefinitionWarnings ifFalse:[
+ self warn:('Missing/invalid class: %1\\%2'
+ bindWith:eachName
+ with:('Warning: The class is skipped in the list of compiled classes.' allBold)) withCRs.
+ ].
cls := nil.
].
cls
@@ -5386,7 +5399,7 @@
"Created: / 09-08-2006 / 16:28:15 / fm"
"Modified: / 09-08-2006 / 18:02:28 / fm"
- "Modified: / 11-10-2010 / 12:11:06 / cg"
+ "Modified: / 28-01-2014 / 21:45:08 / cg"
!
cvsRevision
@@ -7401,7 +7414,7 @@
, '\\Continue ?') withCRs
yesLabel:'OK' noLabel:'Cancel')
ifFalse:[
- AbortSignal raise
+ AbortOperationRequest raise
].
].
@@ -7543,11 +7556,11 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.486 2013-12-17 20:55:34 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.489 2014-01-28 20:45:30 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.486 2013-12-17 20:55:34 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.489 2014-01-28 20:45:30 cg Exp $'
!
version_HG