Mercurial Mercurial > hg > stx-goodies-smallsense / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
accidental merge
authorJakub Nesveda <jakubnesveda@seznam.cz>
Thu, 13 Nov 2014 00:22:39 +0100
changeset 744 d250b3a0c860
parent 743 79617bd3dbe1 (current diff)
parent 742 f0e637eae4af (diff)
child 745 2dd476349eba
child 751 d5704716bd3b
accidental merge
patches/patches.rc file | annotate | diff | comparison | revisions
refactoring_custom.rc file | annotate | diff | comparison | revisions 
--- a/CustomDummyTests.st	Thu Nov 13 00:14:52 2014 +0100
+++ b/CustomDummyTests.st	Thu Nov 13 00:22:39 2014 +0100
@@ -11,11 +11,12 @@
 !CustomDummyTests methodsFor:'tests'!
 
 test_dummy
-    "test commit 3"
+    CustomDummyClassPatches new.
     self assert: 'b' = 'b'.
 
     "Created: / 15-07-2013 / 18:34:02 / user"
     "Modified (comment): / 03-08-2013 / 12:40:51 / user"
+    "Modified: / 12-11-2014 / 08:39:11 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
 !
 
 test_dummy2
--- a/Make.proto	Thu Nov 13 00:14:52 2014 +0100
+++ b/Make.proto	Thu Nov 13 00:22:39 2014 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/refactoring -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jn/refactoring_custom/patches -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/refactoring -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
--- a/bc.mak	Thu Nov 13 00:14:52 2014 +0100
+++ b/bc.mak	Thu Nov 13 00:22:39 2014 +0100
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\refactoring -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\jn\refactoring_custom\patches -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\refactoring -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
--- a/jn_refactoring_custom.st	Thu Nov 13 00:14:52 2014 +0100
+++ b/jn_refactoring_custom.st	Thu Nov 13 00:22:39 2014 +0100
@@ -63,6 +63,7 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
+        #'jn:refactoring_custom/patches'    "CustomDummyClassPatches - referenced by CustomDummyTests>>test_dummy"
         #'stx:libbasic3'    "Change - referenced by CustomCodeGeneratorOrRefactoringTestCase>>assertSource:sameAs:"
         #'stx:libcomp'    "Parser - referenced by CustomNamespace>>createMethodImmediate:protocol:source:package:"
         #'stx:libview'    "WindowGroup - referenced by CustomCodeGeneratorOrRefactoring>>executeInContextWithWaitCursor:"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/CustomDummyClassPatches.st	Thu Nov 13 00:22:39 2014 +0100
@@ -0,0 +1,21 @@
+"{ Package: 'jn:refactoring_custom/patches' }"
+
+Object subclass:#CustomDummyClassPatches
+	instanceVariableNames:'className isMeta'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Refactory-Change Objects'
+!
+
+!CustomDummyClassPatches class methodsFor:'documentation'!
+
+documentation
+"
+    Kludge class - added because all my patches subdirectory wont be included in project definition.
+
+    [author:]
+        Jakub Nesveda <nesvejak@fit.cvut.cz>
+
+"
+! !
+
--- a/patches/Make.proto	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/Make.proto	Thu Nov 13 00:22:39 2014 +0100
@@ -123,6 +123,7 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)CustomDummyClassPatches.$(O) CustomDummyClassPatches.$(H): CustomDummyClassPatches.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)jn_refactoring_custom_patches.$(O) jn_refactoring_custom_patches.$(H): jn_refactoring_custom_patches.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes/AddClassChange.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes/AddMethodChange.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes/RefactoryChange.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/changes/RefactoryClassChange.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers/BrowserEnvironment.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers/RBAbstractClass.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers/RBMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 
--- a/patches/Make.spec	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/Make.spec	Thu Nov 13 00:22:39 2014 +0100
@@ -50,12 +50,14 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
+	CustomDummyClassPatches \
 	jn_refactoring_custom_patches \
 
 
 
 
 COMMON_OBJS= \
+    $(OUTDIR_SLASH)CustomDummyClassPatches.$(O) \
     $(OUTDIR_SLASH)jn_refactoring_custom_patches.$(O) \
     $(OUTDIR_SLASH)extensions.$(O) \
 
--- a/patches/abbrev.stc	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/abbrev.stc	Thu Nov 13 00:22:39 2014 +0100
@@ -1,4 +1,5 @@
 # automagically generated by the project definition
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
+CustomDummyClassPatches CustomDummyClassPatches jn:refactoring_custom/patches 'Refactory-Change Objects' 0
 jn_refactoring_custom_patches jn_refactoring_custom_patches jn:refactoring_custom/patches '* Projects & Packages *' 3
--- a/patches/bc.mak	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/bc.mak	Thu Nov 13 00:22:39 2014 +0100
@@ -69,6 +69,7 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)CustomDummyClassPatches.$(O) CustomDummyClassPatches.$(H): CustomDummyClassPatches.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)jn_refactoring_custom_patches.$(O) jn_refactoring_custom_patches.$(H): jn_refactoring_custom_patches.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes\AddClassChange.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes\AddMethodChange.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes\RefactoryChange.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\changes\RefactoryClassChange.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers\BrowserEnvironment.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers\RBAbstractClass.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers\RBMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
--- a/patches/jn_refactoring_custom_patches.st	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/jn_refactoring_custom_patches.st	Thu Nov 13 00:22:39 2014 +0100
@@ -76,6 +76,7 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
+        CustomDummyClassPatches
         #'jn_refactoring_custom_patches'
     )
 !
--- a/patches/libInit.cc	Thu Nov 13 00:14:52 2014 +0100
+++ b/patches/libInit.cc	Thu Nov 13 00:22:39 2014 +0100
@@ -27,6 +27,7 @@
 void _libjn_refactoring_custom_patches_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libjn_refactoring_custom_patches", _libjn_refactoring_custom_patches_Init, "jn:refactoring_custom/patches");
+_CustomDummyClassPatches_Init(pass,__pRT__,snd);
 _jn_137refactoring_137custom_137patches_Init(pass,__pRT__,snd);
 
 _jn_137refactoring_137custom_137patches_extensions_Init(pass,__pRT__,snd);
hg/stx-goodies-smallsense