aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2017-07-31 10:59:56 -0700
committerGravatar GitHub <noreply@github.com>2017-07-31 10:59:56 -0700
commit072431452a365450c607e9503f51786be44ecf7f (patch)
tree538babb5c6199e5ffe497794d7e20df436f16a3a
parent9b505a92bf6b3163ff9fb234a28dfef9c0330197 (diff)
parent547d76ed8e23275d1acadb92d0ea891562bf55e0 (diff)
Merge pull request #3429 from king6cong/master
Add classpath for java example Makefile
-rw-r--r--examples/Makefile2
-rw-r--r--examples/README.txt7
2 files changed, 8 insertions, 1 deletions
diff --git a/examples/Makefile b/examples/Makefile
index 51f13426..d16bb56d 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -51,7 +51,7 @@ list_people_gotest: list_people.go list_people_go
go test list_people.go list_people_test.go
javac_middleman: AddPerson.java ListPeople.java protoc_middleman
- javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java
+ javac -cp ../java/core/target/*.jar AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java
@touch javac_middleman
add_person_java: javac_middleman
diff --git a/examples/README.txt b/examples/README.txt
index b33f8414..2e4f6e4e 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -28,6 +28,13 @@ These examples are part of the Protocol Buffers tutorial, located at:
"-lpthread" from the linker commands (perhaps replacing it with something else).
We didn't do this automatically because we wanted to keep the example simple.
+## Java ##
+
+protobuf-java-*.jar can be generated by:
+ cd ../java
+ mvn package
+and will be used by "make java"
+
## Go ##
The Go example requires a plugin to the protocol buffer compiler, so it is not