Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dex
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
dex
Commits
ac4f94e8
Commit
ac4f94e8
authored
Oct 04, 2016
by
Eric Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: add gRPC generation logic to build system
parent
0ea891b2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
7 deletions
+52
-7
Makefile
Makefile
+24
-7
get-protoc
scripts/get-protoc
+28
-0
No files found.
Makefile
View file @
ac4f94e8
...
@@ -8,21 +8,26 @@ VERSION=$(shell ./scripts/git-version)
...
@@ -8,21 +8,26 @@ VERSION=$(shell ./scripts/git-version)
DOCKER_REPO
=
quay.io/ericchiang/dex
DOCKER_REPO
=
quay.io/ericchiang/dex
DOCKER_IMAGE
=
$(DOCKER_REPO)
:
$(VERSION)
DOCKER_IMAGE
=
$(DOCKER_REPO)
:
$(VERSION)
$(
shell
mkdir
-p
bin
)
export
GOBIN
=
$(PWD)
/bin
export
GOBIN
=
$(PWD)
/bin
# Prefer ./bin instead of system packages for things like protoc, where we want
# to use the version dex uses, not whatever a developer has installed.
export
PATH
=
$(GOBIN)
:
$(
shell
printenv
PATH
)
export
GO15VENDOREXPERIMENT
=
1
export
GO15VENDOREXPERIMENT
=
1
LD_FLAGS
=
"-w -X
$(REPO_PATH)
/version.Version=
$(VERSION)
"
LD_FLAGS
=
"-w -X
$(REPO_PATH)
/version.Version=
$(VERSION)
"
GOOS
=
$(
shell
go
env
GOOS
)
GOARCH
=
$(
shell
go
env
GOARCH
)
build
:
bin/dex bin/example-app
build
:
bin/dex bin/example-app
bin/dex
:
FORCE
server/templates_default.go
bin/dex
:
FORCE
generated
@
go
install
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/dex
@
go
install
-
v
-
ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/dex
bin/example-app
:
FORCE
bin/example-app
:
FORCE
@
go
install
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/example-app
@
go
install
-v
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/example-app
.PHONY
:
generated
generated
:
server/templates_default.go
test
:
test
:
@
go
test
-v
-i
$(
shell
go list ./... |
grep
-v
'/vendor/'
)
@
go
test
-v
-i
$(
shell
go list ./... |
grep
-v
'/vendor/'
)
...
@@ -39,7 +44,7 @@ fmt:
...
@@ -39,7 +44,7 @@ fmt:
@
go
fmt
$(
shell
go list ./... |
grep
-v
'/vendor/'
)
@
go
fmt
$(
shell
go list ./... |
grep
-v
'/vendor/'
)
lint
:
lint
:
@
for
package
in
$(
shell
go list ./... |
grep
-v
'/vendor/'
|
grep
-v
'
api/apipb
'
)
;
do
\
@
for
package
in
$(
shell
go list ./... |
grep
-v
'/vendor/'
|
grep
-v
'
/api
'
)
;
do
\
golint
-set_exit_status
$$
package
;
\
golint
-set_exit_status
$$
package
;
\
done
done
...
@@ -56,6 +61,18 @@ docker-push: docker-build
...
@@ -56,6 +61,18 @@ docker-push: docker-build
@
docker push
$(DOCKER_IMAGE)
@
docker push
$(DOCKER_IMAGE)
@
docker push
$(DOCKER_REPO)
:latest
@
docker push
$(DOCKER_REPO)
:latest
.PHONY
:
grpc
grpc
:
api/api.pb.go
api/api.pb.go
:
api/api.proto bin/protoc bin/protoc-gen-go
@
protoc
--go_out
=
plugins
=
grpc:. api/
*
.proto
bin/protoc
:
scripts/get-protoc
@
./scripts/get-protoc bin/protoc
bin/protoc-gen-go
:
@
go
install
-v
$(REPO_PATH)
/vendor/github.com/golang/protobuf/protoc-gen-go
clean
:
clean
:
@
rm
bin/
*
@
rm
bin/
*
...
...
scripts/get-protoc
0 → 100755
View file @
ac4f94e8
#!/bin/bash -e
# This is a script to download protoc. Rather than depending on the version on
# a developer's machine, always download a specific version.
VERSION
=
"3.1.0"
if
[
$#
-ne
1
]
;
then
echo
"Usage: ./get-protoc [dest]"
exit
2
fi
# Use the go tool to determine OS.
OS
=
$(
go
env
GOOS
)
if
[
"
$OS
"
=
"darwin"
]
;
then
OS
=
"osx"
fi
# TODO(ericchiang): Architectures other than amd64?
ZIP
=
"protoc-
${
VERSION
}
-
${
OS
}
-x86_64.zip"
URL
=
"https://github.com/google/protobuf/releases/download/v
${
VERSION
}
/
${
ZIP
}
"
wget
${
URL
}
# Unpack the protoc binary. Later we might want to grab additional data.
unzip
-p
${
ZIP
}
bin/protoc
>
$1
chmod
+x
$1
rm
${
ZIP
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment