Commit 551fff059c23b9aa38c44ce664fbe82c62d8f16b - libodsstream

+3

-3

CMakeLists.txt less more

13	13
14	14	set(LIBODSSTREAM_VERSION_MAJOR "0")
15	15	set(LIBODSSTREAM_VERSION_MINOR "8")
16		set(LIBODSSTREAM_VERSION_PATCH "2")
	16	set(LIBODSSTREAM_VERSION_PATCH "4")
17	17	set(LIBODSSTREAM_LIB_NAME "libodsstream")
18	18	set(LIBODSSTREAM_VERSION "${LIBODSSTREAM_VERSION_MAJOR}.${LIBODSSTREAM_VERSION_MINOR}.${LIBODSSTREAM_VERSION_PATCH}")
19		set(VERSION 0.8.2)
	19	set(VERSION 0.8.4)
20	20	set(LIBODSSTREAM_LIB_VERSION ${LIBODSSTREAM_VERSION})
21	21	set(LIBODSSTREAM_LIB_SOVERSION ${LIBODSSTREAM_VERSION_MAJOR})
22	22

105	105	# Run the following cmake command line:
106	106	# x86_64-w64-mingw32.shared-cmake -DCMAKE_BUILD_TYPE=Release -DMXE=1 ../development
107	107	#include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain.cmake)
108		include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain.cmake)
	108	include(${CMAKE_TOOLCHAINS_PATH}/mxe-toolchain-olivier.cmake)
109	109
110	110	# Set the name to the systemUname variable because in this situation that name
111	111	# is not found, it it passed as a flag in the command line.

+50

-0

CMakeStuff/modules/FindQUAZIP.cmake less more

	0	# QUAZIP_FOUND - QUAZIP library was found
	1	# QUAZIP_INCLUDE_DIR - Path to QUAZIP include dir
	2	# QUAZIP_INCLUDE_DIRS - Path to QUAZIP and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
	3	# QUAZIP_LIBRARIES - List of QUAZIP libraries
	4	# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
	5
	6
	7	IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
	8	# in cache already
	9	SET(QUAZIP_FOUND TRUE)
	10	ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
	11	IF (WIN32)
	12	FIND_PATH(QUAZIP_LIBRARY_DIR
	13	WIN32_DEBUG_POSTFIX d
	14	NAMES libquazip.dll
	15	HINTS "C:/Programme/" "C:/Program Files"
	16	PATH_SUFFIXES QUAZIP/lib
	17	)
	18	FIND_LIBRARY(QUAZIP_QT4_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR})
	19	FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES quazip)
	20	FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
	21	ELSE(WIN32)
	22	#FIND_PACKAGE(PkgConfig)
	23	# pkg_check_modules(PC_QCA2 QUIET qca2)
	24	#pkg_check_modules(PC_QUAZIP quazip)
	25	FIND_LIBRARY(QUAZIP_QT5_LIBRARIES
	26	WIN32_DEBUG_POSTFIX d
	27	NAMES quazip-qt5 quazip5
	28	HINTS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
	29	)
	30	SET(QUAZIP_LIBRARIES ${QUAZIP_QT5_LIBRARIES})
	31	FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
	32	HINTS /usr/include /usr/local/include
	33	PATH_SUFFIXES quazip quazip5
	34	)
	35	FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
	36	ENDIF (WIN32)
	37	INCLUDE(FindPackageHandleStandardArgs)
	38	SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
	39	find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
	40	ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
	41
	42	# Added by FRusconi to maintain code more easily.
	43
	44	if(NOT TARGET QUAZIP::QUAZIP)
	45	add_library(QUAZIP::QUAZIP UNKNOWN IMPORTED)
	46	set_target_properties(QUAZIP::QUAZIP PROPERTIES
	47	IMPORTED_LOCATION ${QUAZIP_LIBRARIES}
	48	INTERFACE_INCLUDE_DIRECTORIES ${QUAZIP_INCLUDE_DIR})
	49	endif()

+0

-41

~~CMakeStuff/modules/FindQuaZip.cmake~~ less more

