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: Christmas version, all CMakeList.txt files updated All CmakeList.txt now contain ALv2 license When using VC the projects show up as a directory structure given their relationship. The include dir statements need to heavely
Date Wed, 24 Dec 2014 10:19:19 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master 9037c1f3d -> 9eaaa481c


Christmas version, all CMakeList.txt files updated
All CmakeList.txt now contain ALv2 license
When using VC the projects show up as a directory structure
given their relationship.
The include dir statements need to heavely reduced.


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

Branch: refs/heads/master
Commit: 9eaaa481c99e6750ea1a19d5a74115807b87b376
Parents: 9037c1f
Author: jani <jani@apache.org>
Authored: Wed Dec 24 11:14:45 2014 +0100
Committer: jani <jani@apache.org>
Committed: Wed Dec 24 11:14:45 2014 +0100

----------------------------------------------------------------------
 CMakeLists.txt                          |  23 ++++++
 DocFormats/CMakeLists.txt               |  77 ++++++++++++--------
 DocFormats/api/CMakeLists.txt           |  66 ++++++++++++-----
 DocFormats/core/CMakeLists.txt          |   8 +--
 DocFormats/core/headers/DFCommon.h      |  31 --------
 DocFormats/core/headers/DFCore.h        |  19 -----
 DocFormats/core/headers/DFTypes.h       |  35 ---------
 DocFormats/filters/latex/CMakeLists.txt |  48 ++++++++++---
 DocFormats/filters/odf/CMakeLists.txt   |  60 +++++++++++-----
 DocFormats/filters/ooxml/CMakeLists.txt | 102 ++++++++++++++++++++-------
 DocFormats/headers/DFCommon.h           |  31 ++++++++
 DocFormats/headers/DFCore.h             |  19 +++++
 DocFormats/headers/DFTypes.h            |  35 +++++++++
 DocFormats/unittest/CMakeLists.txt      |  40 +++++++++--
 consumers/dfconvert/src/CMakeLists.txt  |  36 ++++++++++
 consumers/dftest/src/CMakeLists.txt     |  40 ++++++++++-
 consumers/dfutil/src/CMakeLists.txt     |  40 ++++++++++-
 17 files changed, 508 insertions(+), 202 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79ca599..274f230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,21 @@
+#
+# 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.
+
+
+
+###
+## global definitions
+###
 cmake_minimum_required(VERSION 2.8)
 project(Corinthia)
 
@@ -31,6 +49,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
+
+
+###
+## run subprojects
+###
 add_subdirectory(DocFormats)
 add_subdirectory(consumers/dftest/src)
 add_subdirectory(consumers/dfconvert/src)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt
index 685be81..7bb39bb 100644
--- a/DocFormats/CMakeLists.txt
+++ b/DocFormats/CMakeLists.txt
@@ -1,6 +1,29 @@
+#
+# 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.
+
+
+
+###
+## global definitions
+###
 cmake_minimum_required(VERSION 2.8)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+
+
+###
+## run subprojects
+###
 add_subdirectory(api)
 add_subdirectory(core)
 add_subdirectory(platform)
@@ -9,32 +32,20 @@ add_subdirectory(filters/ooxml)
 add_subdirectory(filters/latex)
 add_subdirectory(filters/odf)
 
-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(.)
-include_directories(./platform/headers)
-include_directories(./core/headers)
-include_directories(./core/src/common)
-include_directories(./core/src/css)
-include_directories(./core/src/html)
-include_directories(./core/src/lib)
-include_directories(./core/src/names)
-include_directories(./core/src/xml)
-include_directories(./filters/latex/src)
-include_directories(./filters/odf/src)
-include_directories(./filters/ooxml/src/common)
-include_directories(./filters/ooxml/src/word)
-include_directories(./filters/ooxml/src/word/formatting)
-include_directories(./filters/ooxml/src/word/lenses)
-include_directories(../unittest)
-
-set(GroupRoot
-    DocFormats.c
+
+
+###
+## group main objects
+###
+set(GroupSrcRoot
+    DocFormats.c)
+
+
+
+###
+## group subproject objects
+###
+set(GroupObjRoot
     $<TARGET_OBJECTS:api>
     $<TARGET_OBJECTS:core>
     $<TARGET_OBJECTS:unittest>
@@ -42,10 +53,16 @@ set(GroupRoot
     $<TARGET_OBJECTS:latex>
     $<TARGET_OBJECTS:odf>
     $<TARGET_OBJECTS:platform>
-    $<TARGET_OBJECTS:core>
-)
+    $<TARGET_OBJECTS:core>)
+
+
 
+###
+# library (release artifact)
+###
 add_library(DocFormats
-    ${GroupRoot})
+    ${GroupSrcRoot}
+    ${GroupObjRoot})
 
