changed:
#lccmake_dot_mak
#mingwmake_dot_mak
#tccmake_dot_mak
--- a/ProjectDefinition.st Wed Sep 26 18:21:22 2012 +0200
+++ b/ProjectDefinition.st Wed Sep 26 21:17:12 2012 +0200
@@ -1075,61 +1075,6 @@
self classNamesAndAttributes:newSpec usingCompiler:compilerOrNil
! !
-!ProjectDefinition class methodsFor:'accessing - svn'!
-
-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
- "
- | 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 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].
- revNr ifNotNil:[^SVN::Revision number:(revNr asString select:[:e|e isDigit])].
-
- "3)"
- revNr := (self searchForClassesWithProject: self package)
- inject: 0
- into:
- [:rev :cls|
- ((cls revision ? '.') includes: $.)"/ CVS revision number?
- ifTrue:[rev]
- ifFalse:[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
-
- "
-
- "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>"
- "Modified: / 13-02-2010 / 19:27:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
!ProjectDefinition class methodsFor:'accessing - tests'!
@@ -4381,7 +4326,7 @@
@REM type lccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USELCC=1 %%*
+make.exe -N -f bc.mak -DUSELCC=1 %%*
%(SUBPROJECT_LCCMAKE_CALLS)
'
@@ -4492,7 +4437,7 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USEMINGW=1 %%*
+make.exe -N -f bc.mak -DUSEMINGW=1 %%*
%(SUBPROJECT_MINGWMAKE_CALLS)
'
@@ -4582,7 +4527,7 @@
@REM type tccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USETCC=1 %%*
+make.exe -N -f bc.mak -DUSETCC=1 %%*
%(SUBPROJECT_TCCMAKE_CALLS)
'
@@ -6769,11 +6714,11 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.394 2012-09-19 08:33:54 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.395 2012-09-26 19:17:12 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.394 2012-09-19 08:33:54 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.395 2012-09-26 19:17:12 cg Exp $'
!
version_SVN