From 4dc52a2a944a15bee901c5ff34f01b164f7a66d3 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 5 Oct 2017 12:02:01 -0400 Subject: [PATCH] add deps --- .gitignore | 1 + Gopkg.lock | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Gopkg.toml | 82 ++++++++++++++++++++++++ Makefile | 11 ++-- 4 files changed, 273 insertions(+), 4 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml diff --git a/.gitignore b/.gitignore index ba9ccf6..1ca9428 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.idea /lbry +/vendor diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 0000000..378fab5 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,183 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" + +[[projects]] + name = "github.com/fsnotify/fsnotify" + packages = ["."] + revision = "629574ca2a5df945712d3079857300b5e4da0236" + version = "v1.4.2" + +[[projects]] + name = "github.com/garyburd/redigo" + packages = ["internal","redis"] + revision = "433969511232c397de61b1442f9fd49ec06ae9ba" + version = "v1.1.0" + +[[projects]] + branch = "master" + name = "github.com/go-errors/errors" + packages = ["."] + revision = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105" + +[[projects]] + branch = "master" + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "130e6b02ab059e7b717a096f397c5b60111cae74" + +[[projects]] + branch = "master" + name = "github.com/hashicorp/hcl" + packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"] + revision = "68e816d1c783414e79bc65b3994d9ab6b0a722ab" + +[[projects]] + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + branch = "master" + name = "github.com/kkdai/youtube" + packages = ["."] + revision = "ac4c6cefe62a7eb2e894cb37014ee63eb7c12b8e" + +[[projects]] + branch = "master" + name = "github.com/lbryio/lbryschema.go" + packages = ["pb"] + revision = "c62c175d8b8057768dc8692806a196ed773a0c4b" + +[[projects]] + name = "github.com/magiconair/properties" + packages = ["."] + revision = "be5ece7dd465ab0765a9682137865547526d1dfb" + version = "v1.7.3" + +[[projects]] + branch = "master" + name = "github.com/mitchellh/go-homedir" + packages = ["."] + revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" + +[[projects]] + branch = "master" + name = "github.com/mitchellh/mapstructure" + packages = ["."] + revision = "d0303fe809921458f417bcf828397a65db30a7e4" + +[[projects]] + name = "github.com/pelletier/go-toml" + packages = ["."] + revision = "16398bac157da96aa88f98a2df640c7f32af1da2" + version = "v1.0.1" + +[[projects]] + branch = "master" + name = "github.com/shopspring/decimal" + packages = ["."] + revision = "aed1bfe463fa3c9cc268d60dcc1491db613bff7e" + +[[projects]] + name = "github.com/sirupsen/logrus" + packages = ["."] + revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" + version = "v1.0.3" + +[[projects]] + branch = "master" + name = "github.com/spf13/afero" + packages = [".","mem"] + revision = "3de492c3cda9570c77bc1f495857bfbf4b760efd" + +[[projects]] + name = "github.com/spf13/cast" + packages = ["."] + revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" + version = "v1.1.0" + +[[projects]] + branch = "master" + name = "github.com/spf13/cobra" + packages = ["."] + revision = "d5bde60e022436203e377c47806e001418c16af3" + +[[projects]] + branch = "master" + name = "github.com/spf13/jwalterweatherman" + packages = ["."] + revision = "12bd96e66386c1960ab0f74ced1362f66f552f7b" + +[[projects]] + name = "github.com/spf13/pflag" + packages = ["."] + revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" + version = "v1.0.0" + +[[projects]] + name = "github.com/spf13/viper" + packages = ["."] + revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" + version = "v1.0.0" + +[[projects]] + branch = "master" + name = "github.com/ybbus/jsonrpc" + packages = ["."] + revision = "160c2ef8d9ec3b2d05dd534e08dceada46dfb763" + +[[projects]] + branch = "master" + name = "github.com/zeebo/bencode" + packages = ["."] + revision = "0e215062eeb15f2e5bdf04a4535d4ca3b8537e08" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3" + +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = ["context","context/ctxhttp"] + revision = "a04bdaca5b32abe1c069418fb7088ae607de5bd0" + +[[projects]] + branch = "master" + name = "golang.org/x/sys" + packages = ["unix","windows"] + revision = "314a259e304ff91bd6985da2a7149bbf91237993" + +[[projects]] + branch = "master" + name = "golang.org/x/text" + packages = ["internal/gen","internal/triegen","internal/ucd","transform","unicode/cldr","unicode/norm"] + revision = "d82c1812e304abfeeabd31e995a115a2855bf642" + +[[projects]] + branch = "master" + name = "google.golang.org/api" + packages = ["gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","youtube/v3"] + revision = "7a7376eff6a51c6a053fcf8e9e50bf01a20f2673" + +[[projects]] + branch = "v2" + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "23be144b9c949e092cb3dbf80a620c561d59604c1d34f54ed8d5447dd1409fa7" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 0000000..552388d --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,82 @@ + +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + + +[[constraint]] + name = "github.com/davecgh/go-spew" + version = "1.1.0" + +[[constraint]] + name = "github.com/garyburd/redigo" + version = "1.1.0" + +[[constraint]] + branch = "master" + name = "github.com/go-errors/errors" + +[[constraint]] + branch = "master" + name = "github.com/kkdai/youtube" + +[[constraint]] + branch = "master" + name = "github.com/lbryio/lbryschema.go" + +[[constraint]] + branch = "master" + name = "github.com/mitchellh/go-homedir" + +[[constraint]] + branch = "master" + name = "github.com/mitchellh/mapstructure" + +[[constraint]] + branch = "master" + name = "github.com/shopspring/decimal" + +[[constraint]] + name = "github.com/sirupsen/logrus" + version = "1.0.3" + +[[constraint]] + name = "github.com/spf13/cast" + version = "1.1.0" + +[[constraint]] + branch = "master" + name = "github.com/spf13/cobra" + +[[constraint]] + name = "github.com/spf13/viper" + version = "1.0.0" + +[[constraint]] + branch = "master" + name = "github.com/ybbus/jsonrpc" + +[[constraint]] + branch = "master" + name = "github.com/zeebo/bencode" + +[[constraint]] + branch = "master" + name = "google.golang.org/api" diff --git a/Makefile b/Makefile index 6386225..7413c46 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ BINARY=lbry DIR = $(shell cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +VENDOR_DIR = vendor VERSION=$(shell git --git-dir=${DIR}/.git describe --dirty --always) COMMIT=$(shell git --git-dir=${DIR}/.git rev-parse --short HEAD) @@ -12,11 +13,13 @@ LDFLAGS = -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT} -X main. .DEFAULT_GOAL: build -build: - CGO_ENABLED=0 go build ${LDFLAGS} -asmflags -trimpath -o ${DIR}/${BINARY} main.go +build: dep + CGO_ENABLED=0 go build ${LDFLAGS} -asmflags -trimpath=${DIR} -o ${DIR}/${BINARY} main.go -#dep: -# go get github.com/golang/dep/cmd/dep && dep ensure +dep: | $(VENDOR_DIR) + +$(VENDOR_DIR): + go get github.com/golang/dep/cmd/dep && dep ensure clean: if [ -f ${DIR}/${BINARY} ]; then rm ${DIR}/${BINARY}; fi