-source_group(\\ FILES ${GroupRoot})
+source_group(src FILES ${GroupSrcRoot})
+set_property(TARGET DocFormats PROPERTY FOLDER DocFormats)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/api/CMakeLists.txt b/DocFormats/api/CMakeLists.txt
index 0e3382c..8032b33 100644
--- a/DocFormats/api/CMakeLists.txt
+++ b/DocFormats/api/CMakeLists.txt
@@ -1,3 +1,46 @@
+#
+# 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 headers objects
+###
+set(GroupHeaders
+    headers/DocFormats/DFError.h
+    headers/DocFormats/DFStorage.h
+    headers/DocFormats/DFXMLForward.h
+    headers/DocFormats/DocFormats.h
+    headers/DocFormats/Formats.h
+    headers/DocFormats/Operations.h)
+
+
+
+###
+## group api objects
+###
+set(GroupSrc
+    src/Formats.c
+    src/Operations.c)
+
+set(GroupTests
+    tests/APITests.c)
+
+
+
+###
+# Common include for all platform files
+###
 include_directories(/usr/include/libxml2)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/include)
 include_directories(../../DocFormats/3rdparty/external/w3c-tidy-html5/src)
@@ -5,7 +48,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)
-include_directories(../core/headers)
+include_directories(../headers)
 include_directories(../platform/headers)
 include_directories(../core/src/common)
 include_directories(../core/src/css)
@@ -21,26 +64,17 @@ include_directories(../filters/ooxml/src/word/formatting)
 include_directories(../filters/ooxml/src/word/lenses)
 include_directories(../unittest)
 
-set(GroupHeaders
-    headers/DocFormats/DFError.h
-    headers/DocFormats/DFStorage.h
-    headers/DocFormats/DFXMLForward.h
-    headers/DocFormats/DocFormats.h
-    headers/DocFormats/Formats.h
-    headers/DocFormats/Operations.h)
-
-set(GroupSrc
-    src/Formats.c
-    src/Operations.c)
 
-set(GroupTests
-    tests/APITests.c)
 
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(api OBJECT
     ${GroupHeaders}
     ${GroupSrc}
     ${GroupTests})
 
 source_group(headers FILES ${GroupHeaders})
-source_group(src FILES ${GroupSrc})
-source_group(tests FILES ${GroupTests})
+source_group(src     FILES ${GroupSrc})
+source_group(tests   FILES ${GroupTests})
+set_property(TARGET api PROPERTY FOLDER DocFormats)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/core/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt
index 225c7b9..927dff0 100644
--- a/DocFormats/core/CMakeLists.txt
+++ b/DocFormats/core/CMakeLists.txt
@@ -16,11 +16,6 @@
 ###
 ## group common objects incl test
 ###
