Skip to content

Commit 9ac8566

Browse files
andreacasalinoandreacasalino
authored
Merge pull request #11 from andreacasalino/Refactoring
refactoring + improvements in the parsing logic
2 parents d3f2810 + 2605b63 commit 9ac8566

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2302
-2080
lines changed

‎.github/workflows/runTests.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,28 @@ jobs:
1616
include:
1717
- name: ubuntu-gcc
1818
os: ubuntu-latest
19-
compiler_opt: "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -G \"Unix Makefiles\" -DBUILD_XML_Parser_COMPILER_CHECK=ON"
19+
compiler_opt: "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
20+
build_system: '-G Ninja'
2021
- name: ubuntu-clang
2122
os: ubuntu-latest
22-
compiler_opt: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -G \"Unix Makefiles\" -DBUILD_XML_Parser_COMPILER_CHECK=ON"
23+
compiler_opt: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
24+
build_system: '-G Ninja'
2325
- name: windows-VS
2426
os: windows-latest
2527
compiler_opt: ""
28+
build_system: ""
2629

2730
runs-on: ${{ matrix.os }}
2831
steps:
2932
- name: Checkout
3033
uses: actions/checkout@v2.0.0
3134
- name: Checkout submodules
3235
run: git submodule update --init --recursive
36+
- name: Install Ninja
37+
if: matrix.build_system == '-G Ninja'
38+
uses: seanmiddleditch/gha-setup-ninja@master
3339
- name: CMake configure
34-
run: cmake -B./build -DCMAKE_INSTALL_PREFIX:STRING=./artifacts/ -DBUILD_XML_Parser_SAMPLES=OFF -DBUILD_XML_Parser_TESTS=ON -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_BUILD_TYPE:STRING=Release ${{ matrix.compiler_opt }}
40+
run: cmake -B./build -DCMAKE_INSTALL_PREFIX:STRING=./artifacts/ -DBUILD_XML_Parser_SAMPLES=OFF -DBUILD_XML_Parser_TESTS=ON -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_BUILD_TYPE:STRING=Release ${{ matrix.compiler_opt }} ${{ matrix.build_system }}
3541
- name: Build
3642
run: cmake --build ./build --config Release
3743
- name: Install

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
bin
22
build
33
.vscode
4+
TODO

‎CMakeLists.txt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,15 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/MakeLibrary.cmake)
88

99
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
1010

11-
project(XML-Parser-Core)
12-
add_subdirectory(Lib)
11+
project(XML-Parser)
12+
add_subdirectory(src)
1313

1414
option(BUILD_XML_Parser_SAMPLES "Build the samples showing how to use XML-Parser" ON)
1515
if(BUILD_XML_Parser_SAMPLES)
16-
add_subdirectory(Examples)
16+
add_subdirectory(sample)
1717
endif()
1818

1919
option(BUILD_XML_Parser_TESTS "Enable tests generation" OFF)
2020
if(BUILD_XML_Parser_TESTS)
21-
include(FetchContent)
22-
FetchContent_Declare(
23-
catch2
24-
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
25-
GIT_TAG 4ff8b27bb6bed4b8b309e56cd269b4f1fbc24e89
26-
)
27-
FetchContent_MakeAvailable(catch2)
28-
29-
add_subdirectory(Tests)
21+
add_subdirectory(test)
3022
endif()

‎Examples/Example-01.cpp‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎Examples/Example-02.cpp‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Examples/Example-04.cpp‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎Examples/XML_example_04b.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)