hg/stx-libbasic: comparison ProjectDefinition.st

equal deleted inserted replaced

-:c6bb8e98674b
+:a035bfe4af1a
 hereby transferred.
 "
 "{ Package: 'stx:libbasic' }"
 Object subclass:#ProjectDefinition
-	instanceVariableNames:''
+instanceVariableNames:''
-	classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
+classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType
-		PackagesBeingLoaded Verbose'
+PackagesBeingLoaded Verbose'
-	poolDictionaries:''
+poolDictionaries:''
-	category:'System-Support-Projects'
+category:'System-Support-Projects'
 !
 ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded'
 "
 !ProjectDefinition class methodsFor:'accessing - svn'!
 svnRevision
 "
-	Answers SVN revision of given package. The revision is computed
+Answers SVN revision of given package. The revision is computed
-	as follows:
+as follows:
-	1) Look at package directory if there is .svn administration
+1) Look at package directory if there is .svn administration
-	   directory. If so, uses SVN to obtain SVN revision & return
+directory. If so, uses SVN to obtain SVN revision & return
-	2) If svnRevisionNr return non-nil, use that as 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
+3) If everything fails, compute maximum from all revision of all
-	   classes & extensions
+classes & extensions
 "
 | pkgDir revNr |
 "1)"
 pkgDir := self packageDirectory.
 (pkgDir notNil and: [pkgDir exists and: [(pkgDir / '.svn') exists]]) ifTrue:
-	[[revNr := (SVN::InfoCommand new
+[[revNr := (SVN::InfoCommand new
-		    workingCopy: (SVN::WorkingCopy branch: (SVN::Branch new) path: pkgDir);
+workingCopy: (SVN::WorkingCopy branch: (SVN::Branch new) path: pkgDir);
-		    execute) anyOne revision]
+execute) anyOne revision]
-			value
+value
-			"/on: Error do: [revNr := nil]
+"/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
+inject: 0
-		into:
+into:
-		    [:rev :cls|
+[:rev :cls|
-		    rev max: (cls revision ? '0') asNumber].
+rev max: (cls revision ? '0') asNumber].
 ^revNr ~= 0
-	ifTrue: [SVN::Revision number:revNr]
+ifTrue: [SVN::Revision number:revNr]
-	ifFalse:[SVN::Revision head]
+ifFalse:[SVN::Revision head]
 "
-	stx_libbasic svnRevision
+stx_libbasic svnRevision
-	stx_goodies_libsvn svnRevision
+stx_goodies_libsvn svnRevision
-	stx_goodies_libsvn revision
+stx_goodies_libsvn revision
 "
 "Created: / 15-06-2009 / 11:54:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 22-08-2009 / 09:06:29 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Created: / 18-08-2006 / 16:14:19 / cg"
 !
 svnRevisionNr_code: revisionNrOrNil
 ^ String streamContents:[:s |
-	s nextPutLine:'svnRevisionNr'.
+s nextPutLine:'svnRevisionNr'.
-	s nextPutLine:'    "Return a SVN revision number of myself.'.
+s nextPutLine:'    "Return a SVN revision number of myself.'.
-	s nextPutLine:'     This number is updated after a commit"'.
+s nextPutLine:'     This number is updated after a commit"'.
-	s cr;
+s cr;
-	nextPutLine:'    ^ "$SVN-Revision:"''', revisionNrOrNil printString , '''"$"'.
+nextPutLine:'    ^ "$SVN-Revision:"''', revisionNrOrNil printString , '''"$"'.
 ].
 "
 self svnRevisionNr_code
 stx_libbasic3 svnRevisionNr_code
 additionalRulesSvn_make_dot_proto
 (self class includesSelector: #svnRevisionNr) ifFalse:[^''].
 ^ String streamContents:
-	[:s|s
+[:s|s
-	nextPutLine:'update-svn-revision:';
+nextPutLine:'update-svn-revision:';
-	tab; nextPutLine: 'sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"''$(shell svnversion -n)''\"\$$\"/g" \';
+tab; nextPutLine: 'sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"''$(shell svnversion -n)''\"\$$\"/g" \';
-	tab; tab; nextPutLine: (self name , '.st');
+tab; tab; nextPutLine: (self name , '.st');
-	nextPutLine: '.PHONY: update-svn-revision']
+nextPutLine: '.PHONY: update-svn-revision']
 "Created: / 24-06-2009 / 21:33:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 additionalRules_bc_dot_mak
 "Created: / 19-09-2006 / 22:47:43 / cg"
 !
 make_dot_proto_mappings
 ^ Dictionary new
-	at: 'TAB' put: ( Character tab asString );
+at: 'TAB' put: ( Character tab asString );
-	at: 'TOP' put: ( self pathToTop_unix );
+at: 'TOP' put: ( self pathToTop_unix );
-	at: 'LIBRARY_NAME' put: ( self libraryName );
+at: 'LIBRARY_NAME' put: ( self libraryName );
-	at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
+at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
-	at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
+at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
-	at: 'LOCAL_DEFINES' put: self localDefines_unix;
+at: 'LOCAL_DEFINES' put: self localDefines_unix;
-	at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
+at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
-	at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
-	at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
-	at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
+at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
-	at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
+at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
-	at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
+at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
-	at: 'ADDITIONAL_RULES_SVN' put: (self additionalRulesSvn_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' put: (self additionalTargets_make_dot_proto);
-	at: 'ADDITIONAL_TARGETS_SVN' put: (self additionalTargetsSvn_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_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
-	at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
+at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
-	at: 'DEPENDENCIES' put: (self generateDependencies_unix);
+at: 'DEPENDENCIES' put: (self generateDependencies_unix);
-	at: 'MODULE' put: ( self module );
+at: 'MODULE' put: ( self module );
-	at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
-	at: 'MODULE_PATH' put: ( self moduleDirectory );
+at: 'MODULE_PATH' put: ( self moduleDirectory );
-	at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
+at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
-	yourself
+yourself
 "Created: / 09-08-2006 / 11:20:45 / fm"
 "Modified: / 09-08-2006 / 16:44:48 / fm"
 "Modified: / 14-09-2006 / 18:57:52 / cg"
 "Modified: / 24-06-2009 / 21:50:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
 Answer true, if classes have been loaded"
 |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.
 hasClassesToLoad := false.
 ].
 ].
 ].
 hasClassesToLoad ifTrue:[
+Transcript showCR:('  %1: filing in missing classes individually...' bindWith:self name).
 loadedClasses := OrderedCollection new.
 self packageDirectory isNil ifTrue:[
 self
 error:(self name,'[error] cannot install because packageDirectory is unknown')
 ! !
 !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!

changeset 12740	a035bfe4af1a
parent 12739	c6bb8e98674b
child 12741	2e5f250f5426