Skip to content

Commit

Permalink
renamed .gen/go to gen/thrift
Browse files Browse the repository at this point in the history
  • Loading branch information
Groxx committed Feb 23, 2021
1 parent 42f6cac commit 04ea201
Show file tree
Hide file tree
Showing 108 changed files with 241 additions and 194 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
default: test

IMPORT_ROOT := go.uber.org/cadence
THRIFT_GENDIR := .gen/go
THRIFT_GENDIR := gen/thrift
THRIFTRW_SRC := idls/thrift/cadence.thrift
# one or more thriftrw-generated file(s), to create / depend on generated code
THRIFTRW_OUT := $(THRIFT_GENDIR)/cadence/idl.go
Expand All @@ -25,7 +25,7 @@ INTEG_STICKY_ON_COVER_FILE := $(COVER_ROOT)/integ_test_sticky_on_cover.out
ALL_SRC := $(THRIFTRW_OUT) $(shell \
find . -name "*.go" | \
grep -v \
-e .gen/ \
-e gen/ \
-e .build/ \
)

Expand Down Expand Up @@ -68,7 +68,7 @@ yarpc-install: $(BINS)/thriftrw $(BINS)/thriftrw-plugin-yarpc
thriftc: git-submodules yarpc-install $(THRIFTRW_OUT) copyright

clean_thrift:
rm -rf .gen
rm -rf gen

# `make copyright` or depend on "copyright" to force-run licensegen,
# or depend on $(BUILD)/copyright to let it run as needed.
Expand Down Expand Up @@ -103,9 +103,9 @@ test: thriftc unit_test integ_test_sticky_off integ_test_sticky_on

$(COVER_ROOT)/cover.out: $(UT_COVER_FILE) $(INTEG_STICKY_OFF_COVER_FILE) $(INTEG_STICKY_ON_COVER_FILE)
@echo "mode: atomic" > $(COVER_ROOT)/cover.out
cat $(UT_COVER_FILE) | grep -v "mode: atomic" | grep -v ".gen" >> $(COVER_ROOT)/cover.out
cat $(INTEG_STICKY_OFF_COVER_FILE) | grep -v "mode: atomic" | grep -v ".gen" >> $(COVER_ROOT)/cover.out
cat $(INTEG_STICKY_ON_COVER_FILE) | grep -v "mode: atomic" | grep -v ".gen" >> $(COVER_ROOT)/cover.out
cat $(UT_COVER_FILE) | grep -v "mode: atomic" | grep -v "gen" >> $(COVER_ROOT)/cover.out
cat $(INTEG_STICKY_OFF_COVER_FILE) | grep -v "mode: atomic" | grep -v "gen" >> $(COVER_ROOT)/cover.out
cat $(INTEG_STICKY_ON_COVER_FILE) | grep -v "mode: atomic" | grep -v "gen" >> $(COVER_ROOT)/cover.out

cover: $(COVER_ROOT)/cover.out
go tool cover -html=$(COVER_ROOT)/cover.out;
Expand Down Expand Up @@ -150,7 +150,7 @@ fmt:

clean:
rm -Rf $(BUILD)
rm -Rf .gen
rm -Rf gen

# broken up into multiple += so I can interleave comments.
# this all becomes a single line of output.
Expand Down
4 changes: 2 additions & 2 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ package client
import (
"context"

"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
s "go.uber.org/cadence/.gen/go/shared"
"go.uber.org/cadence/encoded"
"go.uber.org/cadence/gen/thrift/cadence/workflowserviceclient"
s "go.uber.org/cadence/gen/thrift/shared"
"go.uber.org/cadence/internal"
"go.uber.org/cadence/workflow"
)
Expand Down
2 changes: 1 addition & 1 deletion error.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package cadence

import (
"go.uber.org/cadence/.gen/go/shared"
"go.uber.org/cadence/gen/thrift/shared"
"go.uber.org/cadence/internal"
"go.uber.org/cadence/workflow"
)
Expand Down
4 changes: 2 additions & 2 deletions evictiontest/workflow_cache_eviction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/suite"
"go.uber.org/atomic"
"go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
m "go.uber.org/cadence/.gen/go/shared"
"go.uber.org/cadence/gen/thrift/cadence/workflowservicetest"
m "go.uber.org/cadence/gen/thrift/shared"
"go.uber.org/cadence/internal"
"go.uber.org/cadence/internal/common"
"go.uber.org/cadence/worker"
Expand Down
6 changes: 3 additions & 3 deletions .gen/go/cadence/idl.go → gen/thrift/cadence/idl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 04ea201

Please sign in to comment.