Skip to content

Commit 9940d17

Browse files
committed
[build] Ensure the ddsched protofile is correctly patched
1 parent cb4ebcb commit 9940d17

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,10 @@ vendor:
155155
# we insert a go_package specification into the ODC protofile right
156156
# after we download it.
157157
@echo -e "\033[1;33mpatch odc.proto\033[0m"
158-
@perl -pi -e '$$_.="option go_package = \"protos;odc\";\n" if (/^package/)' core/integration/odc/protos/odc.proto
158+
@perl -pi -e '$$_.="option go_package = \"github.com/AliceO2Group/Control/core/integration/odc/protos;odc\";\n" if (/^package/)' core/integration/odc/protos/odc.proto
159+
160+
@echo -e "\033[1;33mpatch ddsched.proto\033[0m"
161+
@perl -pi -e '$$_.="option go_package = \"github.com/AliceO2Group/Control/core/integration/ddsched/protos;ddpb\";\n" if (/^package/)' core/integration/ddsched/protos/ddsched.proto
159162

160163
# vendor: tools/dep
161164
# @echo -e "\033[1;33mdep ensure\033[0m"

core/integration/ddsched/protos/ddsched.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
syntax = "proto3";
2-
option go_package = "github.com/AliceO2Group/Control/core/integration/ddsched/protos;ddpb";
32

43
// Changelog:
54
// 2021-02-08: - Initial version
65
// - Support for a single partition/environment: PartitionID = EnvironmentID
76

87

98
package o2.DataDistribution.Control;
9+
option go_package = "github.com/AliceO2Group/Control/core/integration/ddsched/protos;ddpb";
1010

1111
service DataDistributionControl {
1212

0 commit comments

Comments
 (0)