Skip to content

Commit 978abe1

Browse files
authored
Merge pull request #70 from divy9881/fix_unix_build
fix: unix build to fast fail when compile-time errors and fix file boostraping for VS.
2 parents 5e3baa3 + 52929cb commit 978abe1

File tree

8 files changed

+24
-13
lines changed

8 files changed

+24
-13
lines changed

casbin/casbin.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<ClCompile Include="exception\missing_required_sections.cpp" />
167167
<ClCompile Include="exception\unsupported_operation_exception.cpp" />
168168
<ClCompile Include="internal_api.cpp" />
169-
<ClCompile Include="ip_parser\exception\ParserException.cpp" />
169+
<ClCompile Include="ip_parser\exception\parser_exception.cpp" />
170170
<ClCompile Include="ip_parser\parser\allFF.cpp" />
171171
<ClCompile Include="ip_parser\parser\CIDRMask.cpp" />
172172
<ClCompile Include="ip_parser\parser\dtoi.cpp" />
@@ -241,8 +241,8 @@
241241
<ClInclude Include="exception\missing_required_sections.h" />
242242
<ClInclude Include="exception\pch.h" />
243243
<ClInclude Include="exception\unsupported_operation_exception.h" />
244-
<ClInclude Include="ip_parser\exceptions\ParserException.h" />
245-
<ClInclude Include="ip_parser\exceptions\pch.h" />
244+
<ClInclude Include="ip_parser\exception\parser_exception.h" />
245+
<ClInclude Include="ip_parser\exception\pch.h" />
246246
<ClInclude Include="ip_parser\parser\allFF.h" />
247247
<ClInclude Include="ip_parser\parser\byte.h" />
248248
<ClInclude Include="ip_parser\parser\CIDR.h" />

casbin/casbin.vcxproj.filters

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Filter Include="Source Files\ip_parser\parser">
6868
<UniqueIdentifier>{deb02d53-9580-4fb9-b666-6b3a2713d286}</UniqueIdentifier>
6969
</Filter>
70-
<Filter Include="Source Files\ip_parser\exceptions">
70+
<Filter Include="Source Files\ip_parser\exception">
7171
<UniqueIdentifier>{c1a83ec0-b3e2-4b46-9755-6e20d8f26356}</UniqueIdentifier>
7272
</Filter>
7373
<Filter Include="Source Files\persist">
@@ -243,9 +243,6 @@
243243
<ClCompile Include="rbac_api_with_domains.cpp">
244244
<Filter>Source Files</Filter>
245245
</ClCompile>
246-
<ClCompile Include="ip_parser\exception\ParserException.cpp">
247-
<Filter>Source Files\ip_parser\exceptions</Filter>
248-
</ClCompile>
249246
<ClCompile Include="ip_parser\parser\parseIPv4.cpp">
250247
<Filter>Source Files\ip_parser\parser</Filter>
251248
</ClCompile>
@@ -255,6 +252,9 @@
255252
<ClCompile Include="enforcer_cached.cpp">
256253
<Filter>Source Files</Filter>
257254
</ClCompile>
255+
<ClCompile Include="ip_parser\exception\parser_exception.cpp">
256+
<Filter>Source Files\ip_parser\exception</Filter>
257+
</ClCompile>
258258
</ItemGroup>
259259
<ItemGroup>
260260
<ClInclude Include="config\config_interface.h">
@@ -347,10 +347,7 @@
347347
<ClInclude Include="exception\unsupported_operation_exception.h">
348348
<Filter>Header Files\exception</Filter>
349349
</ClInclude>
350-
<ClInclude Include="ip_parser\exceptions\ParserException.h">
351-
<Filter>Header Files\ip_parser\exception</Filter>
352-
</ClInclude>
353-
<ClInclude Include="ip_parser\exceptions\pch.h">
350+
<ClInclude Include="ip_parser\exception\pch.h">
354351
<Filter>Header Files\ip_parser\exception</Filter>
355352
</ClInclude>
356353
<ClInclude Include="ip_parser\parser\allFF.h">
@@ -470,6 +467,9 @@
470467
<ClInclude Include="enforcer_cached.h">
471468
<Filter>Header Files</Filter>
472469
</ClInclude>
470+
<ClInclude Include="ip_parser\exception\parser_exception.h">
471+
<Filter>Header Files\ip_parser\exception</Filter>
472+
</ClInclude>
473473
</ItemGroup>
474474
<ItemGroup>
475475
<None Include=".clang-format" />

casbin/ip_parser/exception/parserException.cpp renamed to casbin/ip_parser/exception/parser_exception.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "pch.h"
44

5-
#include "./parserException.h"
5+
#include "./parser_exception.h"
66

77
ParserException :: ParserException(string error_message){
88
this->error_message = error_message;

casbin/ip_parser/parser/parseCIDR.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "./parseIPv4.h"
1212
#include "./parseIPv6.h"
1313
#include "./CIDRMask.h"
14-
#include "../exception/parserException.h"
14+
#include "../exception/parser_exception.h"
1515

1616
CIDR parseCIDR(string s);
1717

File renamed without changes.
File renamed without changes.

makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ AR := ar
66
OBJ_FLAG := -c
77
FILE_FLAG := -o
88
STD_FLAG := -std=c++11
9+
DIS_WARN := -w
910

1011
# Define archive flags
1112
AR_FLAG := crv
@@ -33,6 +34,16 @@ OBJ_DIRS := $(addprefix $(OBJ_DIR)/, $(INC_DIRS))
3334

3435
.PHONY: object
3536
object:
37+
$(foreach OBJ_DIR, $(OBJ_DIRS),\
38+
$(MKDIR_P) $(OBJ_DIR);\
39+
)
40+
$(foreach SRC_FILE, $(SRC_FILES),\
41+
set -e;\
42+
$(CXX) $(DIS_WARN) $(STD_FLAG) $(OBJ_FLAG) $(FILE_FLAG) $(SRC_FILE:$(SRC_DIR)/%.$(SRC_EXT)=$(OBJ_DIR)/$(SRC_DIR)/%.$(OBJ_EXT)) $(SRC_FILE);\
43+
)
44+
45+
.PHONY: debug
46+
debug:
3647
$(foreach OBJ_DIR, $(OBJ_DIRS),\
3748
$(MKDIR_P) $(OBJ_DIR);\
3849
)

0 commit comments

Comments
 (0)