corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [02/19] incubator-corinthia git commit: prepare for removal of minizip
Date Thu, 01 Jan 2015 10:10:24 GMT
prepare for removal of minizip


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/8d2865f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/8d2865f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/8d2865f8

Branch: refs/heads/RTC_platform
Commit: 8d2865f8aa98cf602cb61df169659204592508c6
Parents: 9debb84
Author: jani <jani@apache.org>
Authored: Sat Dec 27 19:02:45 2014 +0100
Committer: jani <jani@apache.org>
Committed: Sat Dec 27 19:02:45 2014 +0100

----------------------------------------------------------------------
 DocFormats/api/CMakeLists.txt            | 1 -
 DocFormats/core/CMakeLists.txt           | 1 -
 DocFormats/core/src/lib/DFZipFile.c      | 3 +--
 DocFormats/filters/latex/CMakeLists.txt  | 1 -
 DocFormats/filters/odf/CMakeLists.txt    | 1 -
 DocFormats/filters/ooxml/CMakeLists.txt  | 1 -
 DocFormats/platform/CMakeLists.txt       | 3 ++-
 DocFormats/platform/headers/DFPlatform.h | 5 +++++
 DocFormats/unittest/CMakeLists.txt       | 1 -
 9 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/api/CMakeLists.txt b/DocFormats/api/CMakeLists.txt
index 8032b33..4df69cc 100644
--- a/DocFormats/api/CMakeLists.txt
+++ b/DocFormats/api/CMakeLists.txt
@@ -44,7 +44,6 @@ set(GroupTests
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
-include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/core/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt
index 927dff0..d348045 100644
--- a/DocFormats/core/CMakeLists.txt
+++ b/DocFormats/core/CMakeLists.txt
@@ -152,7 +152,6 @@ include_directories()
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include)
 include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src)
-include_directories(../../DocFormats/platform/3rdparty/minizip)
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)
 include_directories(../platform/headers)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/core/src/lib/DFZipFile.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.c b/DocFormats/core/src/lib/DFZipFile.c
index 651b43b..60b810a 100644
--- a/DocFormats/core/src/lib/DFZipFile.c
+++ b/DocFormats/core/src/lib/DFZipFile.c
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 #include "DFZipFile.h"
-#include "unzip.h"
-#include "zip.h"
+#include "platform.h"
 #include "DFFilesystem.h"
 #include "DFString.h"
 #include "DFCommon.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/filters/latex/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/CMakeLists.txt b/DocFormats/filters/latex/CMakeLists.txt
index a02e559..0aca5e3 100644
--- a/DocFormats/filters/latex/CMakeLists.txt
+++ b/DocFormats/filters/latex/CMakeLists.txt
@@ -31,7 +31,6 @@ include_directories()
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
-include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index fac5ee9..4673096 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -37,7 +37,6 @@ include_directories()
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
-include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/filters/ooxml/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/CMakeLists.txt b/DocFormats/filters/ooxml/CMakeLists.txt
index 1c1a937..acc28c2 100644
--- a/DocFormats/filters/ooxml/CMakeLists.txt
+++ b/DocFormats/filters/ooxml/CMakeLists.txt
@@ -123,7 +123,6 @@ include_directories()
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
-include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/platform/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/CMakeLists.txt b/DocFormats/platform/CMakeLists.txt
index 85e4cb2..6fdbc07 100644
--- a/DocFormats/platform/CMakeLists.txt
+++ b/DocFormats/platform/CMakeLists.txt
@@ -99,7 +99,8 @@ set(GroupSrc
     src/Apple.c
     src/Linux.c
     src/Unix.c
-    src/Win32.c)
+    src/Win32.c
+    src/Wrapper.c)
 
 set(GroupTests
     tests/PlatformTests.c

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/platform/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/platform/headers/DFPlatform.h b/DocFormats/platform/headers/DFPlatform.h
index a14350d..e53b4b1 100755
--- a/DocFormats/platform/headers/DFPlatform.h
+++ b/DocFormats/platform/headers/DFPlatform.h
@@ -34,4 +34,9 @@ typedef int DFOnce;
 typedef void (*DFOnceFunction)(void);
 void DFInitOnce(DFOnce *once, DFOnceFunction fun);
 
+// Zip functions
+int DFextZipOpen(const char *zipFilename);
+int DFextZipOpenNextFile(const char *zipFile, char *entryName, const int maxName);
+int DFextZipReadCurrentFile(char *buf, const int maxLen);
+int DFextZipClose(void);
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/8d2865f8/DocFormats/unittest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/CMakeLists.txt b/DocFormats/unittest/CMakeLists.txt
index b780cd7..f1d7d7e 100644
--- a/DocFormats/unittest/CMakeLists.txt
+++ b/DocFormats/unittest/CMakeLists.txt
@@ -28,7 +28,6 @@ include_directories()
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
-include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)


Mime
View raw message