--- a/ChangeSetDiffComponent.st Thu Dec 20 11:54:04 2012 +0000
+++ b/ChangeSetDiffComponent.st Wed Jan 16 11:55:57 2013 +0000
@@ -133,6 +133,13 @@
"Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+depth
+ "Return the depth if diff component hierarchy, 0 if there is no nesting at all"
+ ^0
+
+ "Created: / 15-01-2013 / 11:26:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
diffs
^#()
@@ -267,9 +274,9 @@
!ChangeSetDiffComponent class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSetDiffComponent.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffComponent.st 1985 2013-01-16 11:55:57Z vranyj1 $'
!
version_SVN
- ^ '$Id: ChangeSetDiffComponent.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffComponent.st 1985 2013-01-16 11:55:57Z vranyj1 $'
! !
--- a/ChangeSetDiffSet.st Thu Dec 20 11:54:04 2012 +0000
+++ b/ChangeSetDiffSet.st Wed Jan 16 11:55:57 2013 +0000
@@ -79,6 +79,17 @@
!ChangeSetDiffSet methodsFor:'accessing'!
+depth
+ | depth |
+ depth := 0.
+ diffs do:[:diff|
+ depth := depth max: diff depth
+ ].
+ ^depth + 1
+
+ "Created: / 15-01-2013 / 11:27:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
diffs
^ diffs
!
@@ -279,9 +290,9 @@
!ChangeSetDiffSet class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.5 2012/07/31 12:34:33 vrany Exp $'
+ ^ '$Id: ChangeSetDiffSet.st 1985 2013-01-16 11:55:57Z vranyj1 $'
!
version_SVN
- ^ '$Id: ChangeSetDiffSet.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffSet.st 1985 2013-01-16 11:55:57Z vranyj1 $'
! !
--- a/Make.proto Thu Dec 20 11:54:04 2012 +0000
+++ b/Make.proto Wed Jan 16 11:55:57 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/Make.proto,v 1.131 2012/07/31 13:30:56 vrany Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
@@ -63,12 +63,12 @@
all:: preMake classLibRule postMake
-pre_objs::
+pre_objs::
-# Update SVN revision in stx_libbasic3.st
+# Update SVN revision in package definition class
ifneq (,$(findstring .svn,$(wildcard .svn)))
.svnversion: *.st
if [ -d .svn ]; then \
@@ -79,17 +79,29 @@
fi
stx_libbasic3.o: stx_libbasic3.st .svnversion
- if [ -d .svn ]; then \
+ @if [ -d .svn ]; then \
rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+ echo " [SV] Expanding svnRevisionNo in $1.st"; \
sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libbasic3.svn.st; \
fi
- $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic3.svn $(O_RULE);
- mv .stx_libbasic3.svn.$(O) stx_libbasic3.$(O)
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic3.svn $(C_RULE);
+ sed -i -e "s/\".stx_libbasic3.svn.st\");/\"\stx_libbasic3.st\");/g" .stx_libbasic3.svn.c
+ $(MAKE) .stx_libbasic3.svn.$(O)
+ @mv .stx_libbasic3.svn.$(O) stx_libbasic3.$(O)
endif
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports
+ $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
# add more install actions here
install::
@@ -104,11 +116,11 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -129,7 +141,7 @@
$(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -165,7 +177,7 @@
$(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic3/ChangeNotificationParameter.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
$(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -197,3 +209,4 @@
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
+
--- a/Make.spec Thu Dec 20 11:54:04 2012 +0000
+++ b/Make.spec Wed Jan 16 11:55:57 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/Make.spec,v 1.81 2012/10/31 16:07:40 stefan Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
--- a/SourceCodeManagerUtilities.st Thu Dec 20 11:54:04 2012 +0000
+++ b/SourceCodeManagerUtilities.st Wed Jan 16 11:55:57 2013 +0000
@@ -3831,9 +3831,13 @@
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.264 2012/11/07 16:54:17 cg Exp $'
+ ^ '$Id: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1 $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.264 2012/11/07 16:54:17 cg Exp '
-! !
\ No newline at end of file
+ ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.264 2012/11/07 16:54:17 cg Exp §'
+!
+
+version_SVN
+ ^ '$Id:: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1 $'
+! !
--- a/WrappedMethod.st Thu Dec 20 11:54:04 2012 +0000
+++ b/WrappedMethod.st Wed Jan 16 11:55:57 2013 +0000
@@ -355,14 +355,14 @@
!WrappedMethod class methodsFor:'documentation'!
version
- ^ '$Header$'
+ ^ '$Id: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1 $'
!
version_HG
- ^ '$Changeset: <not expanded> $'
+ ^ '§Changeset: <not expanded> §'
!
version_SVN
- ^ '§Id§'
+ ^ '$Id:: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1 $'
! !
--- a/bc.mak Thu Dec 20 11:54:04 2012 +0000
+++ b/bc.mak Wed Jan 16 11:55:57 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/bc.mak,v 1.111 2012/10/31 16:07:44 stefan Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
@@ -54,17 +54,22 @@
# build all prerequisite packages for this package
prereq:
pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+test: $(TOP)\goodies\builder\reports\NUL
+ pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+ $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)AbstractSourceCodeManager.$(O) AbstractSourceCodeManager.$(H): AbstractSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CallChain.$(O) CallChain.$(H): CallChain.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -107,7 +112,7 @@
$(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic3\ChangeNotificationParameter.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
$(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -136,6 +141,6 @@
$(OUTDIR)MethodPackageChange.$(O) MethodPackageChange.$(H): MethodPackageChange.st $(INCLUDE_TOP)\stx\libbasic3\MethodChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)MethodPrivacyChange.$(O) MethodPrivacyChange.$(H): MethodPrivacyChange.st $(INCLUDE_TOP)\stx\libbasic3\MethodChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)MethodRemoveChange.$(O) MethodRemoveChange.$(H): MethodRemoveChange.st $(INCLUDE_TOP)\stx\libbasic3\MethodChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/bmake.bat Thu Dec 20 11:54:04 2012 +0000
+++ b/bmake.bat Wed Jan 16 11:55:57 2013 +0000
@@ -3,6 +3,10 @@
@REM type bmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak %*
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+make.exe -N -f bc.mak %DEFINES% %*
--- a/libInit.cc Thu Dec 20 11:54:04 2012 +0000
+++ b/libInit.cc Wed Jan 16 11:55:57 2013 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /cvs/stx/stx/libbasic3/libInit.cc,v 1.98 2012/10/31 16:07:53 stefan Exp $
+ * $Header$
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libbasic3.
--- a/libbasic3.rc Thu Dec 20 11:54:04 2012 +0000
+++ b/libbasic3.rc Wed Jan 16 11:55:57 2013 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libbasic3.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1,73
- PRODUCTVERSION 6,2,2,1
+ FILEVERSION 6,2,1981,1981
+ PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Additional Developer Basic Classes (LIB)\0"
- VALUE "FileVersion", "6.2.1.73\0"
+ VALUE "FileVersion", "6.2.1981.1981\0"
VALUE "InternalName", "stx:libbasic3\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.2.1\0"
- VALUE "ProductDate", "Wed, 31 Oct 2012 16:07:39 GMT\0"
+ VALUE "ProductVersion", "6.2.3.0\0"
+ VALUE "ProductDate", "Wed, 16 Jan 2013 11:57:17 GMT\0"
END
END
--- a/mingwmake.bat Thu Dec 20 11:54:04 2012 +0000
+++ b/mingwmake.bat Wed Jan 16 11:55:57 2013 +0000
@@ -3,6 +3,10 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak -DUSEMINGW=1 %*
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+make.exe -N -f bc.mak -DUSEMINGW=1 %DEFINES% %*
--- a/stx_libbasic3.st Thu Dec 20 11:54:04 2012 +0000
+++ b/stx_libbasic3.st Wed Jan 16 11:55:57 2013 +0000
@@ -11,7 +11,7 @@
"
"{ Package: 'stx:libbasic3' }"
-LibraryDefinition subclass:#'stx_libbasic3'
+LibraryDefinition subclass:#stx_libbasic3
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -39,10 +39,6 @@
Build- and package information for creation of the st/x standard library: stx_libbasic3.
This library contains source-code-management, packaging and history related stuff.
"
-!
-
-extensionsVersion_SVN
- ^ '$Id: stx_libbasic3.st 1981 2012-11-30 17:20:01Z vranyj1 $'
! !
!stx_libbasic3 class methodsFor:'description'!
@@ -72,10 +68,10 @@
exclude individual packages in the #excludedFromPrerequisites method."
^ #(
- #'stx:libbasic' "GenericException - superclass of ChangeSet::ChangeProcessingError "
- #'stx:libbasic2' "Text - referenced by CVSSourceCodeManager class>>checkin:text:directory:module:logMessage:force: "
- #'stx:libdb/libodbc' "SQL::ODBCSession - referenced by StoreSourceCodeManager class>>tryToConnectToDatabase: "
- #'stx:libdb/libsqlite' "SQLiteConnection - referenced by DataBaseSourceCodeManager class>>openSQLite: "
+ #'stx:libbasic' "SmalltalkChunkFileSourceWriter - superclass of ChangeSet::ClassSourceWriter "
+ #'stx:libbasic2' "UUID - referenced by DataBaseSourceCodeManager class>>createModule:directory: "
+ #'stx:libdb/libodbc'
+ #'stx:libdb/libsqlite' "SqliteError - referenced by DataBaseSourceCodeManager class>>openSQLite: "
)
! !
@@ -188,6 +184,7 @@
UserPreferences historyManagerAllowEditOfHistory
UserPreferences managerPerMatchingModuleDefinitions
UserPreferences managerPerMatchingModuleDefinitions:
+ 'ConfigurableFeatures class' hasProjectChecker
)
! !
@@ -230,7 +227,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'1945 '"$"
+ ^ "$SVN-Revision:"'1984M '"$"
! !
!stx_libbasic3 class methodsFor:'others'!
@@ -242,9 +239,9 @@
!stx_libbasic3 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/stx_libbasic3.st,v 1.74 2012/10/31 16:07:54 stefan Exp $'
+ ^ '$Id: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1 $'
!
version_SVN
- ^ '$Id:: stx_libbasic3.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+ ^ '$Id:: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1 $'
! !
--- a/vcmake.bat Thu Dec 20 11:54:04 2012 +0000
+++ b/vcmake.bat Wed Jan 16 11:55:57 2013 +0000
@@ -7,6 +7,12 @@
@if not defined VSINSTALLDIR (
call ..\rules\vcsetup.bat
)
-make.exe -N -f bc.mak -DUSEVC %*
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
+
+