@@ -105,12 +105,12 @@ $(BIN)/protoc: | $(BIN)
105105 cp $(BIN ) /protoc-zip/bin/protoc $(BIN ) /protoc
106106
107107# any generated file - they all depend on each other / are generated at once, so any will work
108- PROTO_GEN_SRC = ./. gen/proto/admin/v1/service.pb.go
108+ PROTO_GEN_SRC = ./gen/proto/admin/v1/service.pb.go
109109
110- THRIFT_GENDIR =. gen/go
110+ THRIFT_GENDIR =gen/go
111111THRIFT_SRCS := $(shell find idls -name '* .thrift')
112112# concrete targets to build / the "sentinel" go files that need to be produced per thrift file.
113- # idls/thrift/thing.thrift -> thing.thrift -> thing -> ./. gen/go/thing/thing.go
113+ # idls/thrift/thing.thrift -> thing.thrift -> thing -> ./gen/go/thing/thing.go
114114THRIFT_GEN_SRC := $(foreach tsrc,$(basename $(subst idls/thrift/,,$(THRIFT_SRCS ) ) ) ,./$(THRIFT_GENDIR ) /$(tsrc ) /$(tsrc ) .go)
115115
116116# this is a "false" dependency chain, but it convinces make that "need to make thriftrw(-plugin-yarpc)"
@@ -130,7 +130,7 @@ $(THRIFT_SRCS): $(BIN)/thriftrw $(BIN)/thriftrw-plugin-yarpc
130130# how to generate each thrift file.
131131# note that each generated file depends on ALL thrift files - this is necessary because they can import each other.
132132$(THRIFT_GEN_SRC ) : $(THRIFT_SRCS ) go.mod
133- @# . gen/go/thing/thing.go -> thing.go -> "thing " -> thing -> idls/thrift/thing.thrift
133+ @# gen/go/thing/thing.go -> thing.go -> "thing " -> thing -> idls/thrift/thing.thrift
134134 @echo ' thriftrw for idls/thrift/$(strip $(basename $(notdir $@))).thrift...'
135135 @$(BIN_PATH ) $(BIN ) /thriftrw \
136136 --plugin=yarpc \
@@ -163,7 +163,7 @@ ALL_SRC := $(FRESH_ALL_SRC)
163163ALL_SRC += $(THRIFT_GEN_SRC )
164164ALL_SRC += $(PROTO_GEN_SRC )
165165ALL_SRC := $(sort $(ALL_SRC ) ) # dedup
166- LINT_SRC := $(filter-out % _test.go ./. gen/% , $(ALL_SRC ) )
166+ LINT_SRC := $(filter-out % _test.go ./gen/% , $(ALL_SRC ) )
167167# all directories with *_test.go files in them (exclude host/xdc)
168168TEST_DIRS := $(filter-out $(INTEG_TEST_XDC_ROOT ) % , $(sort $(dir $(filter % _test.go,$(ALL_SRC ) ) ) ) )
169169# all tests other than end-to-end integration test fall into the pkg_test category
@@ -201,7 +201,7 @@ thriftc: $(THRIFT_GEN_SRC) copyright ## rebuild thrift-generated source files
201201proto : proto-lint proto-compile fmt copyright
202202
203203PROTO_ROOT := proto
204- PROTO_OUT := . gen/proto
204+ PROTO_OUT := gen/proto
205205PROTO_FILES = $(shell find ./$(PROTO_ROOT ) -name "* .proto" | grep -v "persistenceblobs")
206206PROTO_DIRS = $(sort $(dir $(PROTO_FILES ) ) )
207207
@@ -342,13 +342,13 @@ cover_ndc_profile: clean bins_nothrift
342342
343343$(COVER_ROOT ) /cover.out : $(UNIT_COVER_FILE ) $(INTEG_COVER_FILE_CASS ) $(INTEG_COVER_FILE_MYSQL ) $(INTEG_COVER_FILE_POSTGRES ) $(INTEG_NDC_COVER_FILE_CASS ) $(INTEG_NDC_COVER_FILE_MYSQL ) $(INTEG_NDC_COVER_FILE_POSTGRES )
344344 @echo " mode: atomic" > $(COVER_ROOT ) /cover.out
345- cat $(UNIT_COVER_FILE ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
346- cat $(INTEG_COVER_FILE_CASS ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
347- cat $(INTEG_COVER_FILE_MYSQL ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
348- cat $(INTEG_COVER_FILE_POSTGRES ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
349- cat $(INTEG_NDC_COVER_FILE_CASS ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
350- cat $(INTEG_NDC_COVER_FILE_MYSQL ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
351- cat $(INTEG_NDC_COVER_FILE_POSTGRES ) | grep -v " ^mode: \w\+" | grep -vP " . gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
345+ cat $(UNIT_COVER_FILE ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
346+ cat $(INTEG_COVER_FILE_CASS ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
347+ cat $(INTEG_COVER_FILE_MYSQL ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
348+ cat $(INTEG_COVER_FILE_POSTGRES ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
349+ cat $(INTEG_NDC_COVER_FILE_CASS ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
350+ cat $(INTEG_NDC_COVER_FILE_MYSQL ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
351+ cat $(INTEG_NDC_COVER_FILE_POSTGRES ) | grep -v " ^mode: \w\+" | grep -vP " gen|[Mm]ock[s]?" >> $(COVER_ROOT ) /cover.out
352352
353353cover : $(COVER_ROOT ) /cover.out
354354 go tool cover -html=$(COVER_ROOT ) /cover.out;
0 commit comments