Re-organize proto directory structure. (#103)

build.gradle and BUILD.bazel/WORKSPACE should not be under the same
directory, since they expect different directory layout for proto files.
pull/109/head
Yang Song 6 years ago committed by GitHub
parent 91fbd9506c
commit d3b7200dbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .travis.yml
  2. 5
      build.gradle
  3. 10
      pom.xml
  4. 0
      src/BUILD.bazel
  5. 0
      src/WORKSPACE
  6. 0
      src/mkgogen.sh
  7. 0
      src/opencensus/proto/agent/README.md
  8. 0
      src/opencensus/proto/agent/agent-architecture.png
  9. 0
      src/opencensus/proto/agent/common/v1/BUILD.bazel
  10. 0
      src/opencensus/proto/agent/common/v1/common.proto
  11. 0
      src/opencensus/proto/agent/trace/v1/BUILD.bazel
  12. 0
      src/opencensus/proto/agent/trace/v1/trace_service.proto
  13. 0
      src/opencensus/proto/exporter/v1/BUILD.bazel
  14. 0
      src/opencensus/proto/exporter/v1/exporter.proto
  15. 0
      src/opencensus/proto/metrics/v1/BUILD.bazel
  16. 0
      src/opencensus/proto/metrics/v1/metrics.proto
  17. 0
      src/opencensus/proto/stats/v1/BUILD.bazel
  18. 0
      src/opencensus/proto/stats/v1/stats.proto
  19. 0
      src/opencensus/proto/trace/v1/BUILD.bazel
  20. 0
      src/opencensus/proto/trace/v1/trace.proto
  21. 0
      src/opencensus/proto/trace/v1/trace_config.proto

@ -41,6 +41,7 @@ install:
script:
- case "$BUILD" in
"BAZEL")
cd src;
bazel build --show_result=100 ... ;;
"MVN")
mvn verify ;;

@ -23,10 +23,7 @@ buildscript {
sourceSets {
main {
proto {
// In addition to the default 'src/main/proto'
srcDir 'opencensus/proto/stats'
srcDir 'opencensus/proto/metrics'
srcDir 'opencensus/proto/trace'
srcDir "src"
}
}
}

@ -52,11 +52,11 @@
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>.</protoSourceRoot>
<includes>
<include>opencensus/proto/agent/*.proto</include>
<include>opencensus/proto/exporter/*.proto</include>
<include>opencensus/proto/stats/*.proto</include>
<include>opencensus/proto/metrics/*.proto</include>
<include>opencensus/proto/trace/*.proto</include>
<include>src/opencensus/proto/agent/*.proto</include>
<include>src/opencensus/proto/exporter/*.proto</include>
<include>src/opencensus/proto/stats/*.proto</include>
<include>src/opencensus/proto/metrics/*.proto</include>
<include>src/opencensus/proto/trace/*.proto</include>
</includes>
</configuration>
<executions>

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 149 KiB

Loading…
Cancel
Save