0		# QUAZIP_FOUND - QuaZip library was found
1		# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
2		# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
3		# QUAZIP_LIBRARIES - List of QuaZip libraries
4		# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
5
6
7		IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
8		# in cache already
9		SET(QUAZIP_FOUND TRUE)
10		ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
11		IF (WIN32)
12		FIND_PATH(QUAZIP_LIBRARY_DIR
13		WIN32_DEBUG_POSTFIX d
14		NAMES libquazip.dll
15		HINTS "C:/Programme/" "C:/Program Files"
16		PATH_SUFFIXES QuaZip/lib
17		)
18		FIND_LIBRARY(QUAZIP_QT4_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR})
19		FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES quazip)
20		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
21		ELSE(WIN32)
22		#FIND_PACKAGE(PkgConfig)
23		# pkg_check_modules(PC_QCA2 QUIET qca2)
24		#pkg_check_modules(PC_QUAZIP quazip)
25		FIND_LIBRARY(QUAZIP_QT5_LIBRARIES
26		WIN32_DEBUG_POSTFIX d
27		NAMES quazip-qt5 quazip5
28		HINTS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
29		)
30		SET(QUAZIP_LIBRARIES ${QUAZIP_QT5_LIBRARIES})
31		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
32		HINTS /usr/include /usr/local/include
33		PATH_SUFFIXES quazip quazip5
34		)
35		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
36		ENDIF (WIN32)
37		INCLUDE(FindPackageHandleStandardArgs)
38		SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
39		find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
40		ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)

+7

-0

CMakeStuff/toolchains/mxe-toolchain-olivier.cmake less more

26	26
27	27
28	28	message(STATUS "QUAZIP_INCLUDE_DIR :${QUAZIP_INCLUDE_DIR}")
	29
	30	if(NOT TARGET QUAZIP::QUAZIP)
	31	add_library(QUAZIP::QUAZIP UNKNOWN IMPORTED)
	32	set_target_properties(QUAZIP::QUAZIP PROPERTIES
	33	IMPORTED_LOCATION ${QUAZIP_LIBRARIES}
	34	INTERFACE_INCLUDE_DIRECTORIES ${QUAZIP_INCLUDE_DIR})
	35	endif()

+7

-0

CMakeStuff/toolchains/mxe-toolchain.cmake less more

26	26
27	27
28	28	message(STATUS "QUAZIP_INCLUDE_DIR :${QUAZIP_INCLUDE_DIR}")
	29
	30	if(NOT TARGET QUAZIP::QUAZIP)
	31	add_library(QUAZIP::QUAZIP UNKNOWN IMPORTED)
	32	set_target_properties(QUAZIP::QUAZIP PROPERTIES
	33	IMPORTED_LOCATION ${QUAZIP_LIBRARIES}
	34	INTERFACE_INCLUDE_DIRECTORIES ${QUAZIP_INCLUDE_DIR})
	35	endif()

+4

-4

CMakeStuff/toolchains/unix-toolchain.cmake less more

13	13	find_package(ZLIB REQUIRED)
14	14
15	15
16		find_package(QuaZip QUIET)
	16	find_package(QUAZIP QUIET)
17	17	if(NOT QUAZIP_FOUND)
18		message(STATUS "QuaZip not yet found. Searching for it.")
19		set(QuaZip_DIR ${CMAKE_MODULE_PATH})
20		find_package(QuaZip REQUIRED)
	18	message(STATUS "QUAZIP not yet found. Searching for it.")
	19	set(QUAZIP_DIR ${CMAKE_MODULE_PATH})
	20	find_package(QUAZIP REQUIRED)
21	21	endif()
22	22
23	23

+5

-5

CMakeStuff/toolchains/win10-mingw64-toolchain.cmake less more

