Merge jv
authorHG Automerge
Fri, 20 Jan 2017 20:17:13 +0000
branchjv
changeset 21291 ee0044f48b5a
parent 21290 1e7175049bbc (current diff)
parent 21264 8a43f4a520e3 (diff)
child 21292 21faad473411
Merge
ApplicationDefinition.st
Filename.st
Timestamp.st
--- a/ApplicationDefinition.st	Wed Jan 18 22:52:31 2017 +0000
+++ b/ApplicationDefinition.st	Fri Jan 20 20:17:13 2017 +0000
@@ -1842,10 +1842,14 @@
 
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-        $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(REQUIRED_LIBS)
+        $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makePrereq
+
+makePrereq: $(REQUIRED_LIBS)
 
 subProjects:
-        $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(SUBPROJECT_LIBS)
+        $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makeSubProjects
+
+makeSubProjects: $(SUBPROJECT_LIBS)
 
 FORCE_BUILD:
         @rem Dummy target to force a build
@@ -2031,7 +2035,7 @@
     "Modified: / 02-06-2015 / 17:40:03 / gg"
     "Modified: / 26-01-2016 / 14:23:35 / jv"
     "Modified: / 03-03-2016 / 21:15:43 / cg"
-    "Modified: / 17-01-2017 / 17:18:24 / stefan"
+    "Modified: / 19-01-2017 / 11:50:05 / stefan"
 !
 
 bc_dot_mak_app_source_rules
@@ -2485,7 +2489,7 @@
 all::   prereq ALL_NP
 
 # like ALL, but not prereqs
-ALL_NP:: exe $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
+ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
 
 exe:    %(APPLICATION) registerApplication
 
@@ -2509,6 +2513,10 @@
 prereq:
         $(MAKE) FORCE=@@@FORCE-BUILD@@@ $(REQUIRED_LIBOBJS)
 
+subProjects:
+        $(MAKE) FORCE=@@@FORCE-BUILD@@@ $(SUBPROJECT_LIBS)
+
+
 #
 # a self installable delivery
 #
@@ -2555,6 +2563,7 @@
     "Modified: / 24-06-2009 / 21:40:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 26-07-2012 / 00:57:07 / cg"
     "Modified: / 28-11-2012 / 10:18:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-01-2017 / 11:41:26 / stefan"
 !
 
 make_dot_proto_app_source_rules
--- a/Filename.st	Wed Jan 18 22:52:31 2017 +0000
+++ b/Filename.st	Fri Jan 20 20:17:13 2017 +0000
@@ -4580,11 +4580,24 @@
 !Filename methodsFor:'private-accessing'!
 
 getName
+    <resource: #obsolete>
     "get the raw filename"
 
     ^ nameString
 !
 
+nameString
+    "raw access to nameString - req'd for xml-store/reload"
+
+    ^ nameString
+!
+
+nameString:aString
+    "raw access to nameString - req'd for xml-store/reload"
+
+    nameString := aString
+!
+
 setName:aString
     "set the filename"
 
@@ -5588,18 +5601,6 @@
     "Modified: 18.1.1996 / 21:36:27 / cg"
 !
 
-nameString
-    "raw access to nameString - req'd for xml-store/reload"
-
-    ^ nameString
-!
-
-nameString:aString
-    "raw access to nameString - req'd for xml-store/reload"
-
-    nameString := aString
-!
-
 pathName
     "return the full pathname of the file represented by the receiver,
      as a string. This will not include ..'s.
--- a/Timestamp.st	Wed Jan 18 22:52:31 2017 +0000
+++ b/Timestamp.st	Fri Jan 20 20:17:13 2017 +0000
@@ -105,16 +105,12 @@
 !Timestamp class methodsFor:'initialization'!
 
 initialize
-
-    "/ soon no longer;
-    "/ will be changed soon.
-    "/ if you need it for backward compatibility, define it in your smalltalk.rc
-    AbsoluteTime := self.       "backward compatibility"
-
     MinOSTime := OperatingSystem epochStartOSTime.
     MaxOSTime := OperatingSystem epochEndOSTime.
 
     Epoch := UtcTimestamp basicNew setSeconds:0.
+
+    "Modified: / 19-01-2017 / 17:01:59 / stefan"
 ! !
 
 !Timestamp class methodsFor:'instance creation'!
@@ -469,6 +465,7 @@
     "
 ! !
 
+
 !Timestamp class methodsFor:'private'!
 
 basicReadFrom:aStream
@@ -1727,6 +1724,7 @@
     "
 ! !
 
+
 !Timestamp methodsFor:'accessing'!
 
 day
@@ -3094,6 +3092,8 @@
     "
 ! !
 
+
+
 !Timestamp methodsFor:'testing'!
 
 isLocalTimestamp