fix bugs

7 years ago · 75523ec086
parent 34843eddfe
commit 75523ec086
4 changed files with 4 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,3 @@
 [submodule "third_party/benchmark"]
 	path = third_party/benchmark
 	url = https://github.com/google/benchmark.git
-
--- 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
--- a/benchmarks/java/pom.xml
+++ b/benchmarks/java/pom.xml
@ -91,4 +91,5 @@
      </plugins>
    </pluginManagement>
  </build>
-</project>
+</project>
+
--- a/python/dist/protobuf-3.5.0.post1-py2.7.egg
+++ b/python/dist/protobuf-3.5.0.post1-py2.7.egg