fix: merge conflict.

Signed-off-by: divy9881 <[email protected]>

Author: divy9881

.gitignore

@@ -28,6 +28,7 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]ib/
 # [Ll]og/
 [Ll]ogs/
 

.travis.yml

@@ -0,0 +1,6 @@
+language: cpp
+
+script:
+  - make
+  - make library
+  - make clean

CMakeLists.txt

@@ -0,0 +1,10 @@
+project(casbin)
+
+cmake_minimum_required(VERSION 3.16)
+
+set(CMAKE_CXX_STANDARD 11)
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+
+FILE(GLOB_RECURSE SC_FILES "casbin/*.cpp" "casbin/*.h")
+
+add_library(casbin ${SC_FILES})

README.md

@@ -2,6 +2,7 @@ Casbin-CPP
 ====
 
 [![Build Status](https://dev.azure.com/Casbin/casbin/_apis/build/status/casbin.casbin-cpp?branchName=master)](https://dev.azure.com/Casbin/casbin/_build?definitionId=2&branchName=master)
+[![Build Status](https://travis-ci.org/casbin/casbin-cpp.svg?branch=master)](https://travis-ci.org/casbin/casbin-cpp)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/casbin/casbin-cpp)](https://github.com/casbin/casbin-cpp/releases/latest)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/casbin/lobby)
@@ -12,7 +13,7 @@ Casbin-CPP
 Operating Systems | Availability status
 ----------------- | -------------------
 Windows (VS C++)  | :heavy_check_mark: Available
-Linux and MacOS   | :wrench: Under-Development
+Linux and MacOS   | :heavy_check_mark: Available
 
 
 ![casbin Logo](casbin-logo.png)
@@ -107,6 +108,27 @@ You can also use the online editor (https://casbin.org/editor/) to write your Ca
 
 https://casbin.org/docs/en/tutorials
 
+## Installation and Set-Up
+
+#### Windows (Microsoft Visual Studio 2019)
+- `Clone` the repository in your target client project
+- Open the project solution and `build` the solution
+- To use the `casbin-cpp` project in your client project add the path to the static library `casbin.lib` file to your client project properties under `VC++ Directories` > `Library Directories` and also add the path of `casbin` directory to your client project properties under `VC++ Directories` > `Include Directories`
+- Add the static library file name `casbin.lib` to the properties under `Linker` > `Input` > `Additional Dependencies`
+
+#### Unix
+- `Clone` the repository in your target client project
+- Change the current working directory to the `casbin-cpp` directory and build the library through following commands:
+    ```shell
+        $ make
+        $ make library
+    ```
+- To get rid of intermediate files generated during building of library:
+    ```shell
+        $ make clean
+    ```
+- Now, you can use the file present in `lib` directory, created through `archiver`, as a static library
+
 ## Get started
 
 1. New a Casbin enforcer with a model file and a policy file:

casbin/casbin.vcxproj

@@ -154,7 +154,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="config\config.cpp" />
-    <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="duktape\duktape.cpp" />
     <ClCompile Include="effect\default_effector.cpp" />
     <ClCompile Include="enforcer.cpp" />

casbin/casbin.vcxproj.filters

@@ -87,9 +87,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

lgtm.yml

@@ -1,9 +1,21 @@
 #Define C/C++ compiler variables
 CXX := g++
+<<<<<<< HEAD
+=======
+AR := ar
+>>>>>>> upstream/master
 
 #Define compiler flags
 OBJ_FLAG := -c
 FILE_FLAG :=  -o
+<<<<<<< HEAD
+=======
+STD_FLAG := -std=c++11
+
+#Define archive flags
+AR_FLAG := crv
+AR_NAME := casbin.a
+>>>>>>> upstream/master
 
 #Define directory variables
 SRC_DIR := casbin
@@ -16,12 +28,41 @@ OBJ_EXT := o
 LIB_EXT := a
 INC_EXT := h
 
+<<<<<<< HEAD
+=======
+#Define make directory command variable
+MKDIR_P := mkdir -p
+
+>>>>>>> upstream/master
 #Get source cpp files
 SRC_FILES := $(shell find $(SRC_DIR) -type f -name *.$(SRC_EXT))
 INC_DIRS := $(shell find $(SRC_DIR) -type d)
 INC_FLAG_DIRS := $(addprefix -I /, $(INC_DIRS))
+<<<<<<< HEAD
 
 all:
 	$(foreach SRC_FILE, $(SRC_FILES),\
 		$(CXX) $(OBJ_FLAG) $(FILE_FLAG) $(SRC_FILE:$(SRC_DIR)/%.$(SRC_EXT)=$(OBJ_DIR)/%.$(OBJ_EXT)) $(SRC_FILE);\
-	)
+	)
+=======
+OBJ_DIRS := $(addprefix $(OBJ_DIR)/, $(INC_DIRS))
+
+object:
+	$(foreach OBJ_DIR, $(OBJ_DIRS),\
+		$(MKDIR_P) $(OBJ_DIR);\
+	)
+	$(foreach SRC_FILE, $(SRC_FILES),\
+		$(CXX) $(STD_FLAG) $(OBJ_FLAG) $(FILE_FLAG) $(SRC_FILE:$(SRC_DIR)/%.$(SRC_EXT)=$(OBJ_DIR)/$(SRC_DIR)/%.$(OBJ_EXT)) $(SRC_FILE);\
+	)
+
+#Get object files
+OBJ_FILES := $(shell find $(OBJ_DIR) -type f -name *.$(OBJ_EXT))
+
+library:
+	$(MKDIR_P) $(LIB_DIR)
+	$(AR) $(AR_FLAG) $(AR_NAME) $(OBJ_FILES)
+	mv $(AR_NAME) $(LIB_DIR)/$(AR_NAME)
+
+clean:
+	rm -r $(OBJ_DIR)
+>>>>>>> upstream/master