Mercurial Mercurial > hg > stx-libbasic / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ProjectDefinition.st
changeset 12740 a035bfe4af1a
parent 12739 c6bb8e98674b
child 12741 2e5f250f5426 
--- a/ProjectDefinition.st	Fri Feb 26 14:41:05 2010 +0100
+++ b/ProjectDefinition.st	Fri Feb 26 14:44:41 2010 +0100
@@ -12,11 +12,11 @@
 "{ Package: 'stx:libbasic' }"
 
 Object subclass:#ProjectDefinition
-	instanceVariableNames:''
-	classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
-		PackagesBeingLoaded Verbose'
-	poolDictionaries:''
-	category:'System-Support-Projects'
+        instanceVariableNames:''
+        classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
+                PackagesBeingLoaded Verbose'
+        poolDictionaries:''
+        category:'System-Support-Projects'
 !
 
 ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded'
@@ -990,47 +990,47 @@
 svnRevision
 
     "
-	Answers SVN revision of given package. The revision is computed
-	as follows:
-	1) Look at package directory if there is .svn administration
-	   directory. If so, uses SVN to obtain SVN revision & return
-	2) If svnRevisionNr return non-nil, use that as SVN revision & return
-	3) If everything fails, compute maximum from all revision of all
-	   classes & extensions
+        Answers SVN revision of given package. The revision is computed
+        as follows:
+        1) Look at package directory if there is .svn administration
+           directory. If so, uses SVN to obtain SVN revision & return
+        2) If svnRevisionNr return non-nil, use that as SVN revision & return
+        3) If everything fails, compute maximum from all revision of all
+           classes & extensions
     "
     | pkgDir revNr |
 
     "1)"
     pkgDir := self packageDirectory.
     (pkgDir notNil and: [pkgDir exists and: [(pkgDir / '.svn') exists]]) ifTrue:
