diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-08-15 16:31:39 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-08-15 16:33:22 -0400 |
| commit | 81564101ee5d69e3b3d19ca533c2d3bd55d1c870 (patch) | |
| tree | 09c0a0f4c17206ee07e92782234fd8e394386b8d | |
| parent | 336ee28b34816e279fc0bc26d2b5d1e5ea233976 (diff) | |
Fix up ignores and conformance generation
- Update ruby conformance generation for rename of generated files that seems
to have happened.
- Update gitignores for the above and for the no-warnings-test.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | conformance/Makefile.am | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -64,6 +64,8 @@ src/protoc src/unittest_proto_middleman # Generated test scaffolding +src/no_warning_test.cc +src/no-warning-test src/protobuf*-test src/test_plugin src/testzip.* @@ -108,7 +110,7 @@ conformance/conformance.pb.cc conformance/conformance.pb.h conformance/Conformance.pbobjc.h conformance/Conformance.pbobjc.m -conformance/conformance.rb +conformance/conformance_pb.rb conformance/google/ conformance/javac_middleman conformance/lite/ diff --git a/conformance/Makefile.am b/conformance/Makefile.am index b76407ee..28ac3c8a 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -20,7 +20,7 @@ other_language_protoc_outputs = \ conformance_pb2.py \ Conformance.pbobjc.h \ Conformance.pbobjc.m \ - conformance.rb \ + conformance_pb.rb \ com/google/protobuf/Any.java \ com/google/protobuf/AnyOrBuilder.java \ com/google/protobuf/AnyProto.java \ |