fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-03-17 00:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    + Added bzip2 information. (not fully complete, it also 
      needs to be added to .spec files like zlib)

  - external/bzip2/bzip2.dif
  - external/bzip2/bzip2.c
  * external/bzip2/cnv_hb2o.bat
  * external/bzip2/cnv_o2hb.bat
  * external/bzip2/Makefile
    - Deleted accindentally included bzip2 tool.

  + contrib/hbbzip2/tests
  + contrib/hbbzip2/tests/hbmk.hbm
  + contrib/hbbzip2/tests/test.prg
    + Added little test code.

  + contrib/hbbzip2/hbbzip2.hbc
    + Added .hbc file.

  * contrib/hbbzip2/hbbzip2.ch
    + Added 'it's also used by C code' comment.
This commit is contained in:
Viktor Szakats
2010-03-16 23:34:33 +00:00
parent 11a131328b
commit 09adc56c2a
11 changed files with 68 additions and 2071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -17,6 +17,29 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-17 00:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added bzip2 information. (not fully complete, it also
needs to be added to .spec files like zlib)
- external/bzip2/bzip2.dif
- external/bzip2/bzip2.c
* external/bzip2/cnv_hb2o.bat
* external/bzip2/cnv_o2hb.bat
* external/bzip2/Makefile
- Deleted accindentally included bzip2 tool.
+ contrib/hbbzip2/tests
+ contrib/hbbzip2/tests/hbmk.hbm
+ contrib/hbbzip2/tests/test.prg
+ Added little test code.
+ contrib/hbbzip2/hbbzip2.hbc
+ Added .hbc file.
* contrib/hbbzip2/hbbzip2.ch
+ Added 'it's also used by C code' comment.
2010-03-16 16:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbbzip2/Makefile
+ Added bzip2 header detection and setup.

4
harbour/INSTALL
View File

