Browse Source

Chore: make internal/version

pull/133/head
xjasonlyu 3 years ago
parent
commit
4be2734b19
  1. 4
      Makefile
  2. 3
      engine/engine.go
  3. 0
      internal/version/version.go
  4. 2
      stats/server.go

4
Makefile

@ -11,8 +11,8 @@ CGO_ENABLED := 0
GO111MODULE := on
LDFLAGS += -w -s -buildid=
LDFLAGS += -X "$(MODULE)/version.Version=$(BUILD_VERSION)"
LDFLAGS += -X "$(MODULE)/version.GitCommit=$(BUILD_COMMIT)"
LDFLAGS += -X "$(MODULE)/internal/version.Version=$(BUILD_VERSION)"
LDFLAGS += -X "$(MODULE)/internal/version.GitCommit=$(BUILD_COMMIT)"
GO_BUILD = GO111MODULE=$(GO111MODULE) CGO_ENABLED=$(CGO_ENABLED) \
go build $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(BUILD_TAGS)' -trimpath

3
engine/engine.go

@ -9,12 +9,11 @@ import (
"github.com/xjasonlyu/tun2socks/v2/component/dialer"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/stack"
"github.com/xjasonlyu/tun2socks/v2/internal/version"
"github.com/xjasonlyu/tun2socks/v2/log"
"github.com/xjasonlyu/tun2socks/v2/proxy"
"github.com/xjasonlyu/tun2socks/v2/stats"
"github.com/xjasonlyu/tun2socks/v2/tunnel"
"github.com/xjasonlyu/tun2socks/v2/version"
"gopkg.in/yaml.v3"
)

0
version/version.go → internal/version/version.go

2
stats/server.go

@ -10,9 +10,9 @@ import (
"github.com/xjasonlyu/tun2socks/v2/internal/debug"
"github.com/xjasonlyu/tun2socks/v2/internal/module"
V "github.com/xjasonlyu/tun2socks/v2/internal/version"
"github.com/xjasonlyu/tun2socks/v2/log"
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
V "github.com/xjasonlyu/tun2socks/v2/version"
"github.com/go-chi/chi/v5"
"github.com/go-chi/cors"

Loading…
Cancel
Save