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

Protobuf: fixed bug in build script when JAR wasn't rebuild after changes in .kt-sources

Browse Source
This commit is contained in:
dsavvinov
2016-08-10 20:35:34 +03:00
parent 72a70b035d
commit aa3c411624
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/compiler/google/src/google/protobuf/compiler/kotlin/Makefile
+9 -2
View File
@@ -8,6 +8,7 @@ BINDIR = bin
TESTDIR = test TESTDIR = test
KTPROJECT = protoc-test-project KTPROJECT = protoc-test-project
KTOUT = $(KTPROJECT)/src KTOUT = $(KTPROJECT)/src
JAVAOUT = $(KTPROJECT)/src/java
OBJECTS = $(patsubst $(SRCDIR)/%.cc,$(BINDIR)/%.o,$(wildcard $(SRCDIR)/*.cc)) OBJECTS = $(patsubst $(SRCDIR)/%.cc,$(BINDIR)/%.o,$(wildcard $(SRCDIR)/*.cc))
KTARTIFACTS = $(patsubst $(TESTDIR)/%.proto,$(KTOUT)/%.kt,$(wildcard $(TESTDIR)/*.proto)) KTARTIFACTS = $(patsubst $(TESTDIR)/%.proto,$(KTOUT)/%.kt,$(wildcard $(TESTDIR)/*.proto))
@@ -28,6 +29,9 @@ $(BINDIR):
$(KTOUT): $(KTOUT):
mkdir -p $(KTOUT) mkdir -p $(KTOUT)
$(JAVAOUT):
mkdir -p $(JAVAOUT)
clean: clean:
rm -rf $(BINDIR) rm -rf $(BINDIR)
rm $(EXE) rm $(EXE)
@@ -36,7 +40,10 @@ clean:
$(KTOUT)/%.kt: $(TESTDIR)/%.proto $(EXE) $(KTOUT)/%.kt: $(TESTDIR)/%.proto $(EXE)
./protoc --kotlin_out=$(KTOUT) $< ./protoc --kotlin_out=$(KTOUT) $<
generate: $(KTOUT) $(KTARTIFACTS) java: $(TESTDIR)/*.proto
protoc --java_out=$(JAVAOUT) $^
generate: $(KTOUT) $(JAVAOUT) $(KTARTIFACTS) java
.PHONY: clean all generate .PHONY: clean all generate java