2010-04-22 00:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* Minor updates to tool links and information.
* INSTALL
* external/Makefile
+ external/minizip
+ external/minizip/Makefile
+ external/minizip/readme.txt
+ external/minizip/minizip.dif
+ external/minizip/ioapi.c
+ external/minizip/zip.c
+ external/minizip/unzip.c
+ external/minizip/ioapi.h
+ external/minizip/crypt.h
+ external/minizip/zip.h
+ external/minizip/unzip.h
* contrib/hbmzip/Makefile
* contrib/hbmzip/hbmzip.hbc
* contrib/hbmzip/readme.txt
- contrib/hbmzip/minizip.dif
- contrib/hbmzip/ioapi.c
- contrib/hbmzip/zip.c
- contrib/hbmzip/unzip.c
- contrib/hbmzip/crypt.h
- contrib/hbmzip/ioapi.h
- contrib/hbmzip/zip.h
- contrib/hbmzip/unzip.h
* Moved embedded external code from hbmzip library to
separate, locally hosted library inside the 'external'
directory. This way we keep all external code under this
directory. This change also makes it possible to use
custom version of this external library, via the
HB_WITH_MINIZIP envvar.
NOTE: Everyone using hbmzip, must now add 'minizip'
to their lib list. (INCOMPATIBLE)
This commit is contained in:
Viktor Szakats
@@ -17,14 +17,51 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2010-04-22 00:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* INSTALL
|
||||
* Minor updates to tool links and information.
|
||||
|
||||
* INSTALL
|
||||
* external/Makefile
|
||||
+ external/minizip
|
||||
+ external/minizip/Makefile
|
||||
+ external/minizip/readme.txt
|
||||
+ external/minizip/minizip.dif
|
||||
+ external/minizip/ioapi.c
|
||||
+ external/minizip/zip.c
|
||||
+ external/minizip/unzip.c
|
||||
+ external/minizip/ioapi.h
|
||||
+ external/minizip/crypt.h
|
||||
+ external/minizip/zip.h
|
||||
+ external/minizip/unzip.h
|
||||
* contrib/hbmzip/Makefile
|
||||
* contrib/hbmzip/hbmzip.hbc
|
||||
* contrib/hbmzip/readme.txt
|
||||
- contrib/hbmzip/minizip.dif
|
||||
- contrib/hbmzip/ioapi.c
|
||||
- contrib/hbmzip/zip.c
|
||||
- contrib/hbmzip/unzip.c
|
||||
- contrib/hbmzip/crypt.h
|
||||
- contrib/hbmzip/ioapi.h
|
||||
- contrib/hbmzip/zip.h
|
||||
- contrib/hbmzip/unzip.h
|
||||
* Moved embedded external code from hbmzip library to
|
||||
separate, locally hosted library inside the 'external'
|
||||
directory. This way we keep all external code under this
|
||||
directory. This change also makes it possible to use
|
||||
custom version of this external library, via the
|
||||
HB_WITH_MINIZIP envvar.
|
||||
NOTE: Everyone using hbmzip, must now add 'minizip'
|
||||
to their lib list. (INCOMPATIBLE)
|
||||
|
||||
2010-04-21 13:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
* contrib/hbide/idesaveload.prg
|
||||
! Fixed a type in previous commit.
|
||||
|
||||
2010-04-21 12:56 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
* contrib/hbide/idesaveload.prg
|
||||
+ Implemented: hbIDE data files to be saved/retrieved in
|
||||
system folders if hbide.ini with path is not supplied
|
||||
+ Implemented: hbIDE data files to be saved/retrieved in
|
||||
system folders if hbide.ini with path is not supplied
|
||||
on the command-line. The following algorythm is used:
|
||||
|
||||
FUNCTION hbide_getIniPath( cHbideIni )
|
||||
@@ -47,13 +84,13 @@
|
||||
ENDIF
|
||||
|
||||
RETURN cIni
|
||||
|
||||
|
||||
This change makes hbIDE to be able to run on any system
|
||||
installed via an installer where a writable folder is expected
|
||||
installed via an installer where a writable folder is expected
|
||||
to write to application data.
|
||||
|
||||
Thanks Viktor for the actual code and guidance.
|
||||
|
||||
|
||||
2010-04-20 22:27 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
* contrib/hbide/hbide.prg
|
||||
+ Implemented: last "View" to be presented at startup.
|
||||
@@ -71,7 +108,7 @@
|
||||
* contrib/hbxbp/xbpfiledialog.prg
|
||||
* contrib/hbxbp/xbpfontdialog.prg
|
||||
% An important fix for ancilliary dialogs, i.e., file and font,
|
||||
to not be added as childrent to parent on :create().
|
||||
to not be added as childrent to parent on :create().
|
||||
This facilitate to destroy these dialogs after done with.
|
||||
|
||||
* contrib/hbxbp/tests/demoxbp.prg
|
||||
|
||||
@@ -308,6 +308,7 @@ HARBOUR
|
||||
HB_WITH_GPM= (on Linux only)
|
||||
HB_WITH_JPEG=C:\jpeglib (defaults to locally hosted version if not found)
|
||||
HB_WITH_LIBHARU=C:\libharu\include (defaults to locally hosted version)
|
||||
HB_WITH_MINIZIP=C:\zlib\contrib\minizip (defaults to locally hosted version if not found)
|
||||
HB_WITH_MYSQL=C:\mysql\include
|
||||
HB_WITH_OCILIB=C:\ocilib\include
|
||||
HB_WITH_ODBC= (may only be needed on non-Windows systems)
|
||||
@@ -1294,13 +1295,11 @@ HARBOUR
|
||||
C/C++ Compilers/Shells:
|
||||
|
||||
MinGW [win, *nix, free, open-soource]
|
||||
http://www.tdragon.net/recentgcc/ (unofficial, recommended)
|
||||
http://www.mingw.org/ (official, rarely updated, MSYS home)
|
||||
http://www.tdragon.net/recentgcc/, http://sourceforge.net/projects/tdm-gcc/ (unofficial, recommended)
|
||||
http://www.mingw.org/, http://sourceforge.net/projects/mingw/ (official, rarely updated, MSYS home)
|
||||
http://www.equation.com/servlet/equation.cmd?fa=fortran (unofficial)
|
||||
MinGW x64 [win, *nix, free, open-source]
|
||||
http://mingw-w64.org/
|
||||
http://mingw-w64.sourceforge.net/
|
||||
http://sourceforge.net/projects/mingw-w64/
|
||||
http://mingw-w64.sourceforge.net/, http://sourceforge.net/projects/mingw-w64/
|
||||
http://www.cadforte.com/
|
||||
MinGW CEGCC [win, *nix, free, open-source]
|
||||
http://cegcc.sourceforge.net/
|
||||
@@ -1320,13 +1319,13 @@ HARBOUR
|
||||
http://developer.apple.com/TOOLS/Xcode/
|
||||
MS Windows SDK [win, free, closed-source]
|
||||
http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx
|
||||
(7.0 contains compilers for x86, x86_64 and IA-64)
|
||||
(7.0 and above contains compilers for x86, x86_64 and IA-64)
|
||||
MS Windows Mobile SDK [wce, free]
|
||||
http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED
|
||||
MS Visual Studio Express [win, free, closed-source]
|
||||
http://www.microsoft.com/express/
|
||||
MS Visual Studio [win, commercial, closed-source]
|
||||
http://www.microsoft.com/visualstudio/
|
||||
MS Windows Mobile SDK [wce, free]
|
||||
http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED
|
||||
Pelles C [win, wce, free, closed-source]
|
||||
http://www.smorgasbordet.com/pellesc/
|
||||
Borland/CodeGear/Embarcadero Compiler [win, free, closed-source]
|
||||
@@ -1362,6 +1361,8 @@ HARBOUR
|
||||
http://www.ijg.org/
|
||||
HB_WITH_LIBHARU - libharu (PDF creation) [multiplatform, free, open-source]
|
||||
http://libharu.org/
|
||||
HB_WITH_MINIZIP - minizip library [multiplatform, free, open-source]
|
||||
http://www.winimage.com/zLibDll/minizip.html
|
||||
HB_WITH_MYSQL - MySQL [multiplatform, free, open-source]
|
||||
http://dev.mysql.com/downloads/
|
||||
HB_WITH_OCILIB - OCILIB (C Driver for Oracle) [multiplatform, free, open-source]
|
||||
@@ -1461,7 +1462,7 @@ HARBOUR
|
||||
|
||||
Netiquette Guidelines
|
||||
http://tools.ietf.org/html/rfc1855
|
||||
Subversion book (free)
|
||||
Subversion book [free]
|
||||
http://svnbook.red-bean.com/
|
||||
|
||||
|
||||
|
||||
@@ -8,23 +8,36 @@ include $(TOP)$(ROOT)config/global.mk
|
||||
|
||||
LIBNAME := hbmzip
|
||||
|
||||
# 3rd party code requires this
|
||||
HB_BUILD_MODE := c
|
||||
|
||||
C_SOURCES := \
|
||||
ioapi.c \
|
||||
zip.c \
|
||||
unzip.c \
|
||||
hbmzip.c
|
||||
|
||||
PRG_HEADERS := \
|
||||
hbmzip.ch
|
||||
|
||||
ifneq ($(HB_HAS_ZLIB),)
|
||||
|
||||
HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))
|
||||
|
||||
include $(TOP)$(ROOT)config/header.mk
|
||||
include $(TOP)$(ROOT)config/lib.mk
|
||||
_DET_DSP_NAME := minizip
|
||||
_DET_VAR_INC_ := HB_INC_MINIZIP
|
||||
_DET_VAR_HAS_ := HB_HAS_MINIZIP
|
||||
_DET_FLT_PLAT :=
|
||||
_DET_FLT_COMP :=
|
||||
_DET_INC_DEFP := /usr/include /usr/local/include
|
||||
_DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/minizip)
|
||||
_DET_INC_HEAD := /zip.h
|
||||
include $(TOP)$(ROOT)config/detfun.mk
|
||||
|
||||
ifneq ($(HB_HAS_MINIZIP),)
|
||||
|
||||
HB_CFLAGS += -DHB_HAS_MINIZIP $(foreach d,$(HB_HAS_MINIZIP),-I$(d))
|
||||
|
||||
include $(TOP)$(ROOT)config/header.mk
|
||||
include $(TOP)$(ROOT)config/lib.mk
|
||||
else
|
||||
HB_SKIP_REASON := $(_DET_RES_TEXT)
|
||||
include $(TOP)$(ROOT)config/none.mk
|
||||
endif
|
||||
else
|
||||
HB_SKIP_REASON := component not found
|
||||
include $(TOP)$(ROOT)config/none.mk
|
||||
|
||||
@@ -5,3 +5,4 @@
|
||||
incpaths=.
|
||||
|
||||
libs=hbmzip
|
||||
libs=minizip
|
||||
|
||||
@@ -6,39 +6,9 @@
|
||||
This folder contains compression related files including:
|
||||
* zip file support based on minizip library (http://www.winimage.com/zLibDll/minizip.html)
|
||||
including:
|
||||
* minizip version 1.01e source files
|
||||
* wrapper functions for minizip
|
||||
* some additionl functions to provide a higher level API for zip files
|
||||
|
||||
Some small changes (to fix compile time warning and errors) are applied to original
|
||||
source of minizip 1.01e:
|
||||
|
||||
* harbour/contrib/hbzlib/zip.c
|
||||
* added forward definitions of allocate_new_datablock(),
|
||||
free_datablock(), init_linkedlist(), add_data_in_datablock(),
|
||||
ziplocal_TmzDateToDosDate()
|
||||
* pacified warnings of unused args dosDate and crcForCrypting
|
||||
* fixed 2 warnings: assigned value is not used. See, TOFIX
|
||||
comment for one of the fixes
|
||||
* fixed BCC warning "function call with no prototype" by changing
|
||||
local int zipFlushWriteBuffer(zi)
|
||||
zip_internal* zi;
|
||||
{
|
||||
to
|
||||
local int zipFlushWriteBuffer(zip_internal* zi)
|
||||
{
|
||||
I expected this code be equivavlent! ??? :/
|
||||
|
||||
* harbour/contrib/hbzlib/unzip.c
|
||||
* added forward definitions of strcmpcasenosensitive_internal(),
|
||||
unzlocal_DosDateToTmuDate(), unzlocal_CheckCurrentFileCoherencyHeader()
|
||||
* fixed 8 warnings: assigned value is not used. See, TOFIX
|
||||
comment for one of the fixes
|
||||
|
||||
* harbour/contrib/hbzlib/ioapi.c
|
||||
* pacified 7 warnings: unused args opaque
|
||||
* fixed warning: assigned value is not used
|
||||
|
||||
|
||||
Harbour functions to mange ZIP files:
|
||||
=====================================
|
||||
|
||||
1
harbour/external/Makefile
vendored
1
harbour/external/Makefile
vendored
@@ -13,6 +13,7 @@ DIRS := \
|
||||
jpeg \
|
||||
pcre \
|
||||
zlib \
|
||||
minizip \
|
||||
|
||||
ifeq ($(firstword $(HB_EXTERNALLIBS)),no)
|
||||
DIRS := $(filter-out $(HB_EXTERNALLIBS),$(DIRS))
|
||||
|
||||
26
harbour/external/minizip/Makefile
vendored
Normal file
26
harbour/external/minizip/Makefile
vendored
Normal file
@@ -0,0 +1,26 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
ROOT := ../../
|
||||
|
||||
include $(TOP)$(ROOT)config/global.mk
|
||||
|
||||
LIBNAME := minizip
|
||||
|
||||
HB_BUILD_WARN := no
|
||||
HB_BUILD_MODE := c
|
||||
|
||||
C_SOURCES := \
|
||||
ioapi.c \
|
||||
zip.c \
|
||||
unzip.c \
|
||||
|
||||
ifneq ($(HB_HAS_ZLIB),)
|
||||
HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))
|
||||
|
||||
include $(TOP)$(ROOT)config/lib.mk
|
||||
else
|
||||
HB_SKIP_REASON := component not found
|
||||
include $(TOP)$(ROOT)config/none.mk
|
||||
endif
|
||||
37
harbour/external/minizip/readme.txt
vendored
Normal file
37
harbour/external/minizip/readme.txt
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
This folder contains compression related files including:
|
||||
* zip file support based on minizip library (http://www.winimage.com/zLibDll/minizip.html)
|
||||
including:
|
||||
* minizip version 1.1 source files
|
||||
|
||||
Some small changes (to fix compile time warning and errors) are applied to original
|
||||
source of minizip 1.1:
|
||||
|
||||
* harbour/contrib/hbzlib/zip.c
|
||||
* added forward definitions of allocate_new_datablock(),
|
||||
free_datablock(), init_linkedlist(), add_data_in_datablock(),
|
||||
ziplocal_TmzDateToDosDate()
|
||||
* pacified warnings of unused args dosDate and crcForCrypting
|
||||
* fixed 2 warnings: assigned value is not used. See, TOFIX
|
||||
comment for one of the fixes
|
||||
* fixed BCC warning "function call with no prototype" by changing
|
||||
local int zipFlushWriteBuffer(zi)
|
||||
zip_internal* zi;
|
||||
{
|
||||
to
|
||||
local int zipFlushWriteBuffer(zip_internal* zi)
|
||||
{
|
||||
I expected this code be equivavlent! ??? :/
|
||||
|
||||
* harbour/contrib/hbzlib/unzip.c
|
||||
* added forward definitions of strcmpcasenosensitive_internal(),
|
||||
unzlocal_DosDateToTmuDate(), unzlocal_CheckCurrentFileCoherencyHeader()
|
||||
* fixed 8 warnings: assigned value is not used. See, TOFIX
|
||||
comment for one of the fixes
|
||||
|
||||
* harbour/contrib/hbzlib/ioapi.c
|
||||
* pacified 7 warnings: unused args opaque
|
||||
* fixed warning: assigned value is not used
|
||||
Reference in New Issue
Block a user