Return-Path: X-Original-To: apmail-corinthia-commits-archive@minotaur.apache.org Delivered-To: apmail-corinthia-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3AF479E5B for ; Wed, 17 Dec 2014 13:29:02 +0000 (UTC) Received: (qmail 35689 invoked by uid 500); 17 Dec 2014 13:28:59 -0000 Delivered-To: apmail-corinthia-commits-archive@corinthia.apache.org Received: (qmail 35675 invoked by uid 500); 17 Dec 2014 13:28:59 -0000 Mailing-List: contact commits-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list commits@corinthia.incubator.apache.org Received: (qmail 35666 invoked by uid 99); 17 Dec 2014 13:28:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Dec 2014 13:28:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 17 Dec 2014 13:28:38 +0000 Received: (qmail 33713 invoked by uid 99); 17 Dec 2014 13:28:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Dec 2014 13:28:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7A53382E4DA; Wed, 17 Dec 2014 13:28:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pmkelly@apache.org To: commits@corinthia.incubator.apache.org Date: Wed, 17 Dec 2014 13:29:35 -0000 Message-Id: <11f6589e93614f6eb3c46f9360c1d7a6@git.apache.org> In-Reply-To: <9867ce2e8a674e46a1b0776f45bb10a3@git.apache.org> References: <9867ce2e8a674e46a1b0776f45bb10a3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [85/92] [abbrv] incubator-corinthia git commit: Make file organisation in XCode/VS match dirs X-Virus-Checked: Checked by ClamAV on apache.org Make file organisation in XCode/VS match dirs CMake allows you to specify a separate hierarchy of folders/files that appear in an XCode or visual studio project. Previously we had everything in the various src directories at the root of each module. Now we have a src, test, and headers directory for each module. Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/1da91ff0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/1da91ff0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/1da91ff0 Branch: refs/heads/stable Commit: 1da91ff04ff6478723abd0e3492bdd31e41cef85 Parents: 58f167f Author: Peter Kelly Authored: Wed Dec 10 00:01:01 2014 +0700 Committer: Peter Kelly Committed: Wed Dec 10 00:01:01 2014 +0700 ---------------------------------------------------------------------- DocFormats/api/CMakeLists.txt | 18 +++++--- DocFormats/core/CMakeLists.txt | 65 ++++++++++++++++++---------- DocFormats/filters/odf/CMakeLists.txt | 15 +++++-- DocFormats/filters/odf/tests/ODFTests.c | 27 ++++++++++++ DocFormats/filters/ooxml/CMakeLists.txt | 18 +++++--- DocFormats/platform/CMakeLists.txt | 18 +++++--- consumers/dftest/src/main.c | 2 + 7 files changed, 121 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/api/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/api/CMakeLists.txt b/DocFormats/api/CMakeLists.txt index 2496dc5..970a678 100644 --- a/DocFormats/api/CMakeLists.txt +++ b/DocFormats/api/CMakeLists.txt @@ -21,18 +21,26 @@ include_directories(../filters/ooxml/src/word/formatting) include_directories(../filters/ooxml/src/word/lenses) include_directories(../unittest) -set(GroupAPI +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 + headers/DocFormats/Operations.h) + +set(GroupSrc src/Formats.c - src/Operations.c + src/Operations.c) + +set(GroupTests tests/APITests.c) add_library(api OBJECT - ${GroupAPI}) + ${GroupHeaders} + ${GroupSrc} + ${GroupTests}) -source_group(\\ FILES ${GroupAPI}) +source_group(headers FILES ${GroupHeaders}) +source_group(src FILES ${GroupSrc}) +source_group(tests FILES ${GroupTests}) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/core/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt index 3ad1636..a08c0e3 100644 --- a/DocFormats/core/CMakeLists.txt +++ b/DocFormats/core/CMakeLists.txt @@ -15,14 +15,16 @@ include_directories(src/names) include_directories(src/xml) include_directories(../unittest) -set(GroupCoreCommon +set(GroupSrcCommon src/common/DFBDT.c src/common/DFBDT.h src/common/DFClassNames.h src/common/DFTable.c src/common/DFTable.h) -set(GroupCoreCSS +set(GroupTestsCommon) + +set(GroupSrcCSS src/css/CSS.c src/css/CSS.h src/css/CSSLength.c @@ -38,10 +40,12 @@ set(GroupCoreCSS src/css/CSSStyle.c src/css/CSSStyle.h src/css/CSSSyntax.c - src/css/CSSSyntax.h + src/css/CSSSyntax.h) + +set(GroupTestsCSS tests/css/CSSTests.c) -set(GroupCoreHTML +set(GroupSrcHTML src/html/DFHTDocument.c src/html/DFHTDocument.h src/html/DFHTML.c @@ -53,10 +57,12 @@ set(GroupCoreHTML src/html/DFTidyHelper.c src/html/DFTidyHelper.h src/html/DFTidyWrapper.c - src/html/DFTidyWrapper.h + src/html/DFTidyWrapper.h) + +set(GroupTestsHTML tests/html/HTMLTests.c) -set(GroupCoreLib +set(GroupSrcLib src/lib/DFAllocator.c src/lib/DFAllocator.h src/lib/DFArray.c @@ -76,16 +82,18 @@ set(GroupCoreLib src/lib/DFString.h src/lib/DFStorage.c src/lib/DFZipFile.c - src/lib/DFZipFile.h + src/lib/DFZipFile.h) + +set(GroupTestsLib tests/lib/LibTests.c) -set(GroupCoreNames +set(GroupSrcNames src/names/DFXMLNames.c src/names/DFXMLNames.h src/names/DFXMLNamespaces.c src/names/DFXMLNamespaces.h) -set(GroupCoreXML +set(GroupSrcXML src/xml/DFDOM.c src/xml/DFDOM.h src/xml/DFMarkupCompatibility.c @@ -93,20 +101,33 @@ set(GroupCoreXML src/xml/DFNameMap.c src/xml/DFNameMap.h src/xml/DFXML.c - src/xml/DFXML.h + src/xml/DFXML.h) + +set(GroupTestsXML tests/xml/XMLTests.c) add_library(core OBJECT - ${GroupCoreCommon} - ${GroupCoreCSS} - ${GroupCoreHTML} - ${GroupCoreLib} - ${GroupCoreNames} - ${GroupCoreXML}) + ${GroupSrcCommon} + ${GroupSrcCSS} + ${GroupSrcHTML} + ${GroupSrcLib} + ${GroupSrcNames} + ${GroupSrcXML} + ${GroupTestsCommon} + ${GroupTestsCSS} + ${GroupTestsHTML} + ${GroupTestsLib} + ${GroupTestsXML}) + +source_group(src\\common FILES ${GroupSrcCommon}) +source_group(src\\css FILES ${GroupSrcCSS}) +source_group(src\\html FILES ${GroupSrcHTML}) +source_group(src\\lib FILES ${GroupSrcLib}) +source_group(src\\names FILES ${GroupSrcNames}) +source_group(src\\xml FILES ${GroupSrcXML}) -source_group(common FILES ${GroupCoreCommon}) -source_group(css FILES ${GroupCoreCSS}) -source_group(html FILES ${GroupCoreHTML}) -source_group(lib FILES ${GroupCoreLib}) -source_group(names FILES ${GroupCoreNames}) -source_group(xml FILES ${GroupCoreXML}) +source_group(tests\\common FILES ${GroupTestsCommon}) +source_group(tests\\css FILES ${GroupTestsCSS}) +source_group(tests\\html FILES ${GroupTestsHTML}) +source_group(tests\\lib FILES ${GroupTestsLib}) +source_group(tests\\xml FILES ${GroupTestsXML}) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/filters/odf/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt index 284f178..411d713 100644 --- a/DocFormats/filters/odf/CMakeLists.txt +++ b/DocFormats/filters/odf/CMakeLists.txt @@ -21,7 +21,9 @@ include_directories(../../filters/ooxml/src/word/formatting) include_directories(../../filters/ooxml/src/word/lenses) include_directories(../../unittest) -set(GroupODF +set(GroupHeaders) + +set(GroupSrc src/ODF.c src/ODF.h src/ODFManifest.c @@ -31,7 +33,14 @@ set(GroupODF src/ODFSheet.c src/ODFSheet.h) +set(GroupTests + tests/ODFTests.c) + add_library(odf OBJECT - ${GroupODF}) + ${GroupHeaders} + ${GroupSrc} + ${GroupTests}) -source_group(\\ FILES ${GroupODF}) +source_group(headers FILES ${GroupHeaders}) +source_group(src FILES ${GroupSrc}) +source_group(tests FILES ${GroupTests}) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/filters/odf/tests/ODFTests.c ---------------------------------------------------------------------- diff --git a/DocFormats/filters/odf/tests/ODFTests.c b/DocFormats/filters/odf/tests/ODFTests.c new file mode 100644 index 0000000..6fb013a --- /dev/null +++ b/DocFormats/filters/odf/tests/ODFTests.c @@ -0,0 +1,27 @@ +// 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. + +#include "DFUnitTest.h" +#include + +static void test_sample(void) +{ +} + +TestGroup ODFTests = { + "odf", { + { "sample", test_sample }, + { NULL, NULL } + } +}; http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/filters/ooxml/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/filters/ooxml/CMakeLists.txt b/DocFormats/filters/ooxml/CMakeLists.txt index d970283..37dc8b1 100644 --- a/DocFormats/filters/ooxml/CMakeLists.txt +++ b/DocFormats/filters/ooxml/CMakeLists.txt @@ -58,8 +58,7 @@ set(GroupOOXMLWord src/word/WordTheme.c src/word/WordTheme.h src/word/WordWhitespace.c - src/word/WordWhitespace.h - tests/word/WordTests.c) + src/word/WordWhitespace.h) set(GroupOOXMLWordFormatting src/word/formatting/WordCommonPr.c @@ -95,13 +94,18 @@ set(GroupOOXMLWordLenses src/word/lenses/WordSmartTag.c src/word/lenses/WordTable.c) +set(GroupOOXMLWordTests + tests/word/WordTests.c) + add_library(ooxml OBJECT ${GroupOOXMLCommon} ${GroupOOXMLWord} ${GroupOOXMLWordFormatting} - ${GroupOOXMLWordLenses}) + ${GroupOOXMLWordLenses} + ${GroupOOXMLWordTests}) -source_group(common FILES ${GroupOOXMLCommon}) -source_group(word FILES ${GroupOOXMLWord}) -source_group(word\\formatting FILES ${GroupOOXMLWordFormatting}) -source_group(word\\lenses FILES ${GroupOOXMLWordLenses}) +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}) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/DocFormats/platform/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/DocFormats/platform/CMakeLists.txt b/DocFormats/platform/CMakeLists.txt index d6ebfc2..1b8101f 100644 --- a/DocFormats/platform/CMakeLists.txt +++ b/DocFormats/platform/CMakeLists.txt @@ -21,15 +21,23 @@ include_directories(../filters/ooxml/src/word/formatting) include_directories(../filters/ooxml/src/word/lenses) include_directories(../unittest) -set(GroupPlatform - headers/DFPlatform.h +set(GroupHeaders + headers/DFPlatform.h) + +set(GroupSrc src/Apple.c src/Linux.c src/Unix.c - src/Win32.c + src/Win32.c) + +set(GroupTests tests/PlatformTests.c) add_library(platform OBJECT - ${GroupPlatform}) + ${GroupHeaders} + ${GroupSrc} + ${GroupTests}) -source_group(\\ FILES ${GroupPlatform}) +source_group(headers FILES ${GroupHeaders}) +source_group(src FILES ${GroupSrc}) +source_group(tests FILES ${GroupTests}) http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1da91ff0/consumers/dftest/src/main.c ---------------------------------------------------------------------- diff --git a/consumers/dftest/src/main.c b/consumers/dftest/src/main.c index 166a048..590eb23 100644 --- a/consumers/dftest/src/main.c +++ b/consumers/dftest/src/main.c @@ -21,6 +21,7 @@ extern TestGroup HTMLTests; extern TestGroup LibTests; extern TestGroup XMLTests; extern TestGroup LaTeXTests; +extern TestGroup ODFTests; extern TestGroup WordTests; extern TestGroup PlatformTests; @@ -31,6 +32,7 @@ TestGroup *groups[] = { &LibTests, &XMLTests, &LaTeXTests, + &ODFTests, &WordTests, &PlatformTests, NULL