ProjectDefinition.st
changeset 23434 5e97f84cfb40
parent 23374 b6a74e001e1a
child 23437 096581648654
--- a/ProjectDefinition.st	Sat Oct 13 13:45:06 2018 +0200
+++ b/ProjectDefinition.st	Sun Oct 14 08:48:19 2018 +0200
@@ -3533,12 +3533,12 @@
 
     pairs := OrderedCollection new.
     self fileNamesToGenerate keysDo:[:fileName |
-	|fileContents|
-
-	fileContents := self generateFile:fileName.
-	fileContents notNil ifTrue:[
-	    pairs add:(Array with:fileName with:fileContents)
-	].
+        |fileContents|
+
+        fileContents := self generateFile:fileName confirmMissingClasses:false.
+        fileContents notNil ifTrue:[
+            pairs add:(Array with:fileName with:fileContents)
+        ].
     ].
 
     pairs pairsDo:aTwoArgBlock
@@ -3549,35 +3549,47 @@
 !
 
 generateFile:filename
+    ^ self generateFile:filename confirmMissingClasses:true
+!
+
+generateFile:filename confirmMissingClasses:confirmBoolean
     |action missingNames|
 
-    (#('bc.mak' 'Make.proto' 'loadAll') includes:filename) ifTrue:[
-	"if there are missing classes in image, the dependencies cannot be computed.
-	 Warn the user"
-
-	missingNames := self allClassNames "compiled_classNames"
-				    select:[:aName |
-					|cls|
-
-					cls := Smalltalk at:aName asSymbol.
-					cls isNil
-				    ].
-	missingNames notEmpty ifTrue:[
-	    (self confirm:(self classResources stringWithCRs:'While generating %1:\Some classes from the list of compiled classes are missing in the image:\\%2\\If you continue, you have to fix dependencies for these classes in %1 manually!!\\Continue anyway?'
-					with:filename with:(missingNames asStringWith:', ')))
-	    ifFalse:[^ nil].
-	].
+    confirmBoolean ifTrue:[
+        (#('bc.mak' 'Make.proto' 'loadAll') includes:filename) ifTrue:[
+            "if there are missing classes in image, the dependencies cannot be computed.
+             Warn the user"
+
+            missingNames := 
+                    self allClassNames "compiled_classNames"
+                        select:[:aName |
+                            |cls|
+
+                            cls := Smalltalk at:aName asSymbol.
+                            cls isNil
+                        ].
+            missingNames notEmpty ifTrue:[
+                (self confirm:(self classResources 
+                                    stringWithCRs:'While generating %1:\Some classes from the list of compiled classes are missing in the image:\\%2\\If you continue, you have to fix dependencies for these classes in %1 manually!!\\Continue anyway?'
+                                    with:filename 
+                                    with:(missingNames asStringWith:', ')))
+                ifFalse:[^ nil].
+            ].
+        ].
     ].
 
     action := self basicFileNamesToGenerate at:filename ifAbsent:[].
     action notNil ifTrue:[
-	^ self perform:action
-    ].
-    (filename = 'app.rc' or:[filename = 'lib.rc' or:[filename = self rcFilename]]) ifTrue:[
-	^ self generate_packageName_dot_rc
+        ^ self perform:action
+    ].
+    (filename = 'app.rc' 
+      or:[filename = 'lib.rc' 
+      or:[filename = self rcFilename]]
+    ) ifTrue:[
+        ^ self generate_packageName_dot_rc
     ].
     (filename = 'loadAll') ifTrue:[
-	^ self generate_loadAll
+        ^ self generate_loadAll
     ].
     self error:('File "%1" not appropriate (not generated) for this type of project.' bindWith:filename)