restructure build system

This commit is contained in:
Thomas Fussell 2015-11-01 12:31:29 -05:00
parent 35953661e8
commit fef68e460f
55 changed files with 152 additions and 276 deletions

View File

@ -1,14 +0,0 @@
#!/bin/sh
for var in "$@"; do
split=(${var/=/ })
export ${split[0]}=${split[1]}
done
if [ "$USE_CMAKE" = 1 ]; then
cd cmake
else
cd genie
fi
./build-linux.sh $1

View File

@ -1,14 +0,0 @@
#!/bin/sh
for var in "$@"; do
split=(${var/=/ })
export ${split[0]}=${split[1]}
done
if [ "$USE_CMAKE" = 1 ]; then
cd cmake
else
cd genie
fi
./build-osx.sh $1

View File

@ -1,24 +0,0 @@
project(xlnt.test)
include_directories(../../../include)
include_directories(../../../source)
include_directories(../../../third-party/pugixml/src)
include_directories(../../../third-party/cxxtest)
add_executable(xlnt.test ../../../tests/runner-autogen.cpp)
target_link_libraries(xlnt.test xlnt)
add_custom_target (test-runner
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../generate-tests.sh
COMMENT "Generating test runner tests/runner-autogen.cpp"
)
add_dependencies(xlnt.test test-runner)
add_custom_command(
TARGET xlnt.test
POST_BUILD
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/xlnt.test
VERBATIM
)

View File

