azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf: improved build system of proto-compiler (especially dependencies and test launch)

Browse Source
This commit is contained in:
dsavvinov
2016-08-18 12:37:29 +03:00
parent 9f00b12130
commit d95535b8fb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/compiler/Makefile
+12 -4
View File
@@ -19,17 +19,18 @@ RUNTIME_JAR = $(RUNTIME_DIR)/build/libs/protokot-runtime.jar
# Testing project # Testing project
TEST_PROJECT = $(PROTOC_DIR)/protoc-tests TEST_PROJECT = $(PROTOC_DIR)/protoc-tests
TRANSLATOR_TEST_DIR = ../../translator TRANSLATOR_DIR = ../../translator
TRANSLATOR_TEST_DIR = $(TRANSLATOR_DIR)
# Produce protoc*, .jar-packed runtime and symlink to runtime sources # Produce protoc*, .jar-packed runtime and symlink to runtime sources
all: $(EXE) $(JAR) $(SYMLINK) all: $(EXE) $(JAR) $(SYMLINK)
# Place protoc* into build directory # Place protoc* into build directory
$(EXE): $(BUILDDIR) $(PROTOC_EXE) $(EXE): $(BUILDDIR) protoc
cp $(PROTOC_EXE) $(EXE) cp $(PROTOC_EXE) $(EXE)
# Build Protobuf Compiler via delegating call to another Makefile # Build Protobuf Compiler via delegating call to another Makefile
$(PROTOC_EXE): protoc:
$(MAKE) -C $(PROTOC_DIR) $(MAKE) -C $(PROTOC_DIR)
# Place ProtoKot Runtime JAR into build directory # Place ProtoKot Runtime JAR into build directory
@@ -51,8 +52,15 @@ $(BUILDDIR):
mkdir -p $(BUILDDIR) mkdir -p $(BUILDDIR)
# Testing # Testing
test: test: all
# Compile .proto-files for Java and JS tests
cd $(PROTOC_DIR); make generate
# Run Java and JS test
cd $(TEST_PROJECT); ./run_tests.sh cd $(TEST_PROJECT); ./run_tests.sh
# Rebuild translator JAR
cd $(TRANSLATOR_DIR); gradle jar
# Run Native tests
cd $(TRANSLATOR_TEST_DIR); ./run_tests.sh -t --proto cd $(TRANSLATOR_TEST_DIR); ./run_tests.sh -t --proto
clean: clean:
$(MAKE) -C $(PROTOC_DIR) clean $(MAKE) -C $(PROTOC_DIR) clean