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

2008-06-23 10:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbziparch/make_b32_dll.mak
   * contrib/hbziparch/make_b32.bat
   * contrib/hbziparch/make_vc.bat
   * contrib/hbziparch/Makefile
   * contrib/hbziparch/common.mak
   - contrib/hbziparch/lincompile.sh
   - contrib
   - contrib/hbziparch/include -> contrib/hbziparch
   - contrib/hbziparch/Linux
   + contrib/hbziparch/ZipFileMapping.h
   + contrib/hbziparch/ZipPathComponent_lnx.cpp
   + contrib/hbziparch/ZipPlatform_lnx.cpp
   - contrib/hbziparch/zippathcomponent.cpp
   + contrib/hbziparch/ZipPathComponent_win.cpp
   - contrib/hbziparch/zipplatform.cpp
   + contrib/hbziparch/ZipPlatform_win.cpp
     * Directory cleanup.
     ! Fixed #include.
This commit is contained in:
Viktor Szakats
2008-06-23 08:57:51 +00:00
parent 3cae782e38
commit 045bfb388a
36 changed files with 80 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
harbour/ChangeLog
View File

@@ -8,6 +8,39 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-23 10:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbziparch/make_b32_dll.mak
* contrib/hbziparch/make_b32.bat
* contrib/hbziparch/make_vc.bat
* contrib/hbziparch/Makefile
* contrib/hbziparch/common.mak
- contrib/hbziparch/lincompile.sh
- contrib
- contrib/hbziparch/include -> contrib/hbziparch
- contrib/hbziparch/Linux
+ contrib/hbziparch/ZipFileMapping.h
+ contrib/hbziparch/ZipPathComponent_lnx.cpp
+ contrib/hbziparch/ZipPlatform_lnx.cpp
- contrib/hbziparch/zippathcomponent.cpp
+ contrib/hbziparch/ZipPathComponent_win.cpp
- contrib/hbziparch/zipplatform.cpp
+ contrib/hbziparch/ZipPlatform_win.cpp
* Directory cleanup.
! Fixed #include.
2008-06-23 10:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbziparch/Makefile
* contrib/hbziparch/common.mak
- contrib/hbziparch/Linux
+ contrib/hbziparch/ZipFileMapping.h
+ contrib/hbziparch/ZipPathComponent_lnx.cpp
+ contrib/hbziparch/ZipPlatform_lnx.cpp
- contrib/hbziparch/zippathcomponent.cpp
+ contrib/hbziparch/ZipPathComponent_win.cpp
- contrib/hbziparch/zipplatform.cpp
+ contrib/hbziparch/ZipPlatform_win.cpp
* Directory cleanup.
2008-06-23 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_vcce.mak
* make_vc.mak

91
harbour/contrib/hbziparch/Linux/Makefile
View File

