aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Adam Cozzette <acozzette@google.com>2016-12-19 11:45:13 -0800
committerGravatar Adam Cozzette <acozzette@google.com>2016-12-19 14:38:21 -0800
commit1b3a0c16e6ac133e59d818f7b4556caf3c11b165 (patch)
tree0ce3f9cfea22d547b17e9b8843b754b580e10ff8 /.gitignore
parentf39cf88a347767d25572f7344eab44359d872925 (diff)
Auto-generate well_known_types_embed.cc
Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4383c623..4f426460 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ any_test.pb.*
map*unittest.pb.*
unittest*.pb.*
cpp_test*.pb.*
+src/google/protobuf/compiler/js/well_known_types_embed.cc
src/google/protobuf/util/**/*.pb.cc
src/google/protobuf/util/**/*.pb.h
@@ -60,6 +61,7 @@ python/build/
python/google/protobuf/compiler/
python/google/protobuf/util/
+src/js_embed
src/protoc
src/unittest_proto_middleman