diff options
| author |  Yilun Chong <yilunchong@google.com> | 2017-12-12 12:05:29 -0800 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2017-12-12 12:05:29 -0800 |
| commit | 5e732e35c1aea3a00903aae50f63cf1cf9166833 (patch) | |
| tree | 4244785ac739109bdc4c5a211f243d66e81eed6a /benchmarks/Makefile.am | |
| parent | 9021f623e1420f513268a01a5ad43a23618a84ba (diff) | |
Add caliper supported to java benchmark
Diffstat (limited to 'benchmarks/Makefile.am')
| -rwxr-xr-x[-rw-r--r--] | benchmarks/Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index e9e08a0d..e69d9fb7 100644..100755 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -20,7 +20,7 @@ benchmarks_protoc_inputs_proto2 = \ datasets/google_message4/benchmark_message4_3.proto make_tmp_dir: - mkdir -p 'tmp' + mkdir -p 'tmp/java/src/main/java' touch make_tmp_dir if USE_EXTERNAL_PROTOC @@ -39,11 +39,11 @@ else # relative to srcdir, which may not be the same as the current directory when # building out-of-tree. protoc_middleman: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) - oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp $(benchmarks_protoc_inputs) ) + oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp/java/src/main/java $(benchmarks_protoc_inputs) ) touch protoc_middleman protoc_middleman2: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_proto2) $(well_known_type_protoc_inputs) - oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2) ) + oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp/java/src/main/java $(benchmarks_protoc_inputs_proto2) ) touch protoc_middleman2 endif @@ -124,18 +124,19 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark ############# JAVA RULES ############## -javac_middleman: ProtoBench.java protoc_middleman protoc_middleman2 - jar=`ls $(top_srcdir)/java/util/target/*.jar` && \ - jar1=`ls $(top_srcdir)/java/core/target/*.jar` && \ - javac -d tmp -classpath ../java/target/classes:$$jar:$$jar1 ProtoBench.java $(benchmark_java_protoc_outputs_proto2) $(benchmarks_java_protoc_outputs) `find tmp -type f -name "*.java"` +java_benchmark_testing_files = + java/src/main/java/com/google/protocolbuffers/ProtoBench.java \ + java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java + +javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2 + cp -r java tmp && cd tmp/java && mvn clean compile assembly:single + cd ../.. @touch javac_middleman java-benchmark: javac_middleman @echo "Writing shortcut script java-benchmark..." @echo '#! /bin/sh' > java-benchmark - @jar=`ls $(top_srcdir)/java/util/target/*.jar` && \ - jar1=`ls $(top_srcdir)/java/core/target/*.jar` && \ - echo java -classpath tmp:../java/target/classes:$$jar:$$jar1 com.google.protocolbuffers.ProtoBench '$$@' >> java-benchmark + @echo 'java -cp '"tmp/java/target/*.jar"' com.google.protocolbuffers.ProtoBench $$@' >> java-benchmark @chmod +x java-benchmark java: protoc_middleman protoc_middleman2 java-benchmark |