Skip to content

Commit a68e712

Browse files
committed
Separate protocol file in browser and js protocol
1 parent b44ace7 commit a68e712

File tree

10 files changed

+33108
-29162
lines changed

10 files changed

+33108
-29162
lines changed

Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ JAVA=java
44
CP=cp
55
RUN_JAR=$(JAVA) -jar
66

7+
PROTOCOL_PARSER_DIR=cdt-protocol-parser
78
JAVA_PROTOCOL_BUILDER_DIR=cdt-java-protocol-builder
89
JAVA_PROTOCOL_BUILDER_JAR="$(JAVA_PROTOCOL_BUILDER_DIR)/target/cdt-java-protocol-builder.jar"
910
PROTOCOL_PARSER=cdt-protocol-parser
@@ -12,13 +13,19 @@ JAVA_CLIENT_DIR=cdt-java-client
1213
JAVA_CLIENT_PACKAGE=com/github/kklisura/cdt/protocol
1314

1415
PACKAGE_NAME=com.github.kklisura.cdt.protocol
15-
PROTOCOL_JSON_FILE=./protocol.json
16+
JS_PROTOCOL_JSON_FILE=./js_protocol.json
17+
BROWSER_PROTOCOL_JSON_FILE=./browser_protocol.json
1618

1719
EXAMPLES_DIR=cdt-examples
1820

19-
build-cdt-java-protocol-builder:
21+
install-cdt-java-protocol-parser:
22+
# Building and install cdt-protocol-parser project...
23+
$(CP) $(JS_PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/js_protocol.json"
24+
$(CP) $(BROWSER_PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/browser_protocol.json"
25+
$(MVN) --file "$(PROTOCOL_PARSER_DIR)/" clean install
26+
27+
build-cdt-java-protocol-builder: install-cdt-java-protocol-parser
2028
# Building cdt-java-protocol-builder project...
21-
$(CP) $(PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/protocol.json"
2229
$(MVN) --file "$(JAVA_PROTOCOL_BUILDER_DIR)/" clean package
2330

2431
compile-cdt-java-client:
@@ -42,7 +49,8 @@ clean-previous-protocol:
4249
upgrade-protocol: build-cdt-java-protocol-builder clean-previous-protocol
4350
$(RUN_JAR) $(JAVA_PROTOCOL_BUILDER_JAR) --base-package="$(PACKAGE_NAME)" \
4451
--output=./$(JAVA_CLIENT_DIR)/ \
45-
--protocol=$(PROTOCOL_JSON_FILE)
52+
--js-protocol=$(JS_PROTOCOL_JSON_FILE) \
53+
--browser-protocol=$(BROWSER_PROTOCOL_JSON_FILE) \
4654

4755
update-protocol: upgrade-protocol compile-cdt-java-client
4856
# Updated protocol on cdt-java-client

0 commit comments

Comments
 (0)