@ -1,12 +0,0 @@
project(xlnt)
include_directories(../../../include)
include_directories(../../../source)
include_directories(../../../third-party/miniz)
include_directories(../../../third-party/pugixml/src)
FILE(GLOB SOURCES ../../../source/*/* ../../../include/xlnt/*/*.hpp ../../../include/xlnt/*.hpp)
FILE(GLOB DETAIL_SOURCES ../../../source/detail/*.cpp)
add_library(xlnt STATIC ${SOURCES} ${DETAIL_SOURCES} ../../../third-party/pugixml/src/pugixml.cpp ../../../third-party/miniz/miniz.c)

View File

@ -1,23 +0,0 @@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# use included genie if it isn't found in PATH
GENIE_BIN=$(which genie)
if [ -z "$GENIE_BIN" -o ! -x "$GENIE_BIN" ]; then
GENIE_BIN=$(pwd)"/genie-linux"
fi
# default
ACTION="gmake"
if [ ! -z "$1" ]; then
ACTION="$1"
fi
if [[ "$ACTION" = "clean" ]]; then
rm -rf gmake
else
$GENIE_BIN $ACTION > /dev/null
if [[ "$ACTION" = "gmake" ]]; then
cd gmake
make
fi
fi

View File

@ -1,24 +0,0 @@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# use included genie if it isn't found in PATH
GENIE_BIN=$(which genie)
if [ -z "$GENIE_BIN" -o ! -x "$GENIE_BIN" ]; then
GENIE_BIN=$(pwd)"/genie-osx"
fi
# default
ACTION="xcode4"
if [ ! -z "$1" ]; then
ACTION="$1"
fi
if [[ "$ACTION" = "clean" ]]; then
rm -rf xcode4
rm -rf gmake
else
$GENIE_BIN $ACTION > /dev/null
if [[ "$ACTION" = "xcode4" ]]; then
cd xcode4
xcodebuild -workspace xlnt.xcworkspace -scheme xlnt.test
fi
fi

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,88 +0,0 @@
solution "xlnt"
configurations { "Debug", "Release" }
platforms { "x64" }
location ("./" .. _ACTION)
configuration "Debug"
flags { "Symbols" }
project "xlnt.test"
kind "ConsoleApp"
language "C++"
targetname "xlnt.test"
targetdir "../../bin"
includedirs {
"../../include",
"../../third-party/cxxtest",
"../../third-party/miniz",
"../../third-party/pugixml/src"
}
files {
"../../tests/*.hpp",
"../../tests/runner-autogen.cpp"
}
links { "xlnt", "miniz" }
prebuildcommands { "../../generate-tests.sh" }
flags { "Unicode" }
configuration "windows"
defines { "WIN32" }
links { "Shlwapi" }
configuration "linux"
buildoptions {
"-std=c++1y"
}
configuration "macos"
buildoptions {
"-std=c++14"
}
project "xlnt"
kind "StaticLib"
language "C++"
targetdir "../../lib/"
includedirs {
"../../include",
"../../source",
"../../third-party/miniz",
"../../third-party/pugixml/src"
}
files {
"../../source/**.cpp",
"../../source/**.hpp",
"../../include/xlnt/**.hpp",
"../../third-party/pugixml/src/pugixml.cpp"
}
flags { "Unicode" }
configuration "Debug"
flags { "FatalWarnings" }
configuration "windows"
defines {
"WIN32",
"_CRT_SECURE_NO_WARNINGS"
}
configuration "linux"
buildoptions {
"-std=c++1y"
}
configuration "macos"
buildoptions {
"-std=c++14"
}
project "miniz"
kind "StaticLib"
language "C"
targetdir "../../lib/"
includedirs {
"../../third-party/miniz",
}
files {
"../../third-party/miniz/miniz.c"
}
flags { "Unicode" }
configuration "Debug"
flags { "FatalWarnings" }
configuration "windows"
defines {
"WIN32",
"_CRT_SECURE_NO_WARNINGS"
}

View File

@ -17,16 +17,16 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
endif() endif()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../../../bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin)
foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../../../bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/../bin)
endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES) endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
add_subdirectory(xlnt) include(xlnt.cmake)
add_subdirectory(xlnt.test) include(xlnt.test.cmake)

View File

@ -4,4 +4,4 @@ import os
import subprocess import subprocess
os.chdir(os.path.dirname(os.path.abspath(__file__))) os.chdir(os.path.dirname(os.path.abspath(__file__)))
subprocess.call(['sh', 'build-osx.sh', 'USE_CMAKE=1']) subprocess.call(['sh', 'build-osx.sh'])

View File

@ -5,7 +5,7 @@ if [ "$ACTION" = "clean" ]; then
exit 0 exit 0
fi fi
mkdir build mkdir ../build
cd build cd ../build
cmake -G "Unix Makefiles" .. cmake -G "Unix Makefiles" ../cmake
make make

BIN
cmake/clang-format-osx-6e0ab6e Executable file

Binary file not shown.

View File

@ -4,7 +4,9 @@ import os
import shutil import shutil
os.chdir(os.path.dirname(os.path.abspath(__file__))) os.chdir(os.path.dirname(os.path.abspath(__file__)))
dirs = ['../bin', '../lib', './cmake/build', './genie/xcode4']
dirs = ['../bin', '../lib', '../build']
for dir in dirs: for dir in dirs:
if os.path.isdir(dir): shutil.rmtree(dir) if os.path.isdir(dir): shutil.rmtree(dir)

49
cmake/xlnt.cmake Normal file
View File

@ -0,0 +1,49 @@
project(xlnt)
include_directories(../include)
include_directories(../source)
include_directories(../third-party/miniz)
include_directories(../third-party/pugixml/src)
FILE(GLOB ROOT_HEADERS ../include/xlnt/*.hpp)
FILE(GLOB CELL_HEADERS ../include/xlnt/cell/*.hpp)
FILE(GLOB CHARTS_HEADERS ../include/xlnt/charts/*.hpp)
FILE(GLOB CHARTSHEET_HEADERS ../include/xlnt/chartsheet/*.hpp)
FILE(GLOB COMMON_HEADERS ../include/xlnt/common/*.hpp)
FILE(GLOB DRAWING_HEADERS ../include/xlnt/drawing/*.hpp)
FILE(GLOB FORUMULA_HEADERS ../include/xlnt/formula/*.hpp)
FILE(GLOB PACKAGING_HEADERS ../include/xlnt/packaging/*.hpp)
FILE(GLOB SERIALIZATION_HEADERS ../include/xlnt/serialization/*.hpp)
FILE(GLOB STYLES_HEADERS ../include/xlnt/styles/*.hpp)
FILE(GLOB WORKBOOK_HEADERS ../include/xlnt/workbook/*.hpp)
FILE(GLOB WORKSHEET_HEADERS ../include/xlnt/worksheet/*.hpp)
FILE(GLOB DETAIL_HEADERS ../source/detail/*.hpp)
FILE(GLOB DETAIL_SOURCES ../source/detail/*.cpp)
FILE(GLOB CELL_SOURCES ../source/cell/*.cpp)
FILE(GLOB CHARTS_SOURCES ../source/charts/*.cpp)
FILE(GLOB CHARTSHEET_SOURCES ../source/chartsheet/*.cpp)
FILE(GLOB COMMON_SOURCES ../source/common/*.cpp)
FILE(GLOB DRAWING_SOURCES ../source/drawing/*.cpp)
FILE(GLOB FORUMULA_SOURCES ../source/formula/*.cpp)
FILE(GLOB PACKAGING_SOURCES ../source/packaging/*.cpp)
FILE(GLOB SERIALIZATION_SOURCES ../source/serialization/*.cpp)
FILE(GLOB STYLES_SOURCES ../source/styles/*.cpp)
FILE(GLOB WORKBOOK_SOURCES ../source/workbook/*.cpp)
FILE(GLOB WORKSHEET_SOURCES ../source/worksheet/*.cpp)
add_library(xlnt STATIC ${DETAIL_HEADERS} ${CELL_HEADERS} ${CHARTS_HEADERS} ${CHARTSHEET_HEADERS} ${COMMON_HEADERS} ${DRAWING_HEADERS} ${FORMULA_HEADERS} ${PACKAGING_HEADERS} ${SERIALIZATION_HEADERS} ${STYLES_HEADERS} ${WORKBOOK_HEADERS} ${WORKSHEET_HEADERS} ${DETAIL_SOURCES} ${CELL_SOURCES} ${CHARTS_SOURCES} ${CHARTSHEET_SOURCES} ${COMMON_SOURCES} ${DRAWING_SOURCES} ${FORMULA_SOURCES} ${PACKAGING_SOURCES} ${SERIALIZATION_SOURCES} ${STYLES_SOURCES} ${WORKBOOK_SOURCES} ${WORKSHEET_SOURCES} ../third-party/pugixml/src/pugixml.cpp ../third-party/miniz/miniz.c)
source_group(detail FILES ${DETAIL_HEADERS} ${DETAIL_SOURCES})
source_group(cell FILES ${CELL_HEADERS} ${CELL_SOURCES})
source_group(charts FILES ${CHARTS_HEADERS} ${CHARTS_SOURCES})
source_group(chartsheet FILES ${CHARTSHEET_HEADERS} ${CHARTSHEET_SOURCES})
source_group(common FILES ${COMMON_HEADERS} ${COMMON_SOURCES})
source_group(drawing FILES ${DRAWING_HEADERS} ${DRAWING_SOURCES})
source_group(formula FILES ${FORUMULA_HEADERS} ${FORUMULA_SOURCES})
source_group(packaging FILES ${PACKAGING_HEADERS} ${PACKAGING_SOURCES})
source_group(serialization FILES ${SERIALIZATION_HEADERS} ${SERIALIZATION_SOURCES})
source_group(styles FILES ${STYLES_HEADERS} ${STYLES_SOURCES})
source_group(workbook FILES ${WORKBOOK_HEADERS} ${WORKBOOK_SOURCES})
source_group(worksheet FILES ${WORKSHEET_HEADERS} ${WORKSHEET_SOURCES})
source_group(third-party FILES ../third-party/pugixml/src/pugixml.cpp ../third-party/miniz/miniz.c)

24
cmake/xlnt.test.cmake Normal file
View File

@ -0,0 +1,24 @@
project(xlnt.test)
include_directories(../include)
include_directories(../source)
include_directories(../third-party/pugixml/src)
include_directories(../third-party/cxxtest)
add_executable(xlnt.test ../tests/runner-autogen.cpp)
target_link_libraries(xlnt.test xlnt)
add_custom_target (test-runner
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generate-tests.sh
COMMENT "Generating test runner tests/runner-autogen.cpp"
)
add_dependencies(xlnt.test test-runner)
add_custom_command(
TARGET xlnt.test
POST_BUILD
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../bin/xlnt.test
VERBATIM
)

View File

@ -1,5 +0,0 @@
#include <xlnt/s11n/comment_serializer.hpp>
namespace {
} // namespace xlnt

View File

@ -0,0 +1,5 @@
#include <xlnt/serialization/comment_serializer.hpp>
namespace {
} // namespace xlnt

View File

@ -1,18 +1,18 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <xlnt/s11n/excel_serializer.hpp> #include <xlnt/serialization/excel_serializer.hpp>
#include <xlnt/common/exceptions.hpp> #include <xlnt/common/exceptions.hpp>
#include <xlnt/s11n/manifest_serializer.hpp> #include <xlnt/serialization/manifest_serializer.hpp>
#include <xlnt/s11n/relationship_serializer.hpp> #include <xlnt/serialization/relationship_serializer.hpp>
#include <xlnt/s11n/shared_strings_serializer.hpp> #include <xlnt/serialization/shared_strings_serializer.hpp>
#include <xlnt/s11n/style_serializer.hpp> #include <xlnt/serialization/style_serializer.hpp>
#include <xlnt/s11n/theme_serializer.hpp> #include <xlnt/serialization/theme_serializer.hpp>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include <xlnt/s11n/worksheet_serializer.hpp> #include <xlnt/serialization/worksheet_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include <xlnt/workbook/document_properties.hpp> #include <xlnt/workbook/document_properties.hpp>
#include <xlnt/workbook/manifest.hpp> #include <xlnt/workbook/manifest.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>

View File

@ -1,6 +1,6 @@
#include <xlnt/s11n/manifest_serializer.hpp> #include <xlnt/serialization/manifest_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/workbook/manifest.hpp> #include <xlnt/workbook/manifest.hpp>
#include "detail/constants.hpp" #include "detail/constants.hpp"

View File

@ -1,9 +1,9 @@
#include <xlnt/s11n/relationship_serializer.hpp> #include <xlnt/serialization/relationship_serializer.hpp>
#include <xlnt/common/relationship.hpp> #include <xlnt/common/relationship.hpp>
#include <xlnt/common/zip_file.hpp> #include <xlnt/common/zip_file.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include "detail/constants.hpp" #include "detail/constants.hpp"

View File

@ -1,6 +1,6 @@
#include <xlnt/s11n/shared_strings_serializer.hpp> #include <xlnt/serialization/shared_strings_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
namespace xlnt { namespace xlnt {

View File

@ -1,6 +1,6 @@
#include <xlnt/s11n/style_serializer.hpp> #include <xlnt/serialization/style_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/styles/alignment.hpp> #include <xlnt/styles/alignment.hpp>
#include <xlnt/styles/border.hpp> #include <xlnt/styles/border.hpp>
#include <xlnt/styles/fill.hpp> #include <xlnt/styles/fill.hpp>

View File

@ -1,6 +1,6 @@
#include <xlnt/s11n/theme_serializer.hpp> #include <xlnt/serialization/theme_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <detail/constants.hpp> #include <detail/constants.hpp>

View File

@ -1,11 +1,11 @@
#include <algorithm> #include <algorithm>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include <xlnt/common/datetime.hpp> #include <xlnt/common/datetime.hpp>
#include <xlnt/common/exceptions.hpp> #include <xlnt/common/exceptions.hpp>
#include <xlnt/common/relationship.hpp> #include <xlnt/common/relationship.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/workbook/document_properties.hpp> #include <xlnt/workbook/document_properties.hpp>
#include <xlnt/workbook/manifest.hpp> #include <xlnt/workbook/manifest.hpp>
#include <xlnt/workbook/named_range.hpp> #include <xlnt/workbook/named_range.hpp>

View File

@ -1,11 +1,11 @@
#include <cmath> #include <cmath>
#include <sstream> #include <sstream>
#include <xlnt/s11n/worksheet_serializer.hpp> #include <xlnt/serialization/worksheet_serializer.hpp>
#include <xlnt/cell/cell.hpp> #include <xlnt/cell/cell.hpp>
#include <xlnt/cell/cell_reference.hpp> #include <xlnt/cell/cell_reference.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>
#include <xlnt/worksheet/column_properties.hpp> #include <xlnt/worksheet/column_properties.hpp>
#include <xlnt/worksheet/range.hpp> #include <xlnt/worksheet/range.hpp>

View File

@ -1,6 +1,6 @@
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include <detail/xml_document_impl.hpp> #include <detail/xml_document_impl.hpp>
#include <detail/xml_node_impl.hpp> #include <detail/xml_node_impl.hpp>

View File

@ -1,5 +1,5 @@
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include <detail/xml_node_impl.hpp> #include <detail/xml_node_impl.hpp>

View File

@ -1,8 +1,8 @@
#include <sstream> #include <sstream>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include "detail/include_pugixml.hpp" #include "detail/include_pugixml.hpp"
#include "detail/xml_document_impl.hpp" #include "detail/xml_document_impl.hpp"

View File

@ -8,7 +8,7 @@
#include <xlnt/common/relationship.hpp> #include <xlnt/common/relationship.hpp>
#include <xlnt/common/zip_file.hpp> #include <xlnt/common/zip_file.hpp>
#include <xlnt/drawing/drawing.hpp> #include <xlnt/drawing/drawing.hpp>
#include <xlnt/s11n/excel_serializer.hpp> #include <xlnt/serialization/excel_serializer.hpp>
#include <xlnt/styles/alignment.hpp> #include <xlnt/styles/alignment.hpp>
#include <xlnt/styles/border.hpp> #include <xlnt/styles/border.hpp>
#include <xlnt/styles/fill.hpp> #include <xlnt/styles/fill.hpp>

View File

@ -2,9 +2,9 @@
#include <sstream> #include <sstream>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include <xlnt/s11n/xml_node.hpp> #include <xlnt/serialization/xml_node.hpp>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include "path_helper.hpp" #include "path_helper.hpp"

View File

@ -3,8 +3,8 @@
#include <iostream> #include <iostream>
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include <xlnt/s11n/xml_document.hpp> #include <xlnt/serialization/xml_document.hpp>
#include "helpers/path_helper.hpp" #include "helpers/path_helper.hpp"
#include "helpers/helper.hpp" #include "helpers/helper.hpp"

View File

@ -5,11 +5,11 @@
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/excel_serializer.hpp> #include <xlnt/serialization/excel_serializer.hpp>
#include <xlnt/s11n/manifest_serializer.hpp> #include <xlnt/serialization/manifest_serializer.hpp>
#include <xlnt/s11n/relationship_serializer.hpp> #include <xlnt/serialization/relationship_serializer.hpp>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include <xlnt/s11n/xml_serializer.hpp> #include <xlnt/serialization/xml_serializer.hpp>
#include <xlnt/workbook/manifest.hpp> #include <xlnt/workbook/manifest.hpp>
#include "helpers/path_helper.hpp" #include "helpers/path_helper.hpp"

View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/style_serializer.hpp> #include <xlnt/serialization/style_serializer.hpp>
class test_style_writer : public CxxTest::TestSuite class test_style_writer : public CxxTest::TestSuite
{ {

View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/theme_serializer.hpp> #include <xlnt/serialization/theme_serializer.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>
#include "helpers/path_helper.hpp" #include "helpers/path_helper.hpp"

View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/worksheet_serializer.hpp> #include <xlnt/serialization/worksheet_serializer.hpp>
#include <xlnt/worksheet/worksheet.hpp> #include <xlnt/worksheet/worksheet.hpp>
class test_worksheet : public CxxTest::TestSuite class test_worksheet : public CxxTest::TestSuite

View File

@ -3,10 +3,10 @@
#include <iostream> #include <iostream>
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/s11n/relationship_serializer.hpp> #include <xlnt/serialization/relationship_serializer.hpp>
#include <xlnt/s11n/shared_strings_serializer.hpp> #include <xlnt/serialization/shared_strings_serializer.hpp>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include <xlnt/s11n/worksheet_serializer.hpp> #include <xlnt/serialization/worksheet_serializer.hpp>
#include <xlnt/workbook/workbook.hpp> #include <xlnt/workbook/workbook.hpp>
#include "helpers/temporary_file.hpp" #include "helpers/temporary_file.hpp"

View File

@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
#include <xlnt/common/exceptions.hpp> #include <xlnt/common/exceptions.hpp>
#include <xlnt/s11n/workbook_serializer.hpp> #include <xlnt/serialization/workbook_serializer.hpp>
#include "helpers/path_helper.hpp" #include "helpers/path_helper.hpp"