18	18	set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
19	19
20	20	set(QUAZIP_FOUND 1)
21		set(QUAZIP_INCLUDE_DIR /c/msys64/mingw64/include/QuaZip-Qt5-1.3)
22		set(QUAZIP_LIBRARIES /c/msys64/mingw64/bin/libquazip1-qt5.dll)
23		if(NOT TARGET QuaZip::QuaZip)
24		add_library(QuaZip::QuaZip UNKNOWN IMPORTED)
25		set_target_properties(QuaZip::QuaZip PROPERTIES
	21	set(QUAZIP_INCLUDE_DIR C:/msys64/mingw64/include/QuaZip-Qt5-1.3)
	22	set(QUAZIP_LIBRARIES C:/msys64/mingw64/bin/libquazip1-qt5.dll)
	23	if(NOT TARGET QUAZIP::QUAZIP)
	24	add_library(QUAZIP::QUAZIP UNKNOWN IMPORTED)
	25	set_target_properties(QUAZIP::QUAZIP PROPERTIES
26	26	IMPORTED_LOCATION ${QUAZIP_LIBRARIES}
27	27	INTERFACE_INCLUDE_DIRECTORIES ${QUAZIP_INCLUDE_DIR})
28	28	endif()

+4

-4

src/CMakeLists.txt less more

44	44	add_library(odsstream-static STATIC ${CPP_FILES})
45	45
46	46	target_include_directories (odsstream-static PUBLIC
47		${QUAZIP_INCLUDE_DIR}
	47	QUAZIP::QUAZIP
48	48	)
49	49
50	50	set_target_properties(odsstream-static

56	56	Qt5::Xml
57	57	Qt5::Gui
58	58	ZLIB::ZLIB
59		${QUAZIP_LIBRARIES}
	59	QUAZIP::QUAZIP
60	60	)
61	61
62	62	# Build the shared lib
63	63	add_library(odsstream-shared SHARED ${CPP_FILES})
64	64
65	65	target_include_directories (odsstream-shared PUBLIC
66		${QUAZIP_INCLUDE_DIR}
	66	QUAZIP::QUAZIP
67	67	)
68	68
69	69	set_target_properties(odsstream-shared PROPERTIES

77	77	Qt5::Xml
78	78	Qt5::Gui
79	79	ZLIB::ZLIB
80		${QUAZIP_LIBRARIES}
	80	QUAZIP::QUAZIP
81	81	)
82	82
83	83

+19

-10

src/odsstream/ziptsvoutputstream.cpp less more

47	47	.arg(QFileInfo(*mpa_fileZipArchive).absoluteFilePath()));
48	48	}
49	49
	50	qDebug();
50	51	mpa_quaZip = new QuaZip(mpa_fileZipArchive);
51	52	bool open_ok = mpa_quaZip->open(QuaZip::mdCreate);
52	53

64	65	{
65	66	qDebug();
66	67	closeCurrentZipSheet();
	68	close();
	69	qDebug();
	70	}
	71
	72	void
	73	ZipTsvOutputStream::close()
	74	{
	75
	76	qDebug();
	77
	78	TsvDirectoryWriter::close();
	79	closeCurrentZipSheet();
67	80	if(mpa_quaZip != nullptr)
68	81	{
	82	qDebug();
69	83	mpa_quaZip->close();
70	84	delete mpa_quaZip;
	85	mpa_quaZip = nullptr;
71	86	}
72	87	if(mpa_fileZipArchive != nullptr)
73	88	{
	89	qDebug();
74	90	mpa_fileZipArchive->close();
75	91	delete mpa_fileZipArchive;
	92	mpa_fileZipArchive = nullptr;
76	93	}
77	94	qDebug();
78	95	}
79	96
	97
80	98	void
81	99	ZipTsvOutputStream::closeCurrentZipSheet()
82	100	{
83		qDebug();
84		if(mpa_otxtstream != nullptr)
85		{
86		qDebug();
87		mpa_otxtstream->flush();
88		delete mpa_otxtstream;
89		mpa_otxtstream = nullptr;
90		qDebug();
91		}
	101
92	102	qDebug();
93	103	if(mpa_outFileInZip != nullptr)
94	104	{

99	109	mpa_outFileInZip = nullptr;
100	110	qDebug();
101	111	}
102
103	112	qDebug();
104	113	}
105	114

+3

-0

src/odsstream/ziptsvoutputstream.h less more

48	48	virtual ~ZipTsvOutputStream();
49	49
50	50	virtual void writeSheet(const QString &sheetName) override;
	51
	52
	53	void close() override;
51	54
52	55
53	56	private:

+1

-0

test/test_tsv.cpp less more

165	165	{
166	166	// Set the debugging message formatting pattern.
167	167	qSetMessagePattern(QString("%{file}@%{line}, %{function}(): %{message}"));
	168	INFO("begin");
168	169	ZipTsvOutputStream writer("test.zip");
169	170
170	171	INFO("coucou");