Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: third_party/protobuf/conformance/Makefile.am

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 ## Process this file with automake to produce Makefile.in 1 ## Process this file with automake to produce Makefile.in
2 2
3 conformance_protoc_inputs = \ 3 conformance_protoc_inputs = \
4 conformance.proto \ 4 conformance.proto
5 $(top_srcdir)/src/google/protobuf/test_messages_proto3.proto
6 5
7 well_known_type_protoc_inputs = \ 6 well_known_type_protoc_inputs = \
8 $(top_srcdir)/src/google/protobuf/any.proto \ 7 $(top_srcdir)/src/google/protobuf/any.proto \
9 $(top_srcdir)/src/google/protobuf/duration.proto \ 8 $(top_srcdir)/src/google/protobuf/duration.proto \
10 $(top_srcdir)/src/google/protobuf/field_mask.proto \ 9 $(top_srcdir)/src/google/protobuf/field_mask.proto \
11 $(top_srcdir)/src/google/protobuf/struct.proto \ 10 $(top_srcdir)/src/google/protobuf/struct.proto \
12 $(top_srcdir)/src/google/protobuf/timestamp.proto \ 11 $(top_srcdir)/src/google/protobuf/timestamp.proto \
13 $(top_srcdir)/src/google/protobuf/wrappers.proto 12 $(top_srcdir)/src/google/protobuf/wrappers.proto
14 13
15 14
16 protoc_outputs = \ 15 protoc_outputs = \
17 conformance.pb.cc \ 16 conformance.pb.cc \
18 conformance.pb.h 17 conformance.pb.h
19 18
20 other_language_protoc_outputs = \ 19 other_language_protoc_outputs = \
21 conformance_pb2.py \ 20 conformance_pb2.py \
22 Conformance.pbobjc.h \ 21 Conformance.pbobjc.h \
23 Conformance.pbobjc.m \ 22 Conformance.pbobjc.m \
24 conformance_pb.rb \ 23 conformance.rb \
25 com/google/protobuf/Any.java \ 24 com/google/protobuf/Any.java \
26 com/google/protobuf/AnyOrBuilder.java \ 25 com/google/protobuf/AnyOrBuilder.java \
27 com/google/protobuf/AnyProto.java \ 26 com/google/protobuf/AnyProto.java \
28 com/google/protobuf/BoolValue.java \ 27 com/google/protobuf/BoolValue.java \
29 com/google/protobuf/BoolValueOrBuilder.java \ 28 com/google/protobuf/BoolValueOrBuilder.java \
30 com/google/protobuf/BytesValue.java \ 29 com/google/protobuf/BytesValue.java \
31 com/google/protobuf/BytesValueOrBuilder.java \ 30 com/google/protobuf/BytesValueOrBuilder.java \
32 com/google/protobuf/conformance/Conformance.java \ 31 com/google/protobuf/conformance/Conformance.java \
33 com/google/protobuf/DoubleValue.java \ 32 com/google/protobuf/DoubleValue.java \
34 com/google/protobuf/DoubleValueOrBuilder.java \ 33 com/google/protobuf/DoubleValueOrBuilder.java \
(...skipping 20 matching lines...) Expand all
55 com/google/protobuf/Timestamp.java \ 54 com/google/protobuf/Timestamp.java \
56 com/google/protobuf/TimestampOrBuilder.java \ 55 com/google/protobuf/TimestampOrBuilder.java \
57 com/google/protobuf/TimestampProto.java \ 56 com/google/protobuf/TimestampProto.java \
58 com/google/protobuf/UInt32Value.java \ 57 com/google/protobuf/UInt32Value.java \
59 com/google/protobuf/UInt32ValueOrBuilder.java \ 58 com/google/protobuf/UInt32ValueOrBuilder.java \
60 com/google/protobuf/UInt64Value.java \ 59 com/google/protobuf/UInt64Value.java \
61 com/google/protobuf/UInt64ValueOrBuilder.java \ 60 com/google/protobuf/UInt64ValueOrBuilder.java \
62 com/google/protobuf/Value.java \ 61 com/google/protobuf/Value.java \
63 com/google/protobuf/ValueOrBuilder.java \ 62 com/google/protobuf/ValueOrBuilder.java \
64 com/google/protobuf/WrappersProto.java \ 63 com/google/protobuf/WrappersProto.java \
65 com/google/protobuf_test_messages/proto3/TestMessagesProto3.java \
66 google/protobuf/any.pb.cc \ 64 google/protobuf/any.pb.cc \
67 google/protobuf/any.pb.h \ 65 google/protobuf/any.pb.h \
68 google/protobuf/any.rb \ 66 google/protobuf/any.rb \
69 google/protobuf/any_pb2.py \ 67 google/protobuf/any_pb2.py \
70 google/protobuf/duration.pb.cc \ 68 google/protobuf/duration.pb.cc \
71 google/protobuf/duration.pb.h \ 69 google/protobuf/duration.pb.h \
72 google/protobuf/duration.rb \ 70 google/protobuf/duration.rb \
73 google/protobuf/duration_pb2.py \ 71 google/protobuf/duration_pb2.py \
74 google/protobuf/field_mask.pb.cc \ 72 google/protobuf/field_mask.pb.cc \
75 google/protobuf/field_mask.pb.h \ 73 google/protobuf/field_mask.pb.h \
76 google/protobuf/field_mask.rb \ 74 google/protobuf/field_mask.rb \
77 google/protobuf/field_mask_pb2.py \ 75 google/protobuf/field_mask_pb2.py \
78 google/protobuf/struct.pb.cc \ 76 google/protobuf/struct.pb.cc \
79 google/protobuf/struct.pb.h \ 77 google/protobuf/struct.pb.h \
80 google/protobuf/struct.rb \ 78 google/protobuf/struct.rb \
81 google/protobuf/struct_pb2.py \ 79 google/protobuf/struct_pb2.py \
82 google/protobuf/TestMessagesProto3.pbobjc.h \
83 google/protobuf/TestMessagesProto3.pbobjc.m \
84 google/protobuf/test_messages_proto3.pb.cc \
85 google/protobuf/test_messages_proto3.pb.h \
86 google/protobuf/test_messages_proto3_pb.rb \
87 google/protobuf/test_messages_proto3_pb2.py \
88 google/protobuf/timestamp.pb.cc \ 80 google/protobuf/timestamp.pb.cc \
89 google/protobuf/timestamp.pb.h \ 81 google/protobuf/timestamp.pb.h \
90 google/protobuf/timestamp.rb \ 82 google/protobuf/timestamp.rb \
91 google/protobuf/timestamp_pb2.py \ 83 google/protobuf/timestamp_pb2.py \
92 google/protobuf/wrappers.pb.cc \ 84 google/protobuf/wrappers.pb.cc \
93 google/protobuf/wrappers.pb.h \ 85 google/protobuf/wrappers.pb.h \
94 google/protobuf/wrappers.rb \ 86 google/protobuf/wrappers.rb \
95 google/protobuf/wrappers_pb2.py 87 google/protobuf/wrappers_pb2.py \
96 # lite/com/google/protobuf/Any.java \ 88 lite/com/google/protobuf/Any.java \
97 # lite/com/google/protobuf/AnyOrBuilder.java \ 89 lite/com/google/protobuf/AnyOrBuilder.java \
98 # lite/com/google/protobuf/AnyProto.java \ 90 lite/com/google/protobuf/AnyProto.java \
99 # lite/com/google/protobuf/BoolValue.java \ 91 lite/com/google/protobuf/BoolValue.java \
100 # lite/com/google/protobuf/BoolValueOrBuilder.java \ 92 lite/com/google/protobuf/BoolValueOrBuilder.java \
101 # lite/com/google/protobuf/BytesValue.java \ 93 lite/com/google/protobuf/BytesValue.java \
102 # lite/com/google/protobuf/BytesValueOrBuilder.java \ 94 lite/com/google/protobuf/BytesValueOrBuilder.java \
103 # lite/com/google/protobuf/conformance/Conformance.java \ 95 lite/com/google/protobuf/conformance/Conformance.java \
104 # lite/com/google/protobuf/DoubleValue.java \ 96 lite/com/google/protobuf/DoubleValue.java \
105 # lite/com/google/protobuf/DoubleValueOrBuilder.java \ 97 lite/com/google/protobuf/DoubleValueOrBuilder.java \
106 # lite/com/google/protobuf/Duration.java \ 98 lite/com/google/protobuf/Duration.java \
107 # lite/com/google/protobuf/DurationOrBuilder.java \ 99 lite/com/google/protobuf/DurationOrBuilder.java \
108 # lite/com/google/protobuf/DurationProto.java \ 100 lite/com/google/protobuf/DurationProto.java \
109 # lite/com/google/protobuf/FieldMask.java \ 101 lite/com/google/protobuf/FieldMask.java \
110 # lite/com/google/protobuf/FieldMaskOrBuilder.java \ 102 lite/com/google/protobuf/FieldMaskOrBuilder.java \
111 # lite/com/google/protobuf/FieldMaskProto.java \ 103 lite/com/google/protobuf/FieldMaskProto.java \
112 # lite/com/google/protobuf/FloatValue.java \ 104 lite/com/google/protobuf/FloatValue.java \
113 # lite/com/google/protobuf/FloatValueOrBuilder.java \ 105 lite/com/google/protobuf/FloatValueOrBuilder.java \
114 # lite/com/google/protobuf/Int32Value.java \ 106 lite/com/google/protobuf/Int32Value.java \
115 # lite/com/google/protobuf/Int32ValueOrBuilder.java \ 107 lite/com/google/protobuf/Int32ValueOrBuilder.java \
116 # lite/com/google/protobuf/Int64Value.java \ 108 lite/com/google/protobuf/Int64Value.java \
117 # lite/com/google/protobuf/Int64ValueOrBuilder.java \ 109 lite/com/google/protobuf/Int64ValueOrBuilder.java \
118 # lite/com/google/protobuf/ListValue.java \ 110 lite/com/google/protobuf/ListValue.java \
119 # lite/com/google/protobuf/ListValueOrBuilder.java \ 111 lite/com/google/protobuf/ListValueOrBuilder.java \
120 # lite/com/google/protobuf/NullValue.java \ 112 lite/com/google/protobuf/NullValue.java \
121 # lite/com/google/protobuf/StringValue.java \ 113 lite/com/google/protobuf/StringValue.java \
122 # lite/com/google/protobuf/StringValueOrBuilder.java \ 114 lite/com/google/protobuf/StringValueOrBuilder.java \
123 # lite/com/google/protobuf/Struct.java \ 115 lite/com/google/protobuf/Struct.java \
124 # lite/com/google/protobuf/StructOrBuilder.java \ 116 lite/com/google/protobuf/StructOrBuilder.java \
125 # lite/com/google/protobuf/StructProto.java \ 117 lite/com/google/protobuf/StructProto.java \
126 # lite/com/google/protobuf/Timestamp.java \ 118 lite/com/google/protobuf/Timestamp.java \
127 # lite/com/google/protobuf/TimestampOrBuilder.java \ 119 lite/com/google/protobuf/TimestampOrBuilder.java \
128 # lite/com/google/protobuf/TimestampProto.java \ 120 lite/com/google/protobuf/TimestampProto.java \
129 # lite/com/google/protobuf/UInt32Value.java \ 121 lite/com/google/protobuf/UInt32Value.java \
130 # lite/com/google/protobuf/UInt32ValueOrBuilder.java \ 122 lite/com/google/protobuf/UInt32ValueOrBuilder.java \
131 # lite/com/google/protobuf/UInt64Value.java \ 123 lite/com/google/protobuf/UInt64Value.java \
132 # lite/com/google/protobuf/UInt64ValueOrBuilder.java \ 124 lite/com/google/protobuf/UInt64ValueOrBuilder.java \
133 # lite/com/google/protobuf/Value.java \ 125 lite/com/google/protobuf/Value.java \
134 # lite/com/google/protobuf/ValueOrBuilder.java \ 126 lite/com/google/protobuf/ValueOrBuilder.java \
135 # lite/com/google/protobuf/WrappersProto.java 127 lite/com/google/protobuf/WrappersProto.java
136 128
137 bin_PROGRAMS = conformance-test-runner conformance-cpp 129 bin_PROGRAMS = conformance-test-runner conformance-cpp
138 130
139 # All source files excepet C++/Objective-C ones should be explicitly listed 131 # All source files excepet C++/Objective-C ones should be explicitly listed
140 # here because the autoconf tools don't include files of other languages 132 # here because the autoconf tools don't include files of other languages
141 # automatically. 133 # automatically.
142 EXTRA_DIST = \ 134 EXTRA_DIST = \
143 ConformanceJava.java \ 135 ConformanceJava.java \
144 ConformanceJavaLite.java \ 136 ConformanceJavaLite.java \
145 README.md \ 137 README.md \
146 conformance.proto \ 138 conformance.proto \
147 conformance_python.py \ 139 conformance_python.py \
148 conformance_ruby.rb \ 140 conformance_ruby.rb \
149 failure_list_cpp.txt \ 141 failure_list_cpp.txt \
150 failure_list_csharp.txt \ 142 failure_list_csharp.txt \
151 failure_list_java.txt \ 143 failure_list_java.txt \
152 failure_list_objc.txt \ 144 failure_list_objc.txt \
153 failure_list_python.txt \ 145 failure_list_python.txt \
154 failure_list_python_cpp.txt \ 146 failure_list_python_cpp.txt \
155 failure_list_python-post26.txt \ 147 failure_list_python-post26.txt \
156 failure_list_ruby.txt 148 failure_list_ruby.txt
157 149
158 conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la 150 conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la
159 conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \ 151 conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \
160 conformance_test_runner.cc \ 152 conformance_test_runner.cc \
161 third_party/jsoncpp/json.h \ 153 third_party/jsoncpp/json.h \
162 third_party/jsoncpp/jsoncpp.cpp 154 third_party/jsoncpp/jsoncpp.cpp
163 nodist_conformance_test_runner_SOURCES = conformance.pb.cc google/protobuf/test_ messages_proto3.pb.cc 155 nodist_conformance_test_runner_SOURCES = conformance.pb.cc
164 conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) 156 conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
165 conformance_test_runner_CXXFLAGS = -std=c++11 157 conformance_test_runner_CXXFLAGS = -std=c++11
166 # Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check" 158 # Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check"
167 # so a direct "make test_cpp" could fail if parallel enough. 159 # so a direct "make test_cpp" could fail if parallel enough.
168 conformance_test_runner-conformance_test.$(OBJEXT): conformance.pb.h 160 conformance_test_runner-conformance_test.$(OBJEXT): conformance.pb.h
169 conformance_test_runner-conformance_test_runner.$(OBJEXT): conformance.pb.h 161 conformance_test_runner-conformance_test_runner.$(OBJEXT): conformance.pb.h
170 162
171 conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la 163 conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la
172 conformance_cpp_SOURCES = conformance_cpp.cc 164 conformance_cpp_SOURCES = conformance_cpp.cc
173 nodist_conformance_cpp_SOURCES = conformance.pb.cc google/protobuf/test_messages _proto3.pb.cc 165 nodist_conformance_cpp_SOURCES = conformance.pb.cc
174 conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src 166 conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src
175 # Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check" 167 # Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check"
176 # so a direct "make test_cpp" could fail if parallel enough. 168 # so a direct "make test_cpp" could fail if parallel enough.
177 conformance_cpp-conformance_cpp.$(OBJEXT): conformance.pb.h 169 conformance_cpp-conformance_cpp.$(OBJEXT): conformance.pb.h
178 170
179 if OBJC_CONFORMANCE_TEST 171 if OBJC_CONFORMANCE_TEST
180 172
181 bin_PROGRAMS += conformance-objc 173 bin_PROGRAMS += conformance-objc
182 174
183 conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m 175 conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m
184 nodist_conformance_objc_SOURCES = Conformance.pbobjc.m google/protobuf/TestMessa gesProto3.pbobjc.m 176 nodist_conformance_objc_SOURCES = Conformance.pbobjc.m
185 # On travis, the build fails without the isysroot because whatever system 177 # On travis, the build fails without the isysroot because whatever system
186 # headers are being found don't include generics support for 178 # headers are being found don't include generics support for
187 # NSArray/NSDictionary, the only guess is their image at one time had an odd 179 # NSArray/NSDictionary, the only guess is their image at one time had an odd
188 # setup for Xcode and old frameworks are being found. 180 # setup for Xcode and old frameworks are being found.
189 conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk ma cosx --show-sdk-path` 181 conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk ma cosx --show-sdk-path`
190 conformance_objc_LDFLAGS = -framework Foundation 182 conformance_objc_LDFLAGS = -framework Foundation
191 # Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check" 183 # Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check"
192 # so a direct "make test_objc" could fail if parallel enough. 184 # so a direct "make test_objc" could fail if parallel enough.
193 conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h google/protobu f/TestMessagesProto3.pbobjc.h 185 conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h
194 186
195 endif 187 endif
196 188
197 if USE_EXTERNAL_PROTOC 189 if USE_EXTERNAL_PROTOC
198 190
199 # Some implementations include pre-generated versions of well-known types. 191 # Some implementations include pre-generated versions of well-known types.
200 protoc_middleman: $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) 192 protoc_middleman: $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
201 $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_ou t=. --objc_out=. --python_out=. $(conformance_protoc_inputs) 193 $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_ou t=. --objc_out=. --python_out=. $(conformance_protoc_inputs)
202 $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_ou t=. --python_out=. $(well_known_type_protoc_inputs) 194 $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_ou t=. --python_out=. $(well_known_type_protoc_inputs)
203 » ## $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conforma nce_protoc_inputs) $(well_known_type_protoc_inputs) 195 » $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conformance _protoc_inputs) $(well_known_type_protoc_inputs)
204 touch protoc_middleman 196 touch protoc_middleman
205 197
206 else 198 else
207 199
208 # We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is 200 # We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is
209 # relative to srcdir, which may not be the same as the current directory when 201 # relative to srcdir, which may not be the same as the current directory when
210 # building out-of-tree. 202 # building out-of-tree.
211 protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) 203 protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
212 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --o bjc_out=$$oldpwd --python_out=$$oldpwd $(conformance_protoc_inputs) ) 204 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --o bjc_out=$$oldpwd --python_out=$$oldpwd $(conformance_protoc_inputs) )
213 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --p ython_out=$$oldpwd $(well_known_type_protoc_inputs) ) 205 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --p ython_out=$$oldpwd $(well_known_type_protoc_inputs) )
214 » ## @mkdir -p lite 206 » @mkdir -p lite
215 » ## oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --java_out=lite:$$oldpwd/lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) ) 207 » oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --java_out=lite:$$oldpwd/lite $(conformance_protoc_inputs) $(w ell_known_type_protoc_inputs) )
216 touch protoc_middleman 208 touch protoc_middleman
217 209
218 endif 210 endif
219 211
220 $(protoc_outputs): protoc_middleman 212 $(protoc_outputs): protoc_middleman
221 213
222 $(other_language_protoc_outputs): protoc_middleman 214 $(other_language_protoc_outputs): protoc_middleman
223 215
224 BUILT_SOURCES = $(protoc_outputs) $(other_language_protoc_outputs) 216 BUILT_SOURCES = $(protoc_outputs) $(other_language_protoc_outputs)
225 217
226 CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp $(other_language_ protoc_outputs) 218 CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp $(other_language_ protoc_outputs)
227 219
228 MAINTAINERCLEANFILES = \ 220 MAINTAINERCLEANFILES = \
229 Makefile.in 221 Makefile.in
230 222
231 javac_middleman: ConformanceJava.java protoc_middleman $(other_language_protoc_o utputs) 223 javac_middleman: ConformanceJava.java protoc_middleman $(other_language_protoc_o utputs)
232 » jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classp ath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/confor mance/Conformance.java com/google/protobuf_test_messages/proto3/TestMessagesProt o3.java 224 » jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classp ath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/confor mance/Conformance.java
233 @touch javac_middleman 225 @touch javac_middleman
234 226
235 conformance-java: javac_middleman 227 conformance-java: javac_middleman
236 @echo "Writing shortcut script conformance-java..." 228 @echo "Writing shortcut script conformance-java..."
237 @echo '#! /bin/sh' > conformance-java 229 @echo '#! /bin/sh' > conformance-java
238 @jar=`ls ../java/util/target/*jar-with-dependencies.jar` && echo java -c lasspath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-jav a 230 @jar=`ls ../java/util/target/*jar-with-dependencies.jar` && echo java -c lasspath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-jav a
239 @chmod +x conformance-java 231 @chmod +x conformance-java
240 232
241 javac_middleman_lite: ConformanceJavaLite.java protoc_middleman $(other_language _protoc_outputs) 233 javac_middleman_lite: ConformanceJavaLite.java protoc_middleman $(other_language _protoc_outputs)
242 javac -classpath ../java/lite/target/classes:lite ConformanceJavaLite.ja va lite/com/google/protobuf/conformance/Conformance.java 234 javac -classpath ../java/lite/target/classes:lite ConformanceJavaLite.ja va lite/com/google/protobuf/conformance/Conformance.java
243 @touch javac_middleman_lite 235 @touch javac_middleman_lite
244 236
245 conformance-java-lite: javac_middleman_lite 237 conformance-java-lite: javac_middleman_lite
246 @echo "Writing shortcut script conformance-java-lite..." 238 @echo "Writing shortcut script conformance-java-lite..."
247 @echo '#! /bin/sh' > conformance-java-lite 239 @echo '#! /bin/sh' > conformance-java-lite
248 @echo java -classpath .:../java/lite/target/classes:lite ConformanceJava Lite '$$@' >> conformance-java-lite 240 @echo java -classpath .:../java/lite/target/classes:lite ConformanceJava Lite '$$@' >> conformance-java-lite
249 @chmod +x conformance-java-lite 241 @chmod +x conformance-java-lite
250 242
251 # Currently the conformance code is alongside the rest of the C# 243 # Currently the conformance code is alongside the rest of the C#
252 # source, as it's easier to maintain there. We assume we've already 244 # source, as it's easier to maintain there. We assume we've already
253 # built that, so we just need a script to run it. 245 # built that, so we just need a script to run it.
254 conformance-csharp: $(other_language_protoc_outputs) 246 conformance-csharp: $(other_language_protoc_outputs)
255 @echo "Writing shortcut script conformance-csharp..." 247 @echo "Writing shortcut script conformance-csharp..."
256 @echo '#! /bin/sh' > conformance-csharp 248 @echo '#! /bin/sh' > conformance-csharp
257 » @echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netc oreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp 249 » @echo 'mono ../csharp/src/Google.Protobuf.Conformance/bin/Release/Google .Protobuf.Conformance.exe "$$@"' >> conformance-csharp
258 @chmod +x conformance-csharp 250 @chmod +x conformance-csharp
259 251
260 # Targets for actually running tests. 252 # Targets for actually running tests.
261 test_cpp: protoc_middleman conformance-test-runner conformance-cpp 253 test_cpp: protoc_middleman conformance-test-runner conformance-cpp
262 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_cpp.txt ./conformance-cpp 254 » ./conformance-test-runner --failure_list failure_list_cpp.txt ./conforma nce-cpp
263 255
264 test_java: protoc_middleman conformance-test-runner conformance-java 256 test_java: protoc_middleman conformance-test-runner conformance-java
265 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_java.txt ./conformance-java 257 » ./conformance-test-runner --failure_list failure_list_java.txt ./conform ance-java
266 258
267 test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite 259 test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite
268 » ./conformance-test-runner --enforce_recommended ./conformance-java-lite 260 » ./conformance-test-runner ./conformance-java-lite
269 261
270 test_csharp: protoc_middleman conformance-test-runner conformance-csharp 262 test_csharp: protoc_middleman conformance-test-runner conformance-csharp
271 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_csharp.txt ./conformance-csharp 263 » ./conformance-test-runner --failure_list failure_list_csharp.txt ./confo rmance-csharp
272 264
273 test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outp uts) 265 test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outp uts)
274 » RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended -- failure_list failure_list_ruby.txt ./conformance_ruby.rb 266 » RUBYLIB=../ruby/lib:. ./conformance-test-runner --failure_list failure_l ist_ruby.txt ./conformance_ruby.rb
275 267
276 # These depend on library paths being properly set up. The easiest way to 268 # These depend on library paths being properly set up. The easiest way to
277 # run them is to just use "tox" from the python dir. 269 # run them is to just use "tox" from the python dir.
278 test_python: protoc_middleman conformance-test-runner 270 test_python: protoc_middleman conformance-test-runner
279 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_python.txt ./conformance_python.py 271 » ./conformance-test-runner --failure_list failure_list_python.txt $(CONFO RMANCE_PYTHON_EXTRA_FAILURES) ./conformance_python.py
280 272
281 test_python_cpp: protoc_middleman conformance-test-runner 273 test_python_cpp: protoc_middleman conformance-test-runner
282 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_python_cpp.txt ./conformance_python.py 274 » ./conformance-test-runner --failure_list failure_list_python_cpp.txt $(C ONFORMANCE_PYTHON_EXTRA_FAILURES) ./conformance_python.py
283 275
284 if OBJC_CONFORMANCE_TEST 276 if OBJC_CONFORMANCE_TEST
285 277
286 test_objc: protoc_middleman conformance-test-runner conformance-objc 278 test_objc: protoc_middleman conformance-test-runner conformance-objc
287 » ./conformance-test-runner --enforce_recommended --failure_list failure_l ist_objc.txt ./conformance-objc 279 » ./conformance-test-runner --failure_list failure_list_objc.txt ./conform ance-objc
288 280
289 endif 281 endif
OLDNEW
« no previous file with comments | « third_party/protobuf/conformance/ConformanceJavaLite.java ('k') | third_party/protobuf/conformance/conformance.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698