@@ -1,91 +0,0 @@
# Makefile for ZipArchive library
# Copyright (C) 2000-2002 Tadeusz Dracz
# For conditions of distribution and use, see copyright notice in License.txt
# To install to /usr/lib and /usr/include, type:
# make install
# to install to a different directory change prefix
CC=g++
CCC=cc
#FLAGSD = -g
FLAGSD =
ZIPARCHLIB = libziparch.a
ZIPPIELOCATION = stl/zippie/
prefix = /usr
libdir = ${prefix}/lib
includedir = ${prefix}/include
zipardir = $(includedir)/ziparchive
AR=ar rc
RANLIB=ranlib
.SUFFIXES: .c .cpp
.c.o:
$(CCC) -c -I. -I$(HB_INC_INSTALL) -o $*.o $<
.cpp.o:
$(CC) $(FLAGSD) -I$(HB_INC_INSTALL) -c -I. $<
OBJS = ZipArchive.o ZipAutoBuffer.o ZipCentralDir.o \
ZipCompatibility.o ZipException.o ZipFile.o ZipFileHeader.o \
ZipMemFile.o ZipPathComponent.o ZipPlatform.o ZipPlatformComm.o \
ZipStorage.o ZipString.o zipnew.o zipcomp.o zip.o
#OBJSZLIB = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/uncompr.o zlib/deflate.o zlib/trees.o \
zlib/zutil.o zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o zlib/infutil.o zlib/inffast.o
OBJSZLIB =
$(ZIPARCHLIB): $(OBJS) $(OBJSZLIB)
$(AR) $@ $(OBJS) $(OBJSZLIB)
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
ZipArchive.o: ZipArchive.h
ZipAutoBuffer.o: ZipAutoBuffer.h
ZipCentralDir.o: ZipCentralDir.h
ZipCompatibility.o: ZipCompatibility.h
ZipException.o: ZipException.h
ZipFile.o: ZipFile.h
ZipFileHeader.o: ZipFileHeader.h
ZipMemFile.o: ZipMemFile.h
ZipPathComponent.o: ZipPathComponent.h
ZipPlatform.o: ZipPlatform.h
ZipStorage.o: ZipStorage.h
ZipString.o: ZipString.h
zipnew.o: hbzip2.h
zipcomp.o: hbzip2.h
zip.o: hbzip2.h
clean:
-rm -f *.o *~ $(ZIPARCHLIB)
zippie:
$(CC) -I$(zipardir) -I$(HB_INC_INSTALL) $(FLAGSD) -o zippie $(ZIPPIELOCATION)zippie.cpp $(ZIPPIELOCATION)CmdLine.cpp -lz -lstdc++ -lziparch
# $(CC) -I$(zipardir) $(FLAGSD) -o zippie ZIPPIELOCATION)zippie.cpp $(ZIPPIELOCATION)CmdLine.cpp -lstdc++ -lziparch
cleanzippie:
-rm -f zippie
install:
-@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi
-@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi
-@if [ ! -d $(zipardir) ]; then mkdir $(zipardir); fi
cp libziparch.a $(libdir)
cp libziparch.a /usr/lib/xharbour
chmod 755 $(libdir)/$(ZIPARCHLIB)
chmod 755 /usr/lib/xharbour/libziparch.a
cp *.h $(zipardir)
chmod 644 $(zipardir)/*h
uninstall:
rm -f $(zipardir)/*h
rm -f $(libdir)/$(ZIPARCHLIB)
rmdir $(zipardir)

70
harbour/contrib/hbziparch/Linux/ZipFileMapping.h
View File

@@ -1,70 +0,0 @@
////////////////////////////////////////////////////////////////////////////////
// $Workfile: ZipFileMapping.h $
// $Archive: /ZipArchive_Linux/ZipFileMapping.h $
// $Date$ $Author$
////////////////////////////////////////////////////////////////////////////////
// This source file is part of the ZipArchive library source distribution and
// is Copyright 2000-2002 by Tadeusz Dracz (http://www.artpol-software.com/)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// For the licensing details see the file License.txt
////////////////////////////////////////////////////////////////////////////////
#if !defined(AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_)
#define AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#include <sys/mman.h>
namespace ziparchv
{
struct CZipFileMapping
{
CZipFileMapping()
{
m_iSize = 0;
m_pFileMap = NULL;
}
bool CreateMapping(CZipFile* pFile)
{
if (!pFile)
return false;
m_iSize = pFile->GetLength();
m_pFileMap = mmap(0, m_iSize, PROT_READ|PROT_WRITE, MAP_SHARED, pFile->m_hFile, 0);
return (m_pFileMap != NULL);
}
void RemoveMapping()
{
if (m_pFileMap)
{
munmap(m_pFileMap, m_iSize);
m_pFileMap = NULL;
}
}
~CZipFileMapping()
{
RemoveMapping();
}
char* GetMappedMemory()
{
return reinterpret_cast<char*> (m_pFileMap);
}
protected:
void* m_pFileMap;
size_t m_iSize;
};
}
#endif // !defined(AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_)

8
harbour/contrib/hbziparch/Makefile
View File

@@ -28,13 +28,13 @@ CPP_SOURCES = \
ifeq ($(HB_ARCHITECTURE),linux)
CPP_SOURCES += \
../../Linux/ZipPathComponent.cpp \
../../Linux/ZipPlatform.cpp \
ZipPathComponent_lnx.cpp \
ZipPlatform_lnx.cpp \
else
CPP_SOURCES += \
zippathcomponent.cpp \
zipplatform.cpp \
ZipPathComponent_win.cpp \
ZipPlatform_win.cpp \
endif

0
harbour/contrib/hbziparch/include/ZipExport.h → harbour/contrib/hbziparch/ZipExport.h
View File

0
harbour/contrib/hbziparch/Linux/ZipPathComponent.cpp → harbour/contrib/hbziparch/ZipPathComponent_lnx.cpp
View File

0
harbour/contrib/hbziparch/zippathcomponent.cpp → harbour/contrib/hbziparch/ZipPathComponent_win.cpp
View File

0
harbour/contrib/hbziparch/Linux/ZipPlatform.cpp → harbour/contrib/hbziparch/ZipPlatform_lnx.cpp
View File

0
harbour/contrib/hbziparch/zipplatform.cpp → harbour/contrib/hbziparch/ZipPlatform_win.cpp
View File

4
harbour/contrib/hbziparch/common.mak
View File

@@ -10,11 +10,11 @@ LIB_OBJS = \
$(OBJ_DIR)hbziparc$(OBJEXT) \
$(OBJ_DIR)hbcomprs$(OBJEXT) \
$(OBJ_DIR)ziparchive$(OBJEXT) \
$(OBJ_DIR)zipplatform$(OBJEXT) \
$(OBJ_DIR)ZipPlatform_win$(OBJEXT) \
$(OBJ_DIR)zipstorage$(OBJEXT) \
$(OBJ_DIR)zipstring$(OBJEXT) \
$(OBJ_DIR)zipplatformcomm$(OBJEXT) \
$(OBJ_DIR)zippathcomponent$(OBJEXT) \
$(OBJ_DIR)ZipPathComponent_win$(OBJEXT) \
$(OBJ_DIR)zipmemfile$(OBJEXT) \
$(OBJ_DIR)zipfileheader$(OBJEXT) \
$(OBJ_DIR)zipfile$(OBJEXT) \

7
harbour/contrib/hbziparch/hbziparc.h
View File

@@ -53,7 +53,9 @@
#ifndef HB_APIZLIB_H_
#define HB_APIZLIB_H_
#define HB_OS_WIN_32_USED
#include "hbvmopt.h"
#include "hbapi.h"
#include "hbstack.h"
@@ -61,8 +63,9 @@
#include "hbapierr.h"
#include "hbapicls.h"
#include "hbapifs.h"
/* #include <hbapigt.h> */
/* #include "hbapigt.h" */
#include "hbvm.h"
#if defined(__GNUC__) && !defined(__MINGW32__)
#include <sys/types.h>
#include <sys/stat.h>
@@ -73,7 +76,7 @@
#include <time.h>
#ifdef HB_EXTERN_C
#include <ziparchive.h>
#include "ziparchive.h"
#endif
HB_EXTERN_BEGIN