-set(GroupHeaders
-    headers/DFCore.h
-    headers/DFCommon.h
-    headers/DFTypes.h)
-
 set(GroupSrcCommon
     src/common/DFBDT.c
     src/common/DFBDT.h
@@ -168,7 +163,7 @@ include_directories(src/lib)
 include_directories(src/names)
 include_directories(src/xml)
 include_directories(../unittest)
-include_directories(headers)
+include_directories(../headers)
 
 
 
@@ -190,7 +185,6 @@ add_library(core OBJECT
     ${GroupTestsNames}
     ${GroupTestsXML})
 
-source_group(headers       FILES ${GroupHeaders})
 source_group(src\\common   FILES ${GroupSrcCommon})
 source_group(src\\css      FILES ${GroupSrcCSS})
 source_group(src\\html     FILES ${GroupSrcHTML})

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/core/headers/DFCommon.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFCommon.h b/DocFormats/core/headers/DFCommon.h
deleted file mode 100644
index d6cdbd7..0000000
--- a/DocFormats/core/headers/DFCommon.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// 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.
-
-#ifndef DocFormats_DFCommon_h
-#define DocFormats_DFCommon_h
-
-#include "DFTypes.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#define strcasecmp _stricmp
-#define bzero(mem,size) memset(mem,0,size)
-#else // not WIN32
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)     /* directory */
-#endif
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/core/headers/DFCore.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFCore.h b/DocFormats/core/headers/DFCore.h
deleted file mode 100644
index 3505038..0000000
--- a/DocFormats/core/headers/DFCore.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// 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.
-
-#ifndef DocFormats_DFCore_h
-#define DocFormats_DFCore_h
-
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/core/headers/DFTypes.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFTypes.h b/DocFormats/core/headers/DFTypes.h
deleted file mode 100644
index d8fe590..0000000
--- a/DocFormats/core/headers/DFTypes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// 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.
-
-#ifndef DocFormats_DFTypes_h
-#define DocFormats_DFTypes_h
-
-#ifdef _MSC_VER
-#define ATTRIBUTE_ALIGNED(n) __declspec(align(8))
-#define ATTRIBUTE_FORMAT(archetype,index,first)
-#else
-#define ATTRIBUTE_ALIGNED(n) __attribute__((aligned (n)))
-#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
-#endif
-
-#ifdef WIN32
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/filters/latex/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/CMakeLists.txt b/DocFormats/filters/latex/CMakeLists.txt
index bdd38e3..a02e559 100644
--- a/DocFormats/filters/latex/CMakeLists.txt
+++ b/DocFormats/filters/latex/CMakeLists.txt
@@ -1,3 +1,33 @@
+#
+# 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 latex objects
+###
+set(GroupLaTeX
+    src/HTMLToLaTeX.c
+    src/HTMLToLaTeX.h)
+
+set(GroupLaTeXtest
+    tests/LaTeXTests.c)
+
+
+
+###
+# Common include for all platform files
+###
+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)
@@ -5,7 +35,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)
-include_directories(../../core/headers)
+include_directories(../../headers)
 include_directories(../../platform/headers)
 include_directories(../../core/src/common)
 include_directories(../../core/src/css)
@@ -22,12 +52,14 @@ include_directories(../../filters/ooxml/src/word/formatting)
 include_directories(../../filters/ooxml/src/word/lenses)
 include_directories(../../unittest)
 
-set(GroupLaTeX
-    src/HTMLToLaTeX.c
-    src/HTMLToLaTeX.h
-    tests/LaTeXTests.c)
 
-add_library(latex OBJECT
-    ${GroupLaTeX})
 
-source_group(\\ FILES ${GroupLaTeX})
+###
+# Prebuild library (needed to use different compile options)
+###
+add_library(latex OBJECT
+    ${GroupLaTeX}
+	${GroupLaTeXtest})
+source_group(src   FILES ${GroupLaTeX})
+source_group(tests FILES ${GroupLaTeXtest})
+set_property(TARGET latex PROPERTY FOLDER DocFormats/filters)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index e306102..fac5ee9 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -1,3 +1,39 @@
+#
+# 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 odf objects
+###
+set(GroupSrc
+    src/ODF.c
+    src/ODF.h
+    src/ODFManifest.c
+    src/ODFManifest.h
+    src/ODFPackage.c
+    src/ODFPackage.h
+    src/ODFSheet.c
+    src/ODFSheet.h)
+
+set(GroupTests
+    tests/ODFTests.c)
+
+
+
+###
+# Common include for all platform files
+###
+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)
@@ -5,7 +41,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)
-include_directories(../../core/headers)
+include_directories(../../headers)
 include_directories(../../platform/headers)
 include_directories(../../core/src/common)
 include_directories(../../core/src/css)
