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.
Merge patches changes
authorJakub Nesveda <jakubnesveda@seznam.cz>
Wed, 05 Nov 2014 23:27:37 +0100
changeset 728 fae223e31a0d
parent 727 203d550ff2a3 (current diff)
parent 714 ed961347a1f6 (diff)
child 729 2f976696555a
Merge patches changes
Make.proto file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
jn_refactoring_custom.st file | annotate | diff | comparison | revisions
patches/jn_refactoring_custom_patches.st file | annotate | diff | comparison | revisions
patches/patches.rc file | annotate | diff | comparison | revisions
refactoring_custom.rc file | annotate | diff | comparison | revisions 
--- a/CustomCodeGeneratorOrRefactoringTestCase.st	Wed Nov 05 23:20:11 2014 +0100
+++ b/CustomCodeGeneratorOrRefactoringTestCase.st	Wed Nov 05 23:27:37 2014 +0100
@@ -22,7 +22,7 @@
 
 generatorOrRefactoring
     "Should return an instance of CustomCodeGenerator or CustomRefactoring subclass"
-    
+
     ^ self subclassResponsibility
 
     "Created: / 27-05-2014 / 19:16:44 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
@@ -216,6 +216,12 @@
 !
 
 setUp
+    Screen current isNil ifTrue:[
+    	Smalltalk openDisplay.
+    	Screen current isNil ifTrue:[
+    	    self assert: false description: 'Tests need display connection'.
+    	]
+    ].
 
     classes := OrderedCollection new.
     mock := CustomMock new.
@@ -230,7 +236,7 @@
     self defaultUserPreferences.
     generatorOrRefactoring := self generatorOrRefactoring.
 
-    self setUpTestFormatter. 
+    self setUpTestFormatter.
 
     generatorOrRefactoring isNil ifFalse: [
         self setUpGeneratorOrRefactoring: generatorOrRefactoring
@@ -271,16 +277,16 @@
 
     formatter := CustomRBLocalSourceCodeFormatter new.
     formatter
-        tabIndent: 4;  
-        spaceAroundTemporaries: false;  
-        emptyLineAfterTemporaries: true;  
+        tabIndent: 4;
+        spaceAroundTemporaries: false;
+        emptyLineAfterTemporaries: true;
         emptyLineAfterMethodComment: true;
-        spaceAfterReturnToken: true;  
-        spaceAfterKeywordSelector: false;  
-        spaceAfterBlockStart: true;  
-        spaceBeforeBlockEnd: true;  
-        cStyleBlocks: true;  
-        blockArgumentsOnNewLine: false;  
+        spaceAfterReturnToken: true;
+        spaceAfterKeywordSelector: false;
+        spaceAfterBlockStart: true;
+        spaceBeforeBlockEnd: true;
+        cStyleBlocks: true;
+        blockArgumentsOnNewLine: false;
         maxLengthForSingleLineBlocks: 4;
         periodAfterLastStatementPolicy: #keep.
     "
--- a/Make.proto	Wed Nov 05 23:20:11 2014 +0100
+++ b/Make.proto	Wed Nov 05 23:27:37 2014 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS=
+SUBDIRS= patches
 
 
 # subdirectories where Makefiles are to be made:
@@ -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	Wed Nov 05 23:20:11 2014 +0100
+++ b/bc.mak	Wed Nov 05 23:27:37 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/bmake.bat	Wed Nov 05 23:20:11 2014 +0100
+++ b/bmake.bat	Wed Nov 05 23:27:37 2014 +0100
@@ -9,4 +9,11 @@
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
 
+@echo "***********************************"
+@echo "Buildung jn/refactoring_custom/patches
+@echo "***********************************"
+@cd patches
+@call bmake %1 %2
+@cd ..
 
+
--- a/jn_refactoring_custom.st	Wed Nov 05 23:20:11 2014 +0100
+++ b/jn_refactoring_custom.st	Wed Nov 05 23:27:37 2014 +0100
@@ -9,6 +9,11 @@
 
 !jn_refactoring_custom class methodsFor:'documentation'!
 
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
+! 
+
 documentation
 "
     Package documentation:
@@ -63,7 +68,10 @@
         #'stx:libview'    "WindowGroup - referenced by CustomCodeGeneratorOrRefactoring>>executeInContextWithWaitCursor:"
         #'stx:libwidg'    "DialogBox - referenced by CustomUserDialog>>initialize"
         #'stx:libwidg2'    "CheckBox - referenced by CustomDialog>>addCheckBoxOn:labeled:"
+        #'jn:refactoring_custom/patches'
     )
+
+    "Modified: / 15-10-2014 / 00:02:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 subProjects
@@ -73,7 +81,10 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
+        #'jn:refactoring_custom/patches'
     )
+
+    "Modified: / 15-10-2014 / 00:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !jn_refactoring_custom class methodsFor:'description - contents'!
--- a/lccmake.bat	Wed Nov 05 23:20:11 2014 +0100
+++ b/lccmake.bat	Wed Nov 05 23:27:37 2014 +0100
@@ -5,4 +5,11 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
+@echo "***********************************"
+@echo "Buildung jn/refactoring_custom/patches
+@echo "***********************************"
+@cd patches
+@call lccmake %1 %2
+@cd ..
 
+
--- a/mingwmake.bat	Wed Nov 05 23:20:11 2014 +0100
+++ b/mingwmake.bat	Wed Nov 05 23:27:37 2014 +0100
@@ -13,4 +13,11 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
+@echo "***********************************"
+@echo "Buildung jn/refactoring_custom/patches
+@echo "***********************************"
+@cd patches
+@call mingwmake %1 %2
+@cd ..
 
+
--- a/patches/jn_refactoring_custom_patches.st	Wed Nov 05 23:20:11 2014 +0100
+++ b/patches/jn_refactoring_custom_patches.st	Wed Nov 05 23:27:37 2014 +0100
@@ -93,6 +93,13 @@
     )
 ! !
 
+!jn_refactoring_custom_patches methodsFor:'documentation'!
+
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 !jn_refactoring_custom_patches class methodsFor:'documentation'!
 
 version_HG
--- a/patches/patches.rc	Wed Nov 05 23:20:11 2014 +0100
+++ b/patches/patches.rc	Wed Nov 05 23:27:37 2014 +0100
@@ -25,6 +25,7 @@
       VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
       VALUE "ProductName", "LibraryName\0"
       VALUE "ProductVersion", "6.2.4.1378\0"
+
       VALUE "ProductDate", "Wed, 05 Nov 2014 22:15:58 GMT\0"
     END
 
--- a/vcmake.bat	Wed Nov 05 23:20:11 2014 +0100
+++ b/vcmake.bat	Wed Nov 05 23:27:37 2014 +0100
@@ -17,4 +17,11 @@
 
 
 
+@echo "***********************************"
+@echo "Buildung jn/refactoring_custom/patches
+@echo "***********************************"
+@cd patches
+@call vcmake %1 %2
+@cd ..
 
+
hg/stx-goodies-smallsense