Skip to content

Commit

Permalink
Enhanced structure
Browse files Browse the repository at this point in the history
  • Loading branch information
amirbawab committed Sep 11, 2017
1 parent 1ca2ba3 commit c514762
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "EasyCC-CPP"]
path = EasyCC-CPP
path = thirdparty/EasyCC-CPP
url = https://github.com/amirbawab/EasyCC-CPP
branch = master
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
1 change: 0 additions & 1 deletion EasyCC-CPP
Submodule EasyCC-CPP deleted from 6ac05e
14 changes: 7 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions thirdparty/EasyCC-CPP
Submodule EasyCC-CPP added at 2bba92

0 comments on commit c514762

Please sign in to comment.