Mercurial Mercurial > hg > stx-libjava / 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.
fix JavaBehavior>>hasMultipleVersions development
authorMarcel Hlopko <marcel.hlopko@gmail.com>
Mon, 28 Oct 2013 15:36:14 +0100
branchdevelopment
changeset 2896 edaa0c80646e
parent 2895 70df89fe0af0
child 2897 21a756977e9f
fix JavaBehavior>>hasMultipleVersions
JavaBehavior.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bmake.bat file | annotate | diff | comparison | revisions
lccmake.bat file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions
mingwmake.bat file | annotate | diff | comparison | revisions
stx_libjava.st file | annotate | diff | comparison | revisions
vcmake.bat file | annotate | diff | comparison | revisions 
--- a/JavaBehavior.st	Sun Oct 27 10:28:57 2013 +0000
+++ b/JavaBehavior.st	Mon Oct 28 15:36:14 2013 +0100
@@ -199,9 +199,10 @@
     "
     return true if this class has multiple coexisting versions
     "
-    ^ (accessFlags bitAnd:ACX_HASMULTIVERS) ~~ 1
+    ^ ((accessFlags bitAnd:ACX_HASMULTIVERS) == 0) not.
 
     "Created: / 02-10-2013 / 21:48:24 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: / 28-10-2013 / 13:01:32 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 makeObsolete
@@ -212,28 +213,28 @@
 
 markMultipleVersions
     "
-     mark this class cacheable - references to this class don't have to be
-     resolved over and over again, but can be cached."
+     mark this class non cacheable - references to this class have to be
+     resolved over and over again, cannot be cached."
     
-    (accessFlags bitAnd: ACX_HASMULTIVERS) ~~ 1 ifTrue: [
+    self hasMultipleVersions not ifTrue: [
         accessFlags := accessFlags bitXor: ACX_HASMULTIVERS
     ].
 
     "Created: / 14-04-2013 / 14:17:38 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
-    "Modified: / 02-10-2013 / 21:40:19 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified (comment): / 28-10-2013 / 14:07:35 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 markNonMultipleVersions
     "
-     mark this class non cacheable - references to this class have to be
-     resolved over and over again, because multiple versions of this class exist."
+     mark this class cacheable - references to this class dont have to be
+     resolved over and over again, can be cached."
     
-    (accessFlags bitAnd: ACX_HASMULTIVERS) ~~ 0 ifTrue: [
+    self hasMultipleVersions ifTrue: [
         accessFlags := accessFlags bitXor: ACX_HASMULTIVERS
     ].
 
     "Created: / 14-04-2013 / 14:25:23 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
-    "Modified (format): / 02-10-2013 / 21:47:26 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified (comment): / 28-10-2013 / 14:07:59 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 markUninitialized
--- a/Make.proto	Sun Oct 27 10:28:57 2013 +0000
+++ b/Make.proto	Mon Oct 28 15:36:14 2013 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= experiments libs tools
+SUBDIRS= tools experiments
 
 
 # subdirectories where Makefiles are to be made:
--- a/abbrev.stc	Sun Oct 27 10:28:57 2013 +0000
+++ b/abbrev.stc	Mon Oct 28 15:36:14 2013 +0100
@@ -76,6 +76,7 @@
 JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
 JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
+JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
 JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
 JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
 JavaUnresolvedCompilationError JavaUnresolvedCompilationError stx:libjava 'Languages-Java-Support' 1
@@ -121,7 +122,6 @@
 JavaNativeMethodImpl_OpenJDK6 JavaNativeMethodImpl_OpenJDK6 stx:libjava 'Languages-Java-Support-OpenJDK6' 0
 JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 1
 JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
 JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
 JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support' 0
--- a/bmake.bat	Sun Oct 27 10:28:57 2013 +0000
+++ b/bmake.bat	Mon Oct 28 15:36:14 2013 +0100
@@ -10,13 +10,6 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/libs
-@echo "***********************************"
-@cd libs
-@call bmake %1 %2
-@cd ..
-
-@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
--- a/lccmake.bat	Sun Oct 27 10:28:57 2013 +0000
+++ b/lccmake.bat	Mon Oct 28 15:36:14 2013 +0100
@@ -6,13 +6,6 @@
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/libs
-@echo "***********************************"
-@cd libs
-@call lccmake %1 %2
-@cd ..
-
-@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
--- a/libjava.rc	Sun Oct 27 10:28:57 2013 +0000
+++ b/libjava.rc	Mon Oct 28 15:36:14 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 17 Oct 2013 10:06:03 GMT\0"
+      VALUE "ProductDate", "Mon, 28 Oct 2013 13:08:32 GMT\0"
     END
 
   END
--- a/mingwmake.bat	Sun Oct 27 10:28:57 2013 +0000
+++ b/mingwmake.bat	Mon Oct 28 15:36:14 2013 +0100
@@ -14,13 +14,6 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/libs
-@echo "***********************************"
-@cd libs
-@call mingwmake %1 %2
-@cd ..
-
-@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
--- a/stx_libjava.st	Sun Oct 27 10:28:57 2013 +0000
+++ b/stx_libjava.st	Mon Oct 28 15:36:14 2013 +0100
@@ -193,9 +193,8 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
+        #'stx:libjava/tools'
         #'stx:libjava/experiments'
-        #'stx:libjava/libs'
-        #'stx:libjava/tools'
     )
 ! !
 
@@ -383,6 +382,7 @@
         JavaSourceFileWriter
         (JavaTestCaseProxy autoload)
         JavaTestsLoader
+        (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
@@ -428,7 +428,6 @@
         #'JavaNativeMethodImpl_OpenJDK6'
         JavaRelease
         JavaStringRef2
-        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
--- a/vcmake.bat	Sun Oct 27 10:28:57 2013 +0000
+++ b/vcmake.bat	Mon Oct 28 15:36:14 2013 +0100
@@ -18,13 +18,6 @@
 
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/libs
-@echo "***********************************"
-@cd libs
-@call vcmake %1 %2
-@cd ..
-
-@echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
 @cd tools
hg/stx-libjava