@@ -21,26 +57,14 @@ include_directories(../../filters/ooxml/src/word/formatting)
 include_directories(../../filters/ooxml/src/word/lenses)
 include_directories(../../unittest)
 
-set(GroupHeaders)
 
-set(GroupSrc
-    src/ODF.c
-    src/ODF.h
-    src/ODFManifest.c
-    src/ODFManifest.h
-    src/ODFPackage.c
-    src/ODFPackage.h
-    src/ODFSheet.c
-    src/ODFSheet.h)
-
-set(GroupTests
-    tests/ODFTests.c)
 
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(odf OBJECT
-    ${GroupHeaders}
     ${GroupSrc}
     ${GroupTests})
-
-source_group(headers FILES ${GroupHeaders})
-source_group(src FILES ${GroupSrc})
+source_group(src   FILES ${GroupSrc})
 source_group(tests FILES ${GroupTests})
+set_property(TARGET odf PROPERTY FOLDER DocFormats/filters)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/filters/ooxml/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/CMakeLists.txt b/DocFormats/filters/ooxml/CMakeLists.txt
index 2a27027..1c1a937 100644
--- a/DocFormats/filters/ooxml/CMakeLists.txt
+++ b/DocFormats/filters/ooxml/CMakeLists.txt
@@ -1,32 +1,31 @@
-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)
+#
+# 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.
 
-include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories(SYSTEM ../../api/headers)
-include_directories(../../core/headers)
-include_directories(../../platform/headers)
-include_directories(../../core/src/common)
-include_directories(../../core/src/css)
-include_directories(../../core/src/html)
-include_directories(../../core/src/lib)
-include_directories(../../core/src/names)
-include_directories(../../core/src/xml)
-include_directories(../../core/tests/html)
-include_directories(../../filters/latex/src)
-include_directories(../../filters/odf/src)
-include_directories(../../filters/ooxml/src/common)
-include_directories(../../filters/ooxml/src/word)
-include_directories(../../filters/ooxml/src/word/formatting)
-include_directories(../../filters/ooxml/src/word/lenses)
-include_directories(../../unittest)
 
+
+###
+## group ooxml common objects
+###
 set(GroupOOXMLCommon
     src/common/OOXMLTypedefs.h
     src/common/OPC.c
     src/common/OPC.h)
 
