Merge pull request #9 from wsjcpp/version-0.0.2

Version 0.0.2
wsjcpp · Sep 14, 2020 · 23daa6c · 23daa6c
2 parents 45afdb5 + b7f71f2
commit 23daa6c
Show file tree

Hide file tree

Showing 20 changed files with 1,535 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,10 @@ tmp/*
 wsjcpp-obj-tree
 .logs/*
 .vscode/*
+some.wsjcpp-obj-tree
+some2.wsjcpp-obj-tree
+random.wsjcpp-obj-tree
+unit-tests.wsjcpp/data/tmp/*
 
 # Prerequisites
 *.d

diff --git a/.travis.yml b/.travis.yml
@@ -14,10 +14,5 @@ addons:
     - g++
     - pkg-config
 
-# Build steps
 script:
-  - ./build_simple.sh
-  - cd unit-tests.wsjcpp
-  - ./build_simple.sh
-  - ./unit-tests
-
+  - ./run_travis.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,11 +9,16 @@ set(EXECUTABLE_OUTPUT_PATH ${wsjcpp-obj-tree_SOURCE_DIR})
 
 # include header dirs
 list (APPEND WSJCPP_INCLUDE_DIRS "src")
+list (APPEND WSJCPP_INCLUDE_DIRS "src/examples")
 
 list (APPEND WSJCPP_SOURCES "./src/wsjcpp_obj_tree.h")
 list (APPEND WSJCPP_SOURCES "./src/wsjcpp_obj_tree.cpp")
 list (APPEND WSJCPP_SOURCES "src/main.cpp")
 
+# examples
+list (APPEND WSJCPP_SOURCES "./src/examples/wsjcpp_obj_tree_node_building.h")
+list (APPEND WSJCPP_SOURCES "./src/examples/wsjcpp_obj_tree_node_building.cpp")
+
 #### BEGIN_WSJCPP_APPEND
 #### END_WSJCPP_APPEND