aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore28
1 files changed, 27 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4f426460..fdc52bf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,9 @@ src/js_embed
src/protoc
src/unittest_proto_middleman
+# vim generated
+*.swp
+
# Generated test scaffolding
src/no_warning_test.cc
src/no-warning-test
@@ -84,6 +87,8 @@ src/**/*.trs
java/core/target
java/util/target
javanano/target
+java/.idea
+java/**/*.iml
# Windows native output.
cmake/build
@@ -113,18 +118,29 @@ conformance/conformance.pb.cc
conformance/conformance.pb.h
conformance/Conformance.pbobjc.h
conformance/Conformance.pbobjc.m
+conformance/conformance_pb.js
conformance/conformance_pb.rb
conformance/failing_tests.txt
conformance/google/
+conformance/google-protobuf/
conformance/javac_middleman
conformance/lite/
conformance/nonexistent_tests.txt
conformance/protoc_middleman
conformance/succeeding_tests.txt
+conformance/Conformance/
+conformance/GPBMetadata/
+conformance/Google/
+conformance/Protobuf_test_messages/
+conformance/conformance-php
+conformance/conformance-php-c
+conformance/*.class
# php test output
composer.lock
php/tests/generated/
+php/tests/old_protoc
+php/tests/protobuf/
php/ext/google/protobuf/.libs/
php/ext/google/protobuf/Makefile.fragments
php/ext/google/protobuf/Makefile.global
@@ -140,8 +156,18 @@ vendor/
# JavaScript artifacts
js/commonjs_out/
+js/compatibility_tests/v3.0.0/commonjs_out*
+js/compatibility_tests/v3.0.0/protoc
+js/compatibility_tests/v3.0.0/testproto_libs1.js
+js/compatibility_tests/v3.0.0/testproto_libs1_new.js
+js/compatibility_tests/v3.0.0/testproto_libs2.js
+js/compatibility_tests/v3.0.0/testproto_libs2_new.js
js/deps.js
js/google-protobuf.js
js/google/
js/node_modules/
-js/testproto_libs.js
+js/testproto_libs1.js
+js/testproto_libs2.js
+
+# Ignore the bazel symlinks
+/bazel-*