@@ -298,6 +298,7 @@ HARBOUR
HB_WITH_ADS=C:\ads\acesdk
HB_WITH_ALLEGRO=C:\allegro\include
HB_WITH_BLAT=C:\blat\full\source
HB_WITH_BZIP=C:\bzip2 (defaults to locally hosted version if not found)
HB_WITH_CAIRO=C:\cairo\include\cairo
HB_WITH_CURL=C:\curl\include
HB_WITH_CURSES= (on *nix systems and DJGPP, where it's autodetected)
@@ -391,6 +392,7 @@ HARBOUR
Optional, to override locally hosted sources:
for bzip2 support: $ sudo apt-get install bzip2
for zlib support: $ sudo apt-get install zlib1g-dev
for pcre (regex) support: $ sudo apt-get install libpcre3-dev
for contrib/hbsqlit3 lib: $ sudo apt-get install libsqlite3-dev
@@ -1322,6 +1324,8 @@ HARBOUR
http://alleg.sourceforge.net/
HB_WITH_BLAT - Blat (SMTP client) [win, free, open-source]
http://www.blat.net/
HB_WITH_BZIP2 - libbzip2 [multiplatform, free, open-source]
http://www.bzip.org/
HB_WITH_CAIRO - Cairo [multiplatform, open-source]
http://www.gtk.org/download-windows.html
Direct links, look for these components on page above:

26
harbour/contrib/hbbzip2/hbbzip2.ch
View File

@@ -50,6 +50,8 @@
*
*/
/* NOTE: This file is also used by C code. */
#ifndef HB_BZIP2_CH_
#define HB_BZIP2_CH_
@@ -58,18 +60,18 @@
#define HB_BZ_FLUSH_OK 2
#define HB_BZ_FINISH_OK 3
#define HB_BZ_STREAM_END 4
#define HB_BZ_SEQUENCE_ERROR (-1)
#define HB_BZ_PARAM_ERROR (-2)
#define HB_BZ_MEM_ERROR (-3)
#define HB_BZ_DATA_ERROR (-4)
#define HB_BZ_DATA_ERROR_MAGIC (-5)
#define HB_BZ_IO_ERROR (-6)
#define HB_BZ_UNEXPECTED_EOF (-7)
#define HB_BZ_OUTBUFF_FULL (-8)
#define HB_BZ_CONFIG_ERROR (-9)
#define HB_BZ_SEQUENCE_ERROR ( -1 )
#define HB_BZ_PARAM_ERROR ( -2 )
#define HB_BZ_MEM_ERROR ( -3 )
#define HB_BZ_DATA_ERROR ( -4 )
#define HB_BZ_DATA_ERROR_MAGIC ( -5 )
#define HB_BZ_IO_ERROR ( -6 )
#define HB_BZ_UNEXPECTED_EOF ( -7 )
#define HB_BZ_OUTBUFF_FULL ( -8 )
#define HB_BZ_CONFIG_ERROR ( -9 )
#define HB_BZ_COMPRESSION_SPEED 1
#define HB_BZ_COMPRESSION_SIZE 9
#define HB_BZ_COMPRESSION_DEFAULT 9
#define HB_BZ_COMPRESSION_SPEED 1
#define HB_BZ_COMPRESSION_SIZE 9
#define HB_BZ_COMPRESSION_DEFAULT 9
#endif /* HB_BZIP2_CH_ */

8
harbour/contrib/hbbzip2/hbbzip2.hbc Normal file
View File

@@ -0,0 +1,8 @@
#
# $Id$
#
incpaths=.
libs=hbbzip2
libs=bzip2

7
harbour/contrib/hbbzip2/tests/hbmk.hbm Normal file
View File

@@ -0,0 +1,7 @@
#
# $Id$
#
../hbbzip2.hbc
-w3 -es2

12
harbour/contrib/hbbzip2/tests/test.prg Normal file
View File

@@ -0,0 +1,12 @@
/*
* $Id$
*/
#include "simpleio.ch"
PROCEDURE Main()
LOCAL cI, cJ, nErr
cI := "Hello"
cJ := HB_BZ2_COMPRESS( cI,, @nErr )
? nErr, LEN( cJ ), HB_STRTOHEX( cJ )
RETURN

1
harbour/external/bzip2/Makefile vendored
View File

@@ -13,7 +13,6 @@ HB_BUILD_MODE := c
C_SOURCES := \
blocksor.c \
bzip2.c \
bzlib.c \
compress.c \
crctable.c \

2035
harbour/external/bzip2/bzip2.c vendored
View File

File diff suppressed because it is too large Load Diff

21
harbour/external/bzip2/bzip2.dif vendored
View File

@@ -1,21 +0,0 @@
--- ori_src\bzip2.c Sun Dec 09 04:22:12 2007
+++ bzip2.c Mon Mar 15 21:30:03 2010
@@ -34,7 +34,8 @@
--*/
#define BZ_LCCWIN32 0
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if ( defined(_WIN32) && !defined(__CYGWIN__) ) || \
+ ( defined(__WATCOMC__) && ( defined(__OS2__) || defined(__DOS__) ) )
#undef BZ_LCCWIN32
#define BZ_LCCWIN32 1
#undef BZ_UNIX
@@ -128,7 +129,7 @@
#if BZ_LCCWIN32
# include <io.h>
# include <fcntl.h>
-# include <sys\stat.h>
+# include <sys/stat.h>
# define NORETURN /**/
# define PATH_SEP '\\'

1
harbour/external/bzip2/cnv_hb2o.bat vendored
View File

@@ -21,7 +21,6 @@ del ori_dst\*.* /Y
copy LICENCE ori_src\LICENCE
copy blocksor.c ori_src\blocksort.c
copy bzip2.c ori_src\bzip2.c
copy bzlib.c ori_src\bzlib.c
copy compress.c ori_src\compress.c
copy crctable.c ori_src\crctable.c

1
harbour/external/bzip2/cnv_o2hb.bat vendored
View File

@@ -21,7 +21,6 @@ rem don't have to mess with this tool.
copy ori_src\LICENCE LICENCE
copy ori_src\blocksort.c blocksor.c
copy ori_src\bzip2.c bzip2.c
copy ori_src\bzlib.c bzlib.c
copy ori_src\compress.c compress.c
copy ori_src\crctable.c crctable.c