From c51476265d33b127d2cae3f012fe7e206c25f9f6 Mon Sep 17 00:00:00 2001
From: Amir Bawab <amirbawab@gmail.com>
Date: Sun, 10 Sep 2017 21:40:51 -0400
Subject: [PATCH] Enhanced structure

---
 .gitmodules           |  2 +-
 CMakeLists.txt        |  6 +++---
 EasyCC-CPP            |  1 -
 docs/index.md         | 14 +++++++-------
 thirdparty/EasyCC-CPP |  1 +
 5 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 160000 EasyCC-CPP
 create mode 160000 thirdparty/EasyCC-CPP

diff --git a/.gitmodules b/.gitmodules
index 738e23b..6a72790 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "EasyCC-CPP"]
-	path = EasyCC-CPP
+	path = thirdparty/EasyCC-CPP
 	url = https://github.com/amirbawab/EasyCC-CPP
     branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd6fbbe..d91d002 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(BASH_PROJECT_DEV_EXEC "bashcdev")
 set(BASH_PROJECT_PRO_EXEC "bashc")
 
 # Add easycc CMakeLists.txt to build it automatically
-add_subdirectory(EasyCC-CPP)
+add_subdirectory(thirdparty/EasyCC-CPP)
 
 # Compile with -std=c++11 flag
 add_compile_options(-std=c++11)
@@ -15,8 +15,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 # Include bashc header files (e.g. same as -I flag)
 include_directories(include)
-include_directories(EasyCC-CPP/include)
-include_directories(EasyCC-CPP/rapidjson/include)
+include_directories(thirdparty/EasyCC-CPP/include)
+include_directories(thirdparty/EasyCC-CPP/rapidjson/include)
 
 # Store cpp files in a variable
 file(GLOB_RECURSE BASH_PROJECT_SOURCE_FILES src/*/*.cpp)
diff --git a/EasyCC-CPP b/EasyCC-CPP
deleted file mode 160000
index 6ac05e9..0000000
--- a/EasyCC-CPP
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6ac05e908e9a4fa63e2a30a6914dbd9fbf9cabe0
diff --git a/docs/index.md b/docs/index.md
index 2de8aad..19252fd 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,9 +1,9 @@
 # <img src="logo.png" width="200"> [![Build Status](https://travis-ci.org/amirbawab/BashClass.svg?branch=master)](https://travis-ci.org/amirbawab/BashClass)
 
-**Version**: 1.1.0
+**Version**: 1.2.0
 
 ## Github
-Link: [Release 1.1.0](https://github.com/amirbawab/BashClass/releases/tag/v1.1.0)
+Link: [Release 1.2.0](https://github.com/amirbawab/BashClass/releases/tag/v1.2.0)
 
 ## About
 BashClass is a programming language supporting Object Oriented Programming, and compiles to BASH 4.4. Class members written in BashClass are converted to an associative array with unique indices in the generated BASH script. 
@@ -23,11 +23,11 @@ BashClass uses [EasyCC-C++](http://amirbawab.github.io/EasyCC-CPP) library which
 * Run cmake:
 ```bash
 cmake . \
-    -DSYNTAX_ERRORS="resources/src/syntax_errors.json"\
-    -DSYNTAX_GRAMMAR="resources/src/grammar.json"\
-    -DLEXICAL_ERRORS="resources/src/lexical_errors.json"\
-    -DLEXICAL_CONFIG="resources/src/lexical_config.json"\
-    -DLEXICAL_STATE_MACHINE="resources/src/lexical_graph.json"
+    -DSYNTAX_ERRORS="${PWD}/resources/src/syntax_errors.json"\
+    -DSYNTAX_GRAMMAR="${PWD}/resources/src/grammar.json"\
+    -DLEXICAL_ERRORS="${PWD}/resources/src/lexical_errors.json"\
+    -DLEXICAL_CONFIG="${PWD}/resources/src/lexical_config.json"\
+    -DLEXICAL_STATE_MACHINE="${PWD}/resources/src/lexical_graph.json"
 ```
 * Run make (developer mode):
 ```bash
diff --git a/thirdparty/EasyCC-CPP b/thirdparty/EasyCC-CPP
new file mode 160000
index 0000000..2bba922
--- /dev/null
+++ b/thirdparty/EasyCC-CPP
@@ -0,0 +1 @@
+Subproject commit 2bba922715d442ad250997bed6116d98fa1418bc