3
harbour/contrib/hbziparch/lincompile.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
cp Linux/ZipFileMapping.h zipfilemapping.h
make

2
harbour/contrib/hbziparch/make_b32.bat
View File

@@ -3,7 +3,7 @@ rem
rem $Id$
rem
set CFLAGS=-w-inl- -w-stl- -w-ncf- -Iinclude
set CFLAGS=-w-inl- -w-stl- -w-ncf-
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

66
harbour/contrib/hbziparch/make_b32_dll.mak
View File

@@ -55,13 +55,14 @@ HARBOUR_DLL = ..\..\lib\b32\hbziparchdll.dll
# ßßßßßßßßßßßßßßßßßßßßß
HARBOUR_DLL_OBJS = \
$(OBJ_DIR)\hbziparc.obj\
$(OBJ_DIR)\hbcomprs.obj\
$(OBJ_DIR)\ziparchive.obj\
$(OBJ_DIR)\zip.obj\
$(OBJ_DIR)\zipplatform.obj\
$(OBJ_DIR)\ZipPlatform_win.obj\
$(OBJ_DIR)\zipstorage.obj\
$(OBJ_DIR)\zipstring.obj\
$(OBJ_DIR)\zipplatformcomm.obj\
$(OBJ_DIR)\zippathcomponent.obj\
$(OBJ_DIR)\ZipPathComponent_win.obj\
$(OBJ_DIR)\zipmemfile.obj\
$(OBJ_DIR)\zipfileheader.obj\
$(OBJ_DIR)\zipfile.obj\
@@ -102,30 +103,31 @@ $(HARBOUR_DLL) : \
# ³ HARBOUR_DLL linking ³Û
# ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙÛ
# ßßßßßßßßßßßßßßßßßßßßßßß
echo. $(OBJ_DIR)\ziparchive.obj + > hdll.tmp
echo. $(OBJ_DIR)\zip.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipplatform.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipstorage.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipstring.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipplatformcomm.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zippathcomponent.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipmemfile.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipfileheader.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipfile.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipnew.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcomp.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipexception.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcompatibility.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcentraldir.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipautobuffer.obj + >> hdll.tmp
echo. $(OBJ_DIR)\stdafx.obj + >> hdll.tmp
echo. c0d32w.obj, + >> hdll.tmp
echo. $(HARBOUR_DLL), + >> hdll.tmp
echo. , + >> hdll.tmp
echo. cw32.lib + >> hdll.tmp
echo. ..\..\lib\harbour.lib + >> hdll.tmp
echo. import32.lib + >> hdll.tmp
echo. uuid.lib >> hdll.tmp
echo. $(OBJ_DIR)\hbziparc.obj + > hdll.tmp
echo. $(OBJ_DIR)\hbcomprs.obj + >> hdll.tmp
echo. $(OBJ_DIR)\ziparchive.obj + >> hdll.tmp
echo. $(OBJ_DIR)\ZipPlatform_win.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipstorage.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipstring.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipplatformcomm.obj + >> hdll.tmp
echo. $(OBJ_DIR)\ZipPathComponent_win.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipmemfile.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipfileheader.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipfile.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipnew.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcomp.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipexception.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcompatibility.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipcentraldir.obj + >> hdll.tmp
echo. $(OBJ_DIR)\zipautobuffer.obj + >> hdll.tmp
echo. $(OBJ_DIR)\stdafx.obj + >> hdll.tmp
echo. c0d32w.obj, + >> hdll.tmp
echo. $(HARBOUR_DLL), + >> hdll.tmp
echo. , + >> hdll.tmp
echo. cw32.lib + >> hdll.tmp
echo. ..\..\lib\harbour.lib + >> hdll.tmp
echo. import32.lib + >> hdll.tmp
echo. uuid.lib >> hdll.tmp
ILINK32 -aa -Tpd -Gn @hdll.tmp
# ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
@@ -133,13 +135,13 @@ $(HARBOUR_DLL) : \
# ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙÛ
# ßßßßßßßßßßßßßßßßßßßßßßßß
$(OBJ_DIR)\hbziparc.obj : $(COMMON_DIR)\hbziparc.c
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\ziparchive.obj : $(COMMON_DIR)\ziparchive.cpp
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\zip.obj : $(COMMON_DIR)\zip.c
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\zipplatform.obj : $(COMMON_DIR)\zipplatform.cpp
$(OBJ_DIR)\ZipPlatform_win.obj : $(COMMON_DIR)\ZipPlatform_win.cpp
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\zipstorage.obj : $(COMMON_DIR)\zipstorage.cpp
@@ -151,7 +153,7 @@ $(OBJ_DIR)\zipstring.obj : $(COMMON_DIR)\zipstring.cpp
$(OBJ_DIR)\zipplatformcomm.obj : $(COMMON_DIR)\zipplatformcomm.cpp
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\zippathcomponent.obj : $(COMMON_DIR)\zippathcomponent.cpp
$(OBJ_DIR)\ZipPathComponent_win.obj : $(COMMON_DIR)\ZipPathComponent_win.cpp
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\zipmemfile.obj : $(COMMON_DIR)\zipmemfile.cpp

