merge master

brechtsanders · Dec 29, 2020 · 39bb075 · 39bb075
2 parents 6712a9d + 2d12a88
commit 39bb075
Show file tree

Hide file tree

Showing 15 changed files with 402 additions and 89 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,7 +85,7 @@ ENDIF()
 
 FOREACH(LINKTYPE ${LINKTYPES})
   ADD_LIBRARY(xlsxio_read_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c lib/xlsxio_read_sharedstrings.c)
-  SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF}")
+  SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}")
   SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES OUTPUT_NAME xlsxio_read)
   IF(MINGW AND LINKTYPE STREQUAL "SHARED")
     SET_TARGET_PROPERTIES(xlsxio_read_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_read.def")
@@ -96,7 +96,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
   SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE})
 
   ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c)
-  SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF}")
+  SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}")
   SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES OUTPUT_NAME xlsxio_write)
   IF(MINGW AND LINKTYPE STREQUAL "SHARED")
     SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_write.def")

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,32 @@
+0.2.30
+
+2020-07-12  Remi Collet  https://github.com/remicollet
+
+  * added XLSXIO_VERSION_ID to xlsxio_version.h
+
+0.2.29
+
+2020-07-10  Brecht Sanders  https://github.com/brechtsanders/
+
+  * only treat sheet as a table (with header rows) when XLSXIOREAD_SKIP_EXTRA_CELLS flag is used (issue #75)
+  * added xlsxioread_free() to fix crashes when calling library build with different compiler (issue #73)
+
+0.2.28
+
+2020-07-06  Brecht Sanders  https://github.com/brechtsanders/
+
+  * fixed issues with XLSXIOREAD_SKIP_EMPTY_CELLS/XLSXIOREAD_SKIP_EMPTY_ROWS/XLSXIOREAD_SKIP_ALL_EMPTY/XLSXIOREAD_SKIP_EXTRA_CELLS (issue #75)
+
 0.2.27
 
+2020-07-05  Brecht Sanders  https://github.com/brechtsanders/
+
+  * fixed issues with XLSXIOREAD_SKIP_EMPTY_CELLS/XLSXIOREAD_SKIP_EMPTY_ROWS/XLSXIOREAD_SKIP_ALL_EMPTY (issue #74)
+
+2020-05-08  Brecht Sanders  https://github.com/brechtsanders/
+
+  * changed Makefile to also generate .def files to be included in Windows packages
+
 2020-03-20  Brecht Sanders  https://github.com/brechtsanders/
 
   * accepted patch (#63) to add xlsxioread_sheet_last_column_index() and xlsxioread_sheet_flags()

diff --git a/Makefile b/Makefile
@@ -76,8 +76,8 @@ ifneq ($(OS),Windows_NT)
 SHARED_CFLAGS += -fPIC
 endif
 ifeq ($(OS),Windows_NT)
-XLSXIOREAD_SHARED_LDFLAGS += -Wl,--out-implib,$@$(LIBEXT)
-XLSXIOWRITE_SHARED_LDFLAGS += -Wl,--out-implib,$@$(LIBEXT)
+XLSXIOREAD_SHARED_LDFLAGS += -Wl,--out-implib,$@$(LIBEXT) -Wl,--compat-implib -Wl,--output-def,$(@:%.dll=%.def)
+XLSXIOWRITE_SHARED_LDFLAGS += -Wl,--out-implib,$@$(LIBEXT) -Wl,--compat-implib -Wl,--output-def,$(@:%.dll=%.def)
 else ifeq ($(OS),Darwin)
 else
 XLSXIOWRITE_LDFLAGS += -pthread
@@ -194,6 +194,7 @@ install: all doc
 	$(CP) include/*.h $(PREFIX)/include/
 	$(CP) *$(LIBEXT) $(PREFIX)/lib/
 ifeq ($(OS),Windows_NT)
+	$(CP) *.def $(PREFIX)/lib/
 	$(CP) *$(SOEXT) $(PREFIX)/bin/
 else
 	$(CP) *$(SOEXT) $(PREFIX)/lib/
@@ -228,5 +229,8 @@ endif
 .PHONY: clean
 clean:
 	$(RM) lib/*.o examples/*.o src/*.o *$(LIBEXT) *$(SOEXT) $(TOOLS_BIN) $(EXAMPLES_BIN) version xlsxio-*.tar.xz doc/doxygen_sqlite3.db
+ifeq ($(OS),Windows_NT)
+	$(RM) *.def
+endif
 	$(RMDIR) doc/html doc/man
 
diff --git a/build/example_xlsxio_read_wchar.depend b/build/example_xlsxio_read_wchar.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1521232544 source:z:\xlsxio\examples\example_xlsxio_read.c
+1521236144 source:z:\xlsxio\examples\example_xlsxio_read.c
 	<stdlib.h>
 	<stdio.h>
 	<string.h>
@@ -12,13 +12,13 @@
 	<fcntl.h>
 	"xlsxio_read.h"
 
-1521131524 z:\xlsxio\include\xlsxio_read.h
+1594390761 z:\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1521232544 source:\\server\users\brecht\sources\cpp\xlsxio\examples\example_xlsxio_read.c
+1521236144 source:\\server\users\brecht\sources\cpp\xlsxio\examples\example_xlsxio_read.c
 	<stdlib.h>
 	<stdio.h>
 	<string.h>
@@ -31,7 +31,7 @@
 	<fcntl.h>
 	"xlsxio_read.h"
 
-1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>

diff --git a/build/libxlsxio_read_minizip_shared.depend b/build/libxlsxio_read_minizip_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -14,22 +14,58 @@
 	<unistd.h>
 	<zip.h>
 
-1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
+1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
 	<wchar.h>
 
-1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
+1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
 	<stdint.h>
 	<expat.h>
 
-1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
-1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	<stdlib.h>
+	<string.h>
+
+1594390670 source:z:\xlsxio\lib\xlsxio_read.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	"xlsxio_read.h"
+	"xlsxio_version.h"
+	<stdlib.h>
+	<stdio.h>
+	<inttypes.h>
+	<string.h>
+	<expat.h>
+	<minizip/unzip.h>
+	<io.h>
+	<unistd.h>
+	<zip.h>
+
+1521234538 z:\xlsxio\lib\xlsxio_private.h
+	<wchar.h>
+
+1522321419 z:\xlsxio\lib\xlsxio_read_sharedstrings.h
+	<stdint.h>
+	<expat.h>
+
+1594390761 z:\xlsxio\include\xlsxio_read.h
+	<stdlib.h>
+	<stdint.h>
+	<time.h>
+	<wchar.h>
+
+1594390364 z:\xlsxio\include\xlsxio_version.h
+
+1522321402 source:z:\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	<stdlib.h>

diff --git a/build/libxlsxio_read_shared.depend b/build/libxlsxio_read_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -14,24 +14,60 @@
 	<unistd.h>
 	<zip.h>
 
-1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
+1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
 	<wchar.h>
 
-1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
+1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
 	<stdint.h>
 	<expat.h>
 
-1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
-1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	<stdlib.h>
 	<string.h>
 
+1522321402 source:z:\xlsxio\lib\xlsxio_read_sharedstrings.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	<stdlib.h>
+	<string.h>
+
+1521234538 z:\xlsxio\lib\xlsxio_private.h
+	<wchar.h>
+
+1522321419 z:\xlsxio\lib\xlsxio_read_sharedstrings.h
+	<stdint.h>
+	<expat.h>
+
+1594390670 source:z:\xlsxio\lib\xlsxio_read.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	"xlsxio_read.h"
+	"xlsxio_version.h"
+	<stdlib.h>
+	<stdio.h>
+	<inttypes.h>
+	<string.h>
+	<expat.h>
+	<minizip/unzip.h>
+	<io.h>
+	<unistd.h>
+	<zip.h>
+
+1594390761 z:\xlsxio\include\xlsxio_read.h
+	<stdlib.h>
+	<stdint.h>
+	<time.h>
+	<wchar.h>
+
+1594390364 z:\xlsxio\include\xlsxio_version.h
+
diff --git a/build/libxlsxio_read_wchar.depend b/build/libxlsxio_read_wchar.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -14,22 +14,58 @@
 	<unistd.h>
 	<zip.h>
 
-1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
+1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
 	<wchar.h>
 
-1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
+1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
 	<stdint.h>
 	<expat.h>
 
-1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
-1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	<stdlib.h>
+	<string.h>
+
+1594390670 source:z:\xlsxio\lib\xlsxio_read.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	"xlsxio_read.h"
+	"xlsxio_version.h"
+	<stdlib.h>
+	<stdio.h>
+	<inttypes.h>
+	<string.h>
+	<expat.h>
+	<minizip/unzip.h>
+	<io.h>
+	<unistd.h>
+	<zip.h>
+
+1521234538 z:\xlsxio\lib\xlsxio_private.h
+	<wchar.h>
+
+1522321419 z:\xlsxio\lib\xlsxio_read_sharedstrings.h
+	<stdint.h>
+	<expat.h>
+
+1594390761 z:\xlsxio\include\xlsxio_read.h
+	<stdlib.h>
+	<stdint.h>
+	<time.h>
+	<wchar.h>
+
+1594390364 z:\xlsxio\include\xlsxio_version.h
+
+1522321402 source:z:\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	<stdlib.h>

diff --git a/build/libxlsxio_read_wchar_shared.depend b/build/libxlsxio_read_wchar_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -14,22 +14,58 @@
 	<unistd.h>
 	<zip.h>
 
-1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
+1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
 	<wchar.h>
 
-1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
+1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
 	<stdint.h>
 	<expat.h>
 
-1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
-1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	<stdlib.h>
+	<string.h>
+
+1594390670 source:z:\xlsxio\lib\xlsxio_read.c
+	"xlsxio_private.h"
+	"xlsxio_read_sharedstrings.h"
+	"xlsxio_read.h"
+	"xlsxio_version.h"
+	<stdlib.h>
+	<stdio.h>
+	<inttypes.h>
+	<string.h>
+	<expat.h>
+	<minizip/unzip.h>
+	<io.h>
+	<unistd.h>
+	<zip.h>
+
+1521234538 z:\xlsxio\lib\xlsxio_private.h
+	<wchar.h>
+
+1522321419 z:\xlsxio\lib\xlsxio_read_sharedstrings.h
+	<stdint.h>
+	<expat.h>
+
+1594390761 z:\xlsxio\include\xlsxio_read.h
+	<stdlib.h>
+	<stdint.h>
+	<time.h>
+	<wchar.h>
+
+1594390364 z:\xlsxio\include\xlsxio_version.h
+
+1522321402 source:z:\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	<stdlib.h>