ProjectDefinition.st
branchjv
changeset 21024 8734987eb5c7
parent 20727 fb8c5591428b
parent 20952 7c5123a5f7a8
child 21026 81e280fc1b93
--- a/ProjectDefinition.st	Wed Oct 26 23:35:39 2016 +0100
+++ b/ProjectDefinition.st	Fri Nov 18 20:48:04 2016 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -144,7 +146,7 @@
           separator, use slash (as on UNIX), it will be automagically converted to platform's separator.
         * The second paramterer (true or false) tells the SCM whether the file should be generated (and thus
           overwritten) upon each commit (when true) or only the first time (when false). Important: see the 
-          emark below.
+          remark below.
         * The method itself should return file's contents a string. If it returns nil, then the file is *not*
           generated at all.
 
@@ -2869,7 +2871,6 @@
     "Created: / 18-08-2006 / 12:51:38 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'description - project information'!
 
 applicationAdditionalIconFileNames
@@ -4933,6 +4934,8 @@
 !
 
 subProjectMakeCallsUsing:callString
+    "for xxxmake.bat files"
+    
     ^ String streamContents:[:s |
         self effectiveSubProjects do:[:packageID |
             |pkgLabel skipLabel joinLabel|
@@ -4942,7 +4945,7 @@
             joinLabel := 'done_',pkgLabel.
             s nextPutLine:'@if not exist ',(self msdosPathToPackage:packageID from:(self package)),' goto ',skipLabel.
             s nextPutLine:'@echo "***********************************"'.
-            s nextPutLine:'@echo "Building ',(packageID copyReplaceAll:$: with:$/).
+            s nextPutLine:'@echo "Building ',(packageID copyReplaceAll:$: with:$/),'"'.
             s nextPutLine:'@echo "***********************************"'.
             s nextPutLine:'@pushd ', (self msdosPathToPackage:packageID from:(self package)).
             s nextPutAll:'@'; nextPutAll:callString; nextPutLine:' || exit /b "%errorlevel%"'.
@@ -4950,7 +4953,7 @@
             s nextPutLine:'@goto ',joinLabel.
             s nextPutLine:':',skipLabel.
             s nextPutLine:'@echo "###################################"'.
-            s nextPutLine:'@echo "FOLDER MISSING: ',(packageID copyReplaceAll:$: with:$/).
+            s nextPutLine:'@echo "FOLDER MISSING: ',(packageID copyReplaceAll:$: with:$/),'"'.
             s nextPutLine:'@echo "###################################"'.
             s nextPutLine:'exit /b 1'.
             s nextPutLine:':',joinLabel.
@@ -4985,7 +4988,6 @@
     ^ self subProjectMakeCallsUsing:'call vcmake %1 %2'.
 ! !
 
-
 !ProjectDefinition class methodsFor:'file templates'!
 
 autopackage_default_dot_apspec
@@ -5588,9 +5590,9 @@
             Smalltalk changed: #aboutToLoadPackage with: self.
             [
                 newStuffHasBeenLoaded := false.
-                (self infoPrinting and:[Smalltalk silentLoading not]) ifTrue:[
+                Smalltalk silentLoading ifFalse:[
                     "/ thisContext fullPrintAll.
-                    Transcript showCR:('loading %1%2...'
+                    Logger info:('loading %1%2...'
                                         bindWith:(asAutoloaded ifTrue:['as autoloaded '] ifFalse:[''])
                                         with:self name).
                 ].
@@ -5668,7 +5670,7 @@
     self projectIsLoaded ifFalse:[^ false].
     thisContext isRecursive ifTrue:[^ false].
 
-    (self infoPrinting and:[Smalltalk silentLoading not]) ifTrue:[
+    Smalltalk silentLoading ifFalse:[
         "/ thisContext fullPrintAll.
         Logger info:'unloading %1' with:self name.
     ].
@@ -6536,7 +6538,7 @@
                     ] ifFalse:[
                         errMsg := 'missing class for extension: ',className.
                     ].
-                    Transcript showCR:errMsg.
+                    Logger error:errMsg.
                     self error:errMsg mayProceed:true.
                     classesAlreadyWarned add:className.
                 ].
@@ -7624,7 +7626,7 @@
 
             cls := Smalltalk classNamed:nm.
             cls isNil ifTrue:[
-                Transcript showCR:('%1: failed to autoload class %2' bindWith:self name with:nm)
+                Logger warning:'%1: failed to autoload class %2' with:self name with:nm
             ].
             cls
         ]