-	[[revNr := (SVN::InfoCommand new
-		    workingCopy: (SVN::WorkingCopy branch: (SVN::Branch new) path: pkgDir);
-		    execute) anyOne revision]
-			value
-			"/on: Error do: [revNr := nil]
-			].
+        [[revNr := (SVN::InfoCommand new
+                    workingCopy: (SVN::WorkingCopy branch: (SVN::Branch new) path: pkgDir);
+                    execute) anyOne revision]
+                        value
+                        "/on: Error do: [revNr := nil]
+                        ].
     revNr ifNotNil:[^SVN::Revision number:revNr].
     "2)"
     "We have to explicitly check for existence of svnRevisionNr,
      because we don't want to invoke inherited method"
     (self class methodDictionary includesKey: #svnRevisionNr)
-	ifTrue:[revNr := self perform:#svnRevisionNr].
+        ifTrue:[revNr := self perform:#svnRevisionNr].
     revNr ifNotNil:[^SVN::Revision number:(revNr asString select:[:e|e isDigit])].
 
     "3)"
     revNr := (self searchForClassesWithProject: self package)
-		inject: 0
-		into:
-		    [:rev :cls|
-		    rev max: (cls revision ? '0') asNumber].
+                inject: 0
+                into:
+                    [:rev :cls|
+                    rev max: (cls revision ? '0') asNumber].
     ^revNr ~= 0
-	ifTrue: [SVN::Revision number:revNr]
-	ifFalse:[SVN::Revision head]
-
-    "
-	stx_libbasic svnRevision
-	stx_goodies_libsvn svnRevision
-	stx_goodies_libsvn revision
+        ifTrue: [SVN::Revision number:revNr]
+        ifFalse:[SVN::Revision head]
+
+    "
+        stx_libbasic svnRevision
+        stx_goodies_libsvn svnRevision
+        stx_goodies_libsvn revision
 
     "
 
@@ -1588,11 +1588,11 @@
 
 svnRevisionNr_code: revisionNrOrNil
     ^ String streamContents:[:s |
-	s nextPutLine:'svnRevisionNr'.
-	s nextPutLine:'    "Return a SVN revision number of myself.'.
-	s nextPutLine:'     This number is updated after a commit"'.
-	s cr;
-	nextPutLine:'    ^ "$SVN-Revision:"''', revisionNrOrNil printString , '''"$"'.
+        s nextPutLine:'svnRevisionNr'.
+        s nextPutLine:'    "Return a SVN revision number of myself.'.
+        s nextPutLine:'     This number is updated after a commit"'.
+        s cr;
+        nextPutLine:'    ^ "$SVN-Revision:"''', revisionNrOrNil printString , '''"$"'.
     ].
 
     "
@@ -1889,11 +1889,11 @@
     (self class includesSelector: #svnRevisionNr) ifFalse:[^''].
 
     ^ String streamContents:
-	[:s|s
-	nextPutLine:'update-svn-revision:';
-	tab; nextPutLine: 'sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"''$(shell svnversion -n)''\"\$$\"/g" \';
-	tab; tab; nextPutLine: (self name , '.st');
-	nextPutLine: '.PHONY: update-svn-revision']
+        [:s|s
+        nextPutLine:'update-svn-revision:';
+        tab; nextPutLine: 'sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"''$(shell svnversion -n)''\"\$$\"/g" \';
+        tab; tab; nextPutLine: (self name , '.st');
+        nextPutLine: '.PHONY: update-svn-revision']
 
     "Created: / 24-06-2009 / 21:33:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
@@ -2861,29 +2861,29 @@
 
 make_dot_proto_mappings
     ^ Dictionary new
-	at: 'TAB' put: ( Character tab asString );
-	at: 'TOP' put: ( self pathToTop_unix );
-	at: 'LIBRARY_NAME' put: ( self libraryName );
-	at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
-	at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
-	at: 'LOCAL_DEFINES' put: self localDefines_unix;
-	at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
-	at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
-	at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
-	at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
-	at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
-	at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
-	at: 'ADDITIONAL_RULES_SVN' put: (self additionalRulesSvn_make_dot_proto);
-	at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
-	at: 'ADDITIONAL_TARGETS_SVN' put: (self additionalTargetsSvn_make_dot_proto);
-	at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
-	at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
-	at: 'DEPENDENCIES' put: (self generateDependencies_unix);
-	at: 'MODULE' put: ( self module );
-	at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
-	at: 'MODULE_PATH' put: ( self moduleDirectory );
-	at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
-	yourself
+        at: 'TAB' put: ( Character tab asString );
+        at: 'TOP' put: ( self pathToTop_unix );
+        at: 'LIBRARY_NAME' put: ( self libraryName );
+        at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
+        at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
+        at: 'LOCAL_DEFINES' put: self localDefines_unix;
+        at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
+        at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+        at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+        at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
+        at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
+        at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
+        at: 'ADDITIONAL_RULES_SVN' put: (self additionalRulesSvn_make_dot_proto);
+        at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
+        at: 'ADDITIONAL_TARGETS_SVN' put: (self additionalTargetsSvn_make_dot_proto);
+        at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
+        at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
+        at: 'DEPENDENCIES' put: (self generateDependencies_unix);
+        at: 'MODULE' put: ( self module );
+        at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+        at: 'MODULE_PATH' put: ( self moduleDirectory );
+        at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
+        yourself
 
     "Created: / 09-08-2006 / 11:20:45 / fm"
     "Modified: / 09-08-2006 / 16:44:48 / fm"
@@ -4607,8 +4607,6 @@
     |classNamesToLoad classNamesToAutoload hasClassesToLoad loadedClasses platformName
      classesWhichFailedToLoad|
 
-    Transcript showCR:('  %1: filing in classes individually...' bindWith:self name).
-
     platformName := OperatingSystem platformName.
     classNamesToLoad := OrderedCollection new.
     classNamesToAutoload := OrderedCollection new.
@@ -4635,6 +4633,8 @@
     ].
 
     hasClassesToLoad ifTrue:[
+        Transcript showCR:('  %1: filing in missing classes individually...' bindWith:self name).
+
         loadedClasses := OrderedCollection new.
 
         self packageDirectory isNil ifTrue:[
@@ -5313,11 +5313,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.303 2010-02-26 13:41:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.304 2010-02-26 13:44:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.303 2010-02-26 13:41:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.304 2010-02-26 13:44:41 cg Exp $'
 ! !
 
 ProjectDefinition initialize!
hg/stx-libbasic