--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Feb 28 06:51:21 2016 +0100
@@ -0,0 +1,17 @@
+
+syntax: glob
+*Init.c
+makefile
+*.so
+*.H
+*.o
+*.STH
+*.sc
+objbc
+objvc
+objmingw
+*.class
+java/libs/*.jar
+java/libs-src/*.jar
+*-Test.xml
+st.chg

--- a/BackgroundQueueProcessingJob.st	Sat Feb 27 21:16:47 2016 +0100
+++ b/BackgroundQueueProcessingJob.st	Sun Feb 28 06:51:21 2016 +0100
@@ -182,20 +182,20 @@
 !BackgroundQueueProcessingJob methodsFor:'processing'!
 
 process
+
+    | cookie item |
+
+    cookie := 'cookie'.
     [
-        |hasMore item |
-
-        hasMore := false.
+        item := cookie.
         queueAccessLock critical:[
-            queue notEmpty ifTrue:[
-                hasMore := true.
-                item := queue removeFirst
-            ]
+            queue notEmpty ifTrue:[item := queue removeFirst]
         ].
-        hasMore ifFalse:[^ self].
-        self processItem: item.
-        item := nil.
-    ] loop.
+        item ~~ cookie ifTrue:[
+            self processItem: item
+        ].
+        item ~~ cookie.
+    ] whileTrue.
 
     "Created: / 28-04-2011 / 20:36:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 03-08-2011 / 16:43:21 / cg"
@@ -261,14 +261,14 @@
 !BackgroundQueueProcessingJob class methodsFor:'documentation'!
 
 version
-    ^ '$Header$'
+    ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundQueueProcessingJob.st,v 1.17 2015-02-21 10:03:53 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header$'
+    ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundQueueProcessingJob.st,v 1.17 2015-02-21 10:03:53 vrany Exp $'
 !
 
 version_SVN
-    ^ '$Id$'
+    ^ '$Id: BackgroundQueueProcessingJob.st,v 1.17 2015-02-21 10:03:53 vrany Exp $'
 ! !
 

--- a/Make.proto	Sat Feb 27 21:16:47 2016 +0100
+++ b/Make.proto	Sun Feb 28 06:51:21 2016 +0100
@@ -76,6 +76,13 @@
 
 
 
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libbasic2.$(O): $(shell hg root)/.hg/dirstate
+endif
+
 
 
 

--- a/ZipArchive.st	Sat Feb 27 21:16:47 2016 +0100
+++ b/ZipArchive.st	Sun Feb 28 06:51:21 2016 +0100
@@ -3738,14 +3738,15 @@
         "ignore duplicate entries for backward compatibility.
          Argh: expecco once added wrong duplicates to the end of ets files.
                The first entry is valid."
-        ('stx [Info]: Duplicate entry in ZIP (ignored): ', zmemb fileName) infoPrintCR.
+        Logger info: 'Duplicate entry in ZIP (ignored): %1' with: zmemb fileName.
     ] ifFalse:[
         zipMembersByName at:zmemb fileName put:zmemb.
     ].
     ^ zmemb.
 
-    "Modified: / 30.3.1998 / 17:13:20 / cg"
-    "Created: / 9.9.1998 / 20:33:06 / cg"
+    "Modified: / 30-03-1998 / 17:13:20 / cg"
+    "Created: / 09-09-1998 / 20:33:06 / cg"
+    "Modified: / 09-11-2015 / 11:51:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 checkZipArchive
@@ -5236,6 +5237,11 @@
 
 version_CVS
     ^ '$Header$'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !
 
 

--- a/bc.mak	Sat Feb 27 21:16:47 2016 +0100
+++ b/bc.mak	Sun Feb 28 06:51:21 2016 +0100
@@ -36,6 +36,11 @@
 MODULE_PATH=libbasic2
 RESFILES=libbasic2.$(RES)
 
+!ifdef USEBC
+WINSOCK_LIB=ws2_32.lib
+!else
+WINSOCK_LIB=
+!endif
 
 
 LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
@@ -61,7 +66,7 @@
 
 $(ZLIB):
 	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
+	$(MAKE_BAT)
 	cd ..\..\libbasic2
 
 $(BZ2LIB):
@@ -208,3 +213,12 @@
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libbasic2.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF

--- a/stx_libbasic2.st	Sat Feb 27 21:16:47 2016 +0100
+++ b/stx_libbasic2.st	Sun Feb 28 06:51:21 2016 +0100
@@ -113,9 +113,26 @@
 '
 !
 
+additionalDefinitions_bc_dot_mak
+    "allows for additional definitions/rules to be added to the bc.mak file.
+     Subclasses may redefine this."
+
+    ^'
+!!ifdef USEBC
+WINSOCK_LIB=ws2_32.lib
+!!else
+WINSOCK_LIB=
+!!endif
+'
+
+    "Created: / 12-05-2015 / 19:01:29 / jv"
+!
+
 additionalLinkLibraries_bc_dot_mak
 "/    ^ '$(ZLIB) $(BZ2LIB)'
     ^ '$(ZLIB_DIR)\$(ZLIB) $(WINSOCK_LIB)'
+
+    "Modified: / 12-05-2015 / 19:00:25 / jv"
 !
 
 additionalLinkLibraries_make_dot_proto
@@ -125,15 +142,17 @@
 additionalRules_bc_dot_mak
     ^ '
 $(ZLIB):
-	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
-	cd ..\..\libbasic2
+        cd $(ZLIB_DIR)
+        $(MAKE_BAT)
+        cd ..\..\libbasic2
 
 $(BZ2LIB):
-	cd $(BZ2LIB_DIR)
-	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
-	cd ..\..\libbasic2
+        cd $(BZ2LIB_DIR)
+        $(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
+        cd ..\..\libbasic2
 '
+
+    "Modified: / 12-05-2015 / 18:53:34 / jv"
 !
 
 additionalRules_make_dot_proto
@@ -440,5 +459,9 @@
 
 version_CVS
     ^ '$Header$'
+!
+
+version_HG
+    ^ '$Changeset: <not expanded> $'
 ! !