+
+
+###
+## group ooxml word objects
+###
 set(GroupOOXMLWord
     src/word/CSSClassNames.c
     src/word/CSSClassNames.h
@@ -61,6 +60,11 @@ set(GroupOOXMLWord
     src/word/WordWhitespace.c
     src/word/WordWhitespace.h)
 
+
+
+###
+## group ooxml word formatting objects
+###
 set(GroupOOXMLWordFormatting
     src/word/formatting/WordCommonPr.c
     src/word/formatting/WordCommonPr.h
@@ -73,6 +77,11 @@ set(GroupOOXMLWordFormatting
     src/word/formatting/WordTblPr.c
     src/word/formatting/WordTblPr.h)
 
+
+
+###
+## group ooxml word lenses objects
+###
 set(GroupOOXMLWordLenses
     src/word/lenses/WordBlockLevel.c
     src/word/lenses/WordBody.c
@@ -95,11 +104,51 @@ set(GroupOOXMLWordLenses
     src/word/lenses/WordSmartTag.c
     src/word/lenses/WordTable.c)
 
+
+
+###
+## group ooxml word test objects
+###
 set(GroupOOXMLWordTests
     tests/word/WordPlain.c
     tests/word/WordPlain.h
     tests/word/WordTests.c)
+	
+
+
+###
+# Common include for all platform files
+###
+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)
+include_directories(../../headers)
+include_directories(../../platform/headers)
+include_directories(../../core/src/common)
+include_directories(../../core/src/css)
+include_directories(../../core/src/html)
+include_directories(../../core/src/lib)
+include_directories(../../core/src/names)
+include_directories(../../core/src/xml)
+include_directories(../../core/tests/html)
+include_directories(../../filters/latex/src)
+include_directories(../../filters/odf/src)
+include_directories(../../filters/ooxml/src/common)
+include_directories(../../filters/ooxml/src/word)
+include_directories(../../filters/ooxml/src/word/formatting)
+include_directories(../../filters/ooxml/src/word/lenses)
+include_directories(../../unittest)
+
+
 
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(ooxml OBJECT
     ${GroupOOXMLCommon}
     ${GroupOOXMLWord}
@@ -107,8 +156,9 @@ add_library(ooxml OBJECT
     ${GroupOOXMLWordLenses}
     ${GroupOOXMLWordTests})
 
-source_group(src\\common FILES ${GroupOOXMLCommon})
-source_group(src\\word FILES ${GroupOOXMLWord})
+source_group(src\\common           FILES ${GroupOOXMLCommon})
+source_group(src\\word             FILES ${GroupOOXMLWord})
 source_group(src\\word\\formatting FILES ${GroupOOXMLWordFormatting})
-source_group(src\\word\\lenses FILES ${GroupOOXMLWordLenses})
-source_group(tests\\word FILES ${GroupOOXMLWordTests})
+source_group(src\\word\\lenses     FILES ${GroupOOXMLWordLenses})
+source_group(tests\\word           FILES ${GroupOOXMLWordTests})
+set_property(TARGET ooxml PROPERTY FOLDER DocFormats/filters)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/headers/DFCommon.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFCommon.h b/DocFormats/headers/DFCommon.h
new file mode 100644
index 0000000..d6cdbd7
--- /dev/null
+++ b/DocFormats/headers/DFCommon.h
@@ -0,0 +1,31 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// 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.
+
+#ifndef DocFormats_DFCommon_h
+#define DocFormats_DFCommon_h
+
+#include "DFTypes.h"
+
+#ifdef WIN32
+#define snprintf _snprintf
+#define strcasecmp _stricmp
+#define bzero(mem,size) memset(mem,0,size)
+#else // not WIN32
+#endif
+
+#ifndef S_ISDIR
+#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)     /* directory */
+#endif
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/headers/DFCore.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFCore.h b/DocFormats/headers/DFCore.h
new file mode 100644
index 0000000..3505038
--- /dev/null
+++ b/DocFormats/headers/DFCore.h
@@ -0,0 +1,19 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// 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.
+
+#ifndef DocFormats_DFCore_h
+#define DocFormats_DFCore_h
+
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/headers/DFTypes.h
----------------------------------------------------------------------
diff --git a/DocFormats/headers/DFTypes.h b/DocFormats/headers/DFTypes.h
new file mode 100644
index 0000000..d8fe590
--- /dev/null
+++ b/DocFormats/headers/DFTypes.h
@@ -0,0 +1,35 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// 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.
+
+#ifndef DocFormats_DFTypes_h
+#define DocFormats_DFTypes_h
+
+#ifdef _MSC_VER
+#define ATTRIBUTE_ALIGNED(n) __declspec(align(8))
+#define ATTRIBUTE_FORMAT(archetype,index,first)
+#else
+#define ATTRIBUTE_ALIGNED(n) __attribute__((aligned (n)))
+#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
+#endif
+
+#ifdef WIN32
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/DocFormats/unittest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/CMakeLists.txt b/DocFormats/unittest/CMakeLists.txt
index f788970..b780cd7 100644
--- a/DocFormats/unittest/CMakeLists.txt
+++ b/DocFormats/unittest/CMakeLists.txt
@@ -1,3 +1,30 @@
+#
+# 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 unittest objects
+###
+set(GroupUnitTest
+    DFUnitTest.h
+    DFUnitTest.c)
+
+
+
+###
+# Common include for all platform files
+###
+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)
@@ -5,7 +32,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)
-include_directories(../core/headers)
+include_directories(../headers)
 include_directories(../platform/headers)
 include_directories(../core/src/common)
 include_directories(../core/src/css)
@@ -21,11 +48,12 @@ include_directories(../filters/ooxml/src/word/formatting)
 include_directories(../filters/ooxml/src/word/lenses)
 include_directories(../unittest)
 
-set(GroupUnitTest
-    DFUnitTest.h
-    DFUnitTest.c)
 
+
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(unittest OBJECT
     ${GroupUnitTest})
-
-source_group(\\ FILES ${GroupUnitTest})
+source_group(src FILES ${GroupUnitTest})
+set_property(TARGET unittest PROPERTY FOLDER DocFormats)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/consumers/dfconvert/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/dfconvert/src/CMakeLists.txt b/consumers/dfconvert/src/CMakeLists.txt
index 534a8e8..7f4a13f 100644
--- a/consumers/dfconvert/src/CMakeLists.txt
+++ b/consumers/dfconvert/src/CMakeLists.txt
@@ -1,12 +1,48 @@
+#
+# 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.
+
+
+
+###
+## global definitions
+###
 cmake_minimum_required(VERSION 2.8)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+
 
+###
+## group source objects
+###
 set(SOURCES
     main.c)
 
+
+
+###
+# Common include for all platform files
+###
+include_directories()
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../../DocFormats/api/headers)
 include_directories(.)
 link_directories(${LIB_DIRS})
 
