Merge pull request stepancheg#147 from nerdrew/gitignore-generated-files

rm generated files

Author: nerdrew

.gitignore

@@ -1,2 +1,38 @@
 target
 Cargo.lock
+quick-protobuf/benches/perftest_data/perftest_data.rs
+quick-protobuf/tests/packed_primitives/mod.rs
+quick-protobuf/tests/packed_primitives/person.rs
+quick-protobuf/tests/rust_protobuf/common/mesos/mod.rs
+quick-protobuf/tests/rust_protobuf/common/mesos/v1.rs
+quick-protobuf/tests/rust_protobuf/common/mod.rs
+quick-protobuf/tests/rust_protobuf/v2/basic.rs
+quick-protobuf/tests/rust_protobuf/v2/foo/bar.rs
+quick-protobuf/tests/rust_protobuf/v2/foo/baz.rs
+quick-protobuf/tests/rust_protobuf/v2/foo/mod.rs
+quick-protobuf/tests/rust_protobuf/v2/issue118.rs
+quick-protobuf/tests/rust_protobuf/v2/issue118_2.rs
+quick-protobuf/tests/rust_protobuf/v2/nonunique_1.rs
+quick-protobuf/tests/rust_protobuf/v2/nonunique_2.rs
+quick-protobuf/tests/rust_protobuf/v2/special.rs
+quick-protobuf/tests/rust_protobuf/v2/struct_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_default_values.rs
+quick-protobuf/tests/rust_protobuf/v2/test_enum_values_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_ident_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_import_nested_imported_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_import_nested_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_import_nonunique_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_import_root_imported_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_import_root_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_lite_runtime.rs
+quick-protobuf/tests/rust_protobuf/v2/test_nonunique_enum_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_oneof_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_required.rs
+quick-protobuf/tests/rust_protobuf/v2/test_root_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_sanitize_file_name_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/test_text_format_pb.rs
+quick-protobuf/tests/rust_protobuf/v2/vector_tile.rs
+quick-protobuf/tests/rust_protobuf/v3/basic.rs
+quick-protobuf/tests/rust_protobuf/v3/test_ident_pb.rs
+quick-protobuf/tests/rust_protobuf/v3/test_map_pb.rs
+quick-protobuf/tests/rust_protobuf/v3/test_oneof_pb.rs

.travis.yml

@@ -13,6 +13,6 @@ before_script:
 
 script:
   - cargo build -p pb-rs -p quick-protobuf
-  - if [[ $(rustup show active-toolchain) == stable* ]]; then cargo fmt -ppb-rs -pquick-protobuf -- --check; fi;
   - ./run_test.sh
+  - if [[ $(rustup show active-toolchain) == stable* ]]; then cargo fmt -ppb-rs -pquick-protobuf -- --check; fi;
   - if [[ $(rustup show active-toolchain) == nightly* ]]; then cargo bench -p quick-protobuf; fi;

generate_modules.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eu -o pipefail
+set -eux -o pipefail
 
 (
     cd quick-protobuf/tests/rust_protobuf
@@ -9,31 +9,29 @@ set -eu -o pipefail
 
 base_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+rm -r quick-protobuf/examples/pb_rs/*.rs quick-protobuf/examples/pb_rs/a
+rm -r quick-protobuf/examples/pb_rs_v3/*.rs quick-protobuf/examples/pb_rs_v3/a
+
 proto_sets=(
-    perftest/src/*.proto
-    quick-protobuf/benches/perftest_data/*.proto
-    quick-protobuf/examples/pb_rs/*.proto
-    quick-protobuf/examples/pb_rs_v3/*.proto
-    quick-protobuf/tests/packed_primitives/*.proto
-    quick-protobuf/tests/rust_protobuf/common/*.proto
+    perftest/src
+    quick-protobuf/benches/perftest_data
+    quick-protobuf/examples/pb_rs
+    quick-protobuf/examples/pb_rs_v3
+    quick-protobuf/tests/packed_primitives
+    quick-protobuf/tests/rust_protobuf/common
 )
 
 for ps in "${proto_sets[@]}"; do
-    for proto in $ps; do
-        cargo run -p pb-rs "${base_dir}"/"${proto}"
-    done
+  cargo run -p pb-rs -- -I "$ps" -d "$ps" "$ps"/*.proto
 done
 
 
 rm -rf quick-protobuf/examples/pb_rs_v3/owned
 mkdir -p quick-protobuf/examples/pb_rs_v3/owned
-for proto in quick-protobuf/examples/pb_rs_v3/*.proto; do
-    (
-        cargo run -p pb-rs "${base_dir}"/"${proto}" \
-              --owned \
-              --output_directory "${base_dir}"/quick-protobuf/examples/pb_rs_v3/owned
-    )
-done
+cargo run -p pb-rs quick-protobuf/examples/pb_rs_v3/*.proto \
+  -I quick-protobuf/examples/pb_rs_v3 \
+  --owned \
+  --output_directory quick-protobuf/examples/pb_rs_v3/owned
 
 
 # cd ../examples/codegen