2
harbour/contrib/hbziparch/make_vc.bat
View File

@@ -3,7 +3,7 @@ rem
rem $Id$
rem
set CFLAGS=-EHsc -Iinclude
set CFLAGS=-EHsc
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

0
harbour/contrib/hbziparch/include/resource.h → harbour/contrib/hbziparch/resource.h
View File

0
harbour/contrib/hbziparch/include/stdafx.h → harbour/contrib/hbziparch/stdafx.h
View File

0
harbour/contrib/hbziparch/include/unzip.h → harbour/contrib/hbziparch/unzip.h
View File

0
harbour/contrib/hbziparch/include/zip.h → harbour/contrib/hbziparch/zip.h
View File

0
harbour/contrib/hbziparch/include/zipabstractfile.h → harbour/contrib/hbziparch/zipabstractfile.h
View File

0
harbour/contrib/hbziparch/include/ziparchive.h → harbour/contrib/hbziparch/ziparchive.h
View File

0
harbour/contrib/hbziparch/include/zipautobuffer.h → harbour/contrib/hbziparch/zipautobuffer.h
View File

0
harbour/contrib/hbziparch/include/zipbaseexception.h → harbour/contrib/hbziparch/zipbaseexception.h
View File

0
harbour/contrib/hbziparch/include/zipcentraldir.h → harbour/contrib/hbziparch/zipcentraldir.h
View File

0
harbour/contrib/hbziparch/include/zipcollections.h → harbour/contrib/hbziparch/zipcollections.h
View File

0
harbour/contrib/hbziparch/include/zipcompatibility.h → harbour/contrib/hbziparch/zipcompatibility.h
View File

0
harbour/contrib/hbziparch/include/zipexception.h → harbour/contrib/hbziparch/zipexception.h
View File

0
harbour/contrib/hbziparch/include/zipfile.h → harbour/contrib/hbziparch/zipfile.h
View File

0
harbour/contrib/hbziparch/include/zipfileheader.h → harbour/contrib/hbziparch/zipfileheader.h
View File

0
harbour/contrib/hbziparch/include/zipfilemapping.h → harbour/contrib/hbziparch/zipfilemapping.h
View File

0
harbour/contrib/hbziparch/include/zipinternalinfo.h → harbour/contrib/hbziparch/zipinternalinfo.h
View File

0
harbour/contrib/hbziparch/include/zipmemfile.h → harbour/contrib/hbziparch/zipmemfile.h
View File

0
harbour/contrib/hbziparch/include/zippathcomponent.h → harbour/contrib/hbziparch/zippathcomponent.h
View File

0
harbour/contrib/hbziparch/include/zipplatform.h → harbour/contrib/hbziparch/zipplatform.h
View File

0
harbour/contrib/hbziparch/include/zipstorage.h → harbour/contrib/hbziparch/zipstorage.h
View File

0
harbour/contrib/hbziparch/include/zipstring.h → harbour/contrib/hbziparch/zipstring.h
View File