+
+
+###
+# executable (release artifact)
+###
 add_executable(dfconvert ${SOURCES})
 target_link_libraries(dfconvert DocFormats ${LIBS})
+source_group(src FILES ${SOURCES})

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/consumers/dftest/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/dftest/src/CMakeLists.txt b/consumers/dftest/src/CMakeLists.txt
index aad2d2e..3ee1022 100644
--- a/consumers/dftest/src/CMakeLists.txt
+++ b/consumers/dftest/src/CMakeLists.txt
@@ -1,17 +1,51 @@
+#
+# 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.
+
+
+
+###
+## global definitions
+###
 cmake_minimum_required(VERSION 2.8)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+
 
+###
+## group source objects
+###
 set(SOURCES
     main.c)
 
+
+
+###
+# Common include for all platform files
+###
+include_directories()
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(.)
 include_directories(SYSTEM ../../../DocFormats/api/headers)
-include_directories(../../../DocFormats/core/headers)
+include_directories(../../../DocFormats/headers)
 include_directories(../../../DocFormats/core/src/lib)
 include_directories(../../../DocFormats/unittest)
 link_directories(${LIB_DIRS})
 
+
+
+###
+# executable (release artifact)
+###
 add_executable(dftest ${SOURCES})
 target_link_libraries(dftest DocFormats ${LIBS})
-
-source_group(\\ FILES ${SOURCES})
+source_group(src FILES ${SOURCES})

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9eaaa481/consumers/dfutil/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/CMakeLists.txt b/consumers/dfutil/src/CMakeLists.txt
index 4b916dc..1fcc600 100644
--- a/consumers/dfutil/src/CMakeLists.txt
+++ b/consumers/dfutil/src/CMakeLists.txt
@@ -1,5 +1,29 @@
+#
+# 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.
+
+
+
+###
+## global definitions
+###
 cmake_minimum_required(VERSION 2.8)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+
 
+###
+## group source objects
+###
 set(SOURCES
     Commands.c
     Commands.h
@@ -8,10 +32,16 @@ set(SOURCES
     main.c
 )
 
+
+
+###
+# Common include for all platform files
+###
+include_directories()
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../../DocFormats/api/headers)
 include_directories(.)
-include_directories(../../../DocFormats/core/headers)
+include_directories(../../../DocFormats/headers)
 include_directories(../../../DocFormats/unittest)
 include_directories(../../../DocFormats/platform/headers)
 include_directories(../../../DocFormats/core/src/common)
@@ -36,7 +66,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(SOURCES ${SOURCES} FunctionTests.m StringTests.m)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
+
+
+###
+# executable (release artifact)
+###
 add_executable(dfutil ${SOURCES})
 target_link_libraries(dfutil DocFormats ${LIBS})
-
-source_group(\\ FILES ${SOURCES})
+source_group(src FILES ${SOURCES})


Mime
View raw message