corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject incubator-corinthia git commit: platform updated to show hierarchy in VC. the CMakeList.txt for 3rdparty and platform are now transformed so that they are better presented in VC. Work will continue with the other function groups in DocFormat, each functi
Date Tue, 23 Dec 2014 09:03:33 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master ac70cb0ed -> 797dc5189


platform updated to show hierarchy in VC.
the CMakeList.txt for 3rdparty and platform are now transformed so that they are better presented
in VC.
Work will continue with the other function groups in DocFormat, each function group will be
a single commit,
in order not to block others work.
Test is always compiled and added to the prebuilt lib, but since there are separate files
and functions,
the linker will not include test code, when linking for production.

ALv2 headers have been added to the CMakaList.txt files.


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

Branch: refs/heads/master
Commit: 797dc51894833f7d2d497a3b71ed0714e85e1655
Parents: ac70cb0
Author: jani <jani@apache.org>
Authored: Tue Dec 23 09:56:02 2014 +0100
Committer: jani <jani@apache.org>
Committed: Tue Dec 23 09:56:02 2014 +0100

----------------------------------------------------------------------
 CMakeLists.txt                                  |   4 +-
 DocFormats/CMakeLists.txt                       |   2 +-
 .../platform/3rdparty/minizip/CMakeLists.txt    |   5 -
 .../3rdparty/w3c-tidy-html5/CMakeLists.txt      |  33 ------
 DocFormats/platform/CMakeLists.txt              | 118 ++++++++++++++++++-
 5 files changed, 116 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/797dc518/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ff706d..79ca599 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
 
-set(LIBS tidy minizip)
+set(LIBS )
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     find_library(FOUNDATION_LIBRARY Foundation)
@@ -31,8 +31,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
-add_subdirectory(DocFormats/platform/3rdparty/minizip)
-add_subdirectory(DocFormats/platform/3rdparty/w3c-tidy-html5)
 add_subdirectory(DocFormats)
 add_subdirectory(consumers/dftest/src)
 add_subdirectory(consumers/dfconvert/src)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/797dc518/DocFormats/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt
index 9d7ce6a..c561c40 100644
--- a/DocFormats/CMakeLists.txt
+++ b/DocFormats/CMakeLists.txt
@@ -38,11 +38,11 @@ set(GroupRoot
     DocFormats.c
     $<TARGET_OBJECTS:api>
     $<TARGET_OBJECTS:core>
-    $<TARGET_OBJECTS:platform>
     $<TARGET_OBJECTS:unittest>
     $<TARGET_OBJECTS:ooxml>
     $<TARGET_OBJECTS:latex>
     $<TARGET_OBJECTS:odf>
+    $<TARGET_OBJECTS:platform>
 )
 
 add_library(DocFormats

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/797dc518/DocFormats/platform/3rdparty/minizip/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/minizip/CMakeLists.txt b/DocFormats/platform/3rdparty/minizip/CMakeLists.txt
deleted file mode 100644
index 44d4076..0000000
--- a/DocFormats/platform/3rdparty/minizip/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories()
-include_directories(.)
-add_library(minizip ioapi.c unzip.c zip.c)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/797dc518/DocFormats/platform/3rdparty/w3c-tidy-html5/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/3rdparty/w3c-tidy-html5/CMakeLists.txt b/DocFormats/platform/3rdparty/w3c-tidy-html5/CMakeLists.txt
deleted file mode 100644
index c066dca..0000000
--- a/DocFormats/platform/3rdparty/w3c-tidy-html5/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories(include)
-include_directories(src)
-add_library(tidy
-    src/access.c
-    src/alloc.c
-    src/attrask.c
-    src/attrdict.c
-    src/attrget.c
-    src/attrs.c
-    src/buffio.c
-    src/charsets.c
-    src/clean.c
-    src/config.c
-    src/entities.c
-    src/fileio.c
-    src/gdoc.c
-    src/iconvtc.c
-    src/istack.c
-    src/lexer.c
-    src/localize.c
-    src/mappedio.c
-    src/parser.c
-    src/pprint.c
-    src/streamio.c
-    src/tagask.c
-    src/tags.c
-    src/tidylib.c
-    src/tmbstr.c
-    src/utf8.c
-    src/win32tc.c
-)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/797dc518/DocFormats/platform/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/CMakeLists.txt b/DocFormats/platform/CMakeLists.txt
index caf7df8..ce07c33 100644
--- a/DocFormats/platform/CMakeLists.txt
+++ b/DocFormats/platform/CMakeLists.txt
@@ -1,7 +1,97 @@
-include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories(headers)
-include_directories(../unittest)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+###
+## group minizip objects
+###
+set(GroupMinizip
+    3rdparty/minizip/crypt.h
+    3rdparty/minizip/ioapi.c
+    3rdparty/minizip/ioapi.h
+    3rdparty/minizip/unzip.c
+    3rdparty/minizip/unzip.h
+    3rdparty/minizip/zip.c
+    3rdparty/minizip/zip.h
+   )
+
+
+
+###
+## group w3c-tidy-html5 objects
+###
+set(GroupHtml5
+# NOT SUPPORTED            3rdparty/w3c-tidy-html5/license.html
+    3rdparty/w3c-tidy-html5/include/buffio.h
+    3rdparty/w3c-tidy-html5/include/platform.h
+    3rdparty/w3c-tidy-html5/include/tidyenum.h
+    3rdparty/w3c-tidy-html5/include/tidy.h
+    3rdparty/w3c-tidy-html5/src/access.c
+    3rdparty/w3c-tidy-html5/src/access.h
+    3rdparty/w3c-tidy-html5/src/alloc.c
+    3rdparty/w3c-tidy-html5/src/attrask.c
+    3rdparty/w3c-tidy-html5/src/attrdict.c
+    3rdparty/w3c-tidy-html5/src/attrdict.h
+    3rdparty/w3c-tidy-html5/src/attrget.c
+    3rdparty/w3c-tidy-html5/src/attrs.c
+    3rdparty/w3c-tidy-html5/src/attrs.h
+    3rdparty/w3c-tidy-html5/src/buffio.c
+    3rdparty/w3c-tidy-html5/src/charsets.c
+    3rdparty/w3c-tidy-html5/src/charsets.h
+    3rdparty/w3c-tidy-html5/src/clean.c
+    3rdparty/w3c-tidy-html5/src/clean.h
+    3rdparty/w3c-tidy-html5/src/config.c
+    3rdparty/w3c-tidy-html5/src/config.h
+    3rdparty/w3c-tidy-html5/src/entities.c
+    3rdparty/w3c-tidy-html5/src/entities.h
+    3rdparty/w3c-tidy-html5/src/fileio.c
+    3rdparty/w3c-tidy-html5/src/fileio.h
+    3rdparty/w3c-tidy-html5/src/forward.h
+    3rdparty/w3c-tidy-html5/src/gdoc.c
+    3rdparty/w3c-tidy-html5/src/gdoc.h
+    3rdparty/w3c-tidy-html5/src/iconvtc.c
+    3rdparty/w3c-tidy-html5/src/iconvtc.h
+    3rdparty/w3c-tidy-html5/src/istack.c
+    3rdparty/w3c-tidy-html5/src/lexer.c
+    3rdparty/w3c-tidy-html5/src/lexer.h
+    3rdparty/w3c-tidy-html5/src/localize.c
+    3rdparty/w3c-tidy-html5/src/mappedio.c
+    3rdparty/w3c-tidy-html5/src/mappedio.h
+    3rdparty/w3c-tidy-html5/src/message.h
+    3rdparty/w3c-tidy-html5/src/parser.c
+    3rdparty/w3c-tidy-html5/src/parser.h
+    3rdparty/w3c-tidy-html5/src/pprint.c
+    3rdparty/w3c-tidy-html5/src/pprint.h
+    3rdparty/w3c-tidy-html5/src/streamio.c
+    3rdparty/w3c-tidy-html5/src/streamio.h
+    3rdparty/w3c-tidy-html5/src/tagask.c
+    3rdparty/w3c-tidy-html5/src/tags.c
+    3rdparty/w3c-tidy-html5/src/tags.h
+    3rdparty/w3c-tidy-html5/src/tidy-int.h
+    3rdparty/w3c-tidy-html5/src/tidylib.c
+    3rdparty/w3c-tidy-html5/src/tmbstr.c
+    3rdparty/w3c-tidy-html5/src/tmbstr.h
+    3rdparty/w3c-tidy-html5/src/utf8.c
+    3rdparty/w3c-tidy-html5/src/utf8.h
+    3rdparty/w3c-tidy-html5/src/version.h
+    3rdparty/w3c-tidy-html5/src/win32tc.c
+    3rdparty/w3c-tidy-html5/src/win32tc.h
+   )
+
 
+###
+## group platform code
+###
 set(GroupHeaders
     headers/DFPlatform.h)
 
@@ -14,11 +104,31 @@ set(GroupSrc
 set(GroupTests
     tests/PlatformTests.c)
 
+
+
+###
+# Common include for all platform files
+###
+include_directories()
+include_directories(3rdparty/minizip)
+include_directories(3rdparty/w3c-tidy-html5/include)
+include_directories(3rdparty/w3c-tidy-html5/src)
+include_directories(../../external/include)
+include_directories(SYSTEM ${INCLUDE_DIRS})
+include_directories(headers)
+#include_directories(../unittest)
+
+
+
 add_library(platform OBJECT
+    ${GroupMinizip}
+	${GroupHtml5}
     ${GroupHeaders}
     ${GroupSrc}
     ${GroupTests})
-
 source_group(headers FILES ${GroupHeaders})
 source_group(src FILES ${GroupSrc})
 source_group(tests FILES ${GroupTests})
+source_group("src\\minizip" FILES ${GroupMinizip})
+source_group("src\\w3c-tidy-html5" FILES ${GroupHtml5})
+set_property(TARGET platform PROPERTY FOLDER DocFormats)


Mime
View raw message