Stabilize order of definitions in `Make.spec`
...to reduce merge conflicts.
--- a/ProjectDefinition.st Wed Feb 01 11:28:48 2017 +0000
+++ b/ProjectDefinition.st Wed Feb 01 22:03:10 2017 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2006 by eXept Software AG
All Rights Reserved
@@ -2899,6 +2897,7 @@
! !
+
!ProjectDefinition class methodsFor:'description - project information'!
applicationAdditionalIconFileNames
@@ -4467,8 +4466,11 @@
classNamesDict := self classNamesByCategory.
^ String streamContents:[:s |
- classNamesDict keysAndValuesDo:[:eachCategory :classNames|
- s nextPutLine:eachCategory,'_CLASSES= \'.
+ classNamesDict keys asArray sort do:[:eachCategory|
+ | classNames |
+
+ classNames := classNamesDict at: eachCategory.
+ s nextPutAll:eachCategory; nextPutLine:'_CLASSES= \'.
classNames do:[:eachClassName|
s tab; nextPutAll:eachClassName; nextPutLine:' \'.
].
@@ -4486,6 +4488,7 @@
"Created: / 09-08-2006 / 11:24:39 / fm"
"Modified: / 20-10-2006 / 16:18:54 / cg"
+ "Modified: / 01-02-2017 / 21:57:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
generateDefinitionClassLine_libInit_dot_cc
@@ -4779,8 +4782,11 @@
s nextPutLine:newObjectLine.
].
- classNamesDict keysAndValuesDo:[:eachCategory :classNames|
- s nextPutLine:eachCategory,'_OBJS= \'.
+ classNamesDict keys asArray sort do:[:eachCategory |
+ | classNames |
+
+ classNames := classNamesDict at: eachCategory.
+ s nextPutAll:eachCategory; nextPutLine:'_OBJS= \'.
classNames do:putLineForClassName.
(eachCategory = 'COMMON' and:[self hasExtensionMethods]) ifTrue:[
s nextPutLine:' $(OUTDIR)extensions.$(O) \'.
@@ -4800,6 +4806,7 @@
"Created: / 09-08-2006 / 11:24:39 / fm"
"Modified: / 20-10-2006 / 16:18:54 / cg"
+ "Modified: / 01-02-2017 / 21:56:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
generateRequiredMakePrerequisites_bc_dot_mak