--- a/BZip2Stream.st Tue May 06 18:19:20 2003 +0200
+++ b/BZip2Stream.st Tue May 06 18:29:40 2003 +0200
@@ -1,13 +1,13 @@
"{ Package: 'stx:libbasic2' }"
-CompressionStream subclass:#BZipStream
+CompressionStream subclass:#BZip2Stream
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'System-Compress'
!
-!BZipStream primitiveDefinitions!
+!BZip2Stream primitiveDefinitions!
%{
/*
@@ -15,7 +15,7 @@
* and typedefs come here.
*/
-#include "bzlib/bzlib.h"
+#include "bz2lib/bzlib.h"
typedef enum {
e_opmode_unspecified /* processing done */
@@ -36,7 +36,7 @@
! !
-!BZipStream methodsFor:'low level'!
+!BZip2Stream methodsFor:'low level'!
zclose
"low level close of the zip stream
@@ -323,8 +323,8 @@
self invalidArguments.
! !
-!BZipStream class methodsFor:'documentation'!
+!BZip2Stream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/BZip2Stream.st,v 1.5 2003-05-06 16:19:20 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/BZip2Stream.st,v 1.6 2003-05-06 16:29:40 stefan Exp $'
! !
--- a/Make.proto Tue May 06 18:19:20 2003 +0200
+++ b/Make.proto Tue May 06 18:29:40 2003 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.110 2003-05-06 16:19:20 stefan Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.111 2003-05-06 16:29:40 stefan Exp $
#
# -------------- no need to change anything below ----------
@@ -17,9 +17,9 @@
STCOPT=$(LIBBASIC2_STCOPT)
STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME) -I../support
LINKOBJRULE=$(SEPINITLINKOBJRULE)
-LINKOBJS=$(OBJS) -L../support/zlib -lz -L../support/bzlib -lbz2
+LINKOBJS=$(OBJS) -L../support/zlib -lz -L../support/bz2lib -lbz2
-all:: zlib bzlib classLibRule
+all:: zlib bz2lib classLibRule
NOTINCLUDEDOBJS= \
ValueLink.$(O) \
@@ -89,7 +89,7 @@
Stack.$(O) \
CompressionStream.$(O) \
ZipStream.$(O) \
- BZipStream.$(O) \
+ BZip2Stream.$(O) \
$(LIBBASIC2_PACKAGE_OBJS)
objs:: $(OBJS)
@@ -97,8 +97,8 @@
zlib:
cd ../support/zlib; make
-bzlib:
- cd ../support/bzlib; make libbz2.a
+bz2lib:
+ cd ../support/bz2lib; make libbz2.a
#
# these nest too deep on some (sco & isc) systems (see discussion about LIMITSUPERINCLUDE
--- a/abbrev.stc Tue May 06 18:19:20 2003 +0200
+++ b/abbrev.stc Tue May 06 18:29:40 2003 +0200
@@ -4,7 +4,7 @@
Arrow Arrow stx:libbasic2 'Graphics-Geometry'
ArrowedSpline ArrowedSpline stx:libbasic2 'Graphics-Geometry'
BIG5EncodedString BIG5EncodedString stx:libbasic2 'Collections-Text'
-BZipStream BZipStream stx:libbasic2 'System-Compress'
+BZip2Stream BZip2Stream stx:libbasic2 'System-Compress'
Base64Coder Base64Coder stx:libbasic2 'System-Storage'
Bezier Bezier stx:libbasic2 'Graphics-Geometry'
Bezier2Segment Bezier2Segment stx:libbasic2 'Graphics-Geometry'
--- a/libInit.cc Tue May 06 18:19:20 2003 +0200
+++ b/libInit.cc Tue May 06 18:29:40 2003 +0200
@@ -65,6 +65,6 @@
_Stack_Init(pass,__pRT__,snd);
_CompressionStream_Init(pass,__pRT__,snd);
_ZipStream_Init(pass,__pRT__,snd);
-_BZipStream_Init(pass,__pRT__,snd);
+_BZip2Stream_Init(pass,__pRT__,snd);
__END_PACKAGE__();
}