# HG changeset patch # User Jan Vrany # Date 1372546437 -3600 # Node ID d2a4d3d918a19fa2d1f36bee89982419786c29f8 # Parent 724f9902f606b954a9fce48d8212bdda09781fb0 Changed superclass of SCMCommonSourceCodeManager to AbstractSourceCodeManager. This allows Mercurial support to be compiled under Smalltalk/X 6.2.2, diff -r 724f9902f606 -r d2a4d3d918a1 common/Make.proto --- a/common/Make.proto Wed Jun 26 07:50:47 2013 +0100 +++ b/common/Make.proto Sat Jun 29 23:53:57 2013 +0100 @@ -124,12 +124,12 @@ # build all mandatory prerequisite packages (containing superclasses) for this package prereq: cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" - cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" - cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" - cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" @@ -158,7 +158,7 @@ $(OUTDIR)SCMAbstractPackageModelRegistry.$(O) SCMAbstractPackageModelRegistry.$(H): SCMAbstractPackageModelRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractSourceCodeManager.$(O) SCMAbstractSourceCodeManager.$(H): SCMAbstractSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractTask.$(O) SCMAbstractTask.$(H): SCMAbstractTask.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)SCMCommonSourceCodeManagerUtilities.$(O) SCMCommonSourceCodeManagerUtilities.$(H): SCMCommonSourceCodeManagerUtilities.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)SCMCommonSourceCodeManagerUtilities.$(O) SCMCommonSourceCodeManagerUtilities.$(H): SCMCommonSourceCodeManagerUtilities.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SCMCompatModeQuery.$(O) SCMCompatModeQuery.$(H): SCMCompatModeQuery.st $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)stx_libscm_common.$(O) stx_libscm_common.$(H): stx_libscm_common.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractCommitDialog.$(O) SCMAbstractCommitDialog.$(H): SCMAbstractCommitDialog.st $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractDialog.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) diff -r 724f9902f606 -r d2a4d3d918a1 common/Make.spec --- a/common/Make.spec Wed Jun 26 07:50:47 2013 +0100 +++ b/common/Make.spec Sat Jun 29 23:53:57 2013 +0100 @@ -54,13 +54,13 @@ SCMAbstractPackageModel \ SCMAbstractPackageModelRegistry \ SCMAbstractSourceCodeManager \ + SCMAbstractTask \ + SCMCommonSourceCodeManagerUtilities \ + SCMCompatModeQuery \ stx_libscm_common \ - SCMAbstractTask \ SCMAbstractCommitDialog \ SCMAbstractFileoutLikeTask \ SCMAbstractCommitTask \ - SCMCommonSourceCodeManagerUtilities \ - SCMCompatModeQuery \ @@ -70,13 +70,13 @@ $(OUTDIR_SLASH)SCMAbstractPackageModel.$(O) \ $(OUTDIR_SLASH)SCMAbstractPackageModelRegistry.$(O) \ $(OUTDIR_SLASH)SCMAbstractSourceCodeManager.$(O) \ + $(OUTDIR_SLASH)SCMAbstractTask.$(O) \ + $(OUTDIR_SLASH)SCMCommonSourceCodeManagerUtilities.$(O) \ + $(OUTDIR_SLASH)SCMCompatModeQuery.$(O) \ $(OUTDIR_SLASH)stx_libscm_common.$(O) \ - $(OUTDIR_SLASH)SCMAbstractTask.$(O) \ $(OUTDIR_SLASH)SCMAbstractCommitDialog.$(O) \ $(OUTDIR_SLASH)SCMAbstractFileoutLikeTask.$(O) \ $(OUTDIR_SLASH)SCMAbstractCommitTask.$(O) \ - $(OUTDIR_SLASH)SCMCommonSourceCodeManagerUtilities.$(O) \ - $(OUTDIR_SLASH)SCMCompatModeQuery.$(O) \ $(OUTDIR_SLASH)extensions.$(O) \ diff -r 724f9902f606 -r d2a4d3d918a1 common/Makefile.init --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/Makefile.init Sat Jun 29 23:53:57 2013 +0100 @@ -0,0 +1,27 @@ +# +# DO NOT EDIT +# +# make uses this file (Makefile) only, if there is no +# file named "makefile" (lower-case m) in the same directory. +# My only task is to generate the real makefile and call make again. +# Thereafter, I am no longer used and needed. +# +# MACOSX caveat: +# as filenames are not case sensitive (in a default setup), +# we cannot use the above trick. Therefore, this file is now named +# "Makefile.init", and you have to execute "make -f Makefile.init" to +# get the initial makefile. This is now also done by the toplevel CONFIG +# script. + +.PHONY: run + +run: makefile + $(MAKE) -f makefile + +#only needed for the definition of $(TOP) +include Make.proto + +makefile: mf + +mf: + $(TOP)/rules/stmkmf diff -r 724f9902f606 -r d2a4d3d918a1 common/SCMCommonSourceCodeManagerUtilities.st --- a/common/SCMCommonSourceCodeManagerUtilities.st Wed Jun 26 07:50:47 2013 +0100 +++ b/common/SCMCommonSourceCodeManagerUtilities.st Sat Jun 29 23:53:57 2013 +0100 @@ -11,7 +11,7 @@ " "{ Package: 'stx:libscm/common' }" -SourceCodeManagerUtilitiesForWorkspaceBasedManagers subclass:#SCMCommonSourceCodeManagerUtilities +SourceCodeManagerUtilities subclass:#SCMCommonSourceCodeManagerUtilities instanceVariableNames:'' classVariableNames:'' poolDictionaries:'' diff -r 724f9902f606 -r d2a4d3d918a1 common/bc.mak --- a/common/bc.mak Wed Jun 26 07:50:47 2013 +0100 +++ b/common/bc.mak Sat Jun 29 23:53:57 2013 +0100 @@ -51,11 +51,12 @@ # build all mandatory prerequisite packages (containing superclasses) for this package prereq: pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " + pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " - pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " + pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " + pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " - pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -81,7 +82,7 @@ $(OUTDIR)SCMAbstractPackageModelRegistry.$(O) SCMAbstractPackageModelRegistry.$(H): SCMAbstractPackageModelRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractSourceCodeManager.$(O) SCMAbstractSourceCodeManager.$(H): SCMAbstractSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractTask.$(O) SCMAbstractTask.$(H): SCMAbstractTask.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)SCMCommonSourceCodeManagerUtilities.$(O) SCMCommonSourceCodeManagerUtilities.$(H): SCMCommonSourceCodeManagerUtilities.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)SCMCommonSourceCodeManagerUtilities.$(O) SCMCommonSourceCodeManagerUtilities.$(H): SCMCommonSourceCodeManagerUtilities.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SCMCompatModeQuery.$(O) SCMCompatModeQuery.$(H): SCMCompatModeQuery.st $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)stx_libscm_common.$(O) stx_libscm_common.$(H): stx_libscm_common.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SCMAbstractCommitDialog.$(O) SCMAbstractCommitDialog.$(H): SCMAbstractCommitDialog.st $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractDialog.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) diff -r 724f9902f606 -r d2a4d3d918a1 common/common.rc --- a/common/common.rc Wed Jun 26 07:50:47 2013 +0100 +++ b/common/common.rc Sat Jun 29 23:53:57 2013 +0100 @@ -3,7 +3,7 @@ // automagically generated from the projectDefinition: stx_libscm_common. // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,2,2486,2486 + FILEVERSION 6,2,32767,32767 PRODUCTVERSION 6,2,3,0 #if (__BORLANDC__) FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE @@ -20,12 +20,12 @@ BEGIN VALUE "CompanyName", "Jan Vrany\0" VALUE "FileDescription", "Source Code Management Support Library for Smalltalk/X (LIB)\0" - VALUE "FileVersion", "6.2.2486.2486\0" + VALUE "FileVersion", "6.2.32767.32767\0" VALUE "InternalName", "stx:libscm/common\0" VALUE "LegalCopyright", "Copyright Jan Vrany 2012\0" VALUE "ProductName", "Smalltalk/X SCM Support Library\0" VALUE "ProductVersion", "6.2.3.0\0" - VALUE "ProductDate", "Mon, 01 Apr 2013 13:00:01 GMT\0" + VALUE "ProductDate", "Sat, 29 Jun 2013 22:52:53 GMT\0" END END