aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yilun Chong <yilunchong@google.com>2017-12-13 17:21:33 -0800
committerGravatar Yilun Chong <yilunchong@google.com>2017-12-13 17:21:33 -0800
commit75523ec0867969ce6a1bcb9d9a7e1b686747eb47 (patch)
treef478b68895c633537fd6dc77a889588400eabb89
parent34843eddfe65686a86d12780d1ca709a997d83ad (diff)
fix bugs
-rw-r--r--.gitmodules1
-rwxr-xr-xbenchmarks/Makefile.am4
-rwxr-xr-xbenchmarks/java/pom.xml3
-rwxr-xr-xpython/dist/protobuf-3.5.0.post1-py2.7.eggbin0 -> 1673365 bytes
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index a000a725..55a47cea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
[submodule "third_party/benchmark"]
path = third_party/benchmark
url = https://github.com/google/benchmark.git
-
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index aa65c02f..2158feac 100755
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -125,8 +125,8 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark
############# JAVA RULES ##############
java_benchmark_testing_files =
- java/src/main/java/com/google/protocolbuffers/ProtoBench.java \
- java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java
+ java/src/main/java/com/google/protobuf/ProtoBench.java \
+ java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2
cp -r java tmp && cd tmp/java && mvn clean compile assembly:single
diff --git a/benchmarks/java/pom.xml b/benchmarks/java/pom.xml
index 3afeebca..f82f911b 100755
--- a/benchmarks/java/pom.xml
+++ b/benchmarks/java/pom.xml
@@ -91,4 +91,5 @@
</plugins>
</pluginManagement>
</build>
-</project> \ No newline at end of file
+</project>
+
diff --git a/python/dist/protobuf-3.5.0.post1-py2.7.egg b/python/dist/protobuf-3.5.0.post1-py2.7.egg
new file mode 100755
index 00000000..56e0b096
--- /dev/null
+++ b/python/dist/protobuf-3.5.0.post1-py2.7.egg
Binary files differ