add support for mcs build to trim gopaths (#60)
also remove `version` sub-command as we don't use this anymore, just use `mcs --version`
This commit is contained in:
20
Makefile
20
Makefile
@@ -1,23 +1,33 @@
|
|||||||
|
PWD := $(shell pwd)
|
||||||
|
GOPATH := $(shell go env GOPATH)
|
||||||
|
|
||||||
default: mcs
|
default: mcs
|
||||||
|
|
||||||
.PHONY: mcs
|
.PHONY: mcs
|
||||||
mcs:
|
mcs:
|
||||||
@echo "Building mcs binary to './mcs'"
|
@echo "Building mcs binary to './mcs'"
|
||||||
@(CGO_ENABLED=0 go build --tags=kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
|
@(CGO_ENABLED=0 go build -trimpath --tags=kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
|
||||||
|
|
||||||
|
install: mcs
|
||||||
|
@echo "Installing mcs binary to '$(GOPATH)/bin/mcs'"
|
||||||
|
@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/mcs $(GOPATH)/bin/mcs
|
||||||
|
@echo "Installation successful. To learn more, try \"mcs --help\"."
|
||||||
|
|
||||||
swagger-gen:
|
swagger-gen:
|
||||||
@echo "Generating swagger server code from yaml"
|
@echo "Generating swagger server code from yaml"
|
||||||
@swagger generate server -A mcs --main-package=mcs --exclude-main -P models.Principal -f ./swagger.yml -r NOTICE
|
@swagger generate server -A mcs --main-package=mcs --exclude-main -P models.Principal -f ./swagger.yml -r NOTICE
|
||||||
|
|
||||||
build:
|
assets:
|
||||||
@(cd portal-ui; yarn install; make build-static; cd ..)
|
@(cd portal-ui; yarn install; make build-static; cd ..)
|
||||||
@(CGO_ENABLED=0 go build --tags kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@(go test ./restapi -v)
|
@(go test -race -v github.com/minio/mcs/restapi/...)
|
||||||
|
|
||||||
coverage:
|
coverage:
|
||||||
@(go test ./restapi -v -coverprofile=coverage.out && go tool cover -html=coverage.out && open coverage.html)
|
@(go test -v -coverprofile=coverage.out github.com/minio/mcs/restapi/... && go tool cover -html=coverage.out && open coverage.html)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
@echo "Cleaning up all the generated files"
|
||||||
|
@find . -name '*.test' | xargs rm -fv
|
||||||
|
@find . -name '*~' | xargs rm -fv
|
||||||
@rm -vf mcs
|
@rm -vf mcs
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ VERSION:
|
|||||||
|
|
||||||
var appCmds = []cli.Command{
|
var appCmds = []cli.Command{
|
||||||
serverCmd,
|
serverCmd,
|
||||||
versionCmd,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func newApp(name string) *cli.App {
|
func newApp(name string) *cli.App {
|
||||||
@@ -106,7 +105,7 @@ func newApp(name string) *cli.App {
|
|||||||
app.Name = name
|
app.Name = name
|
||||||
app.Version = pkg.Version
|
app.Version = pkg.Version
|
||||||
app.Author = "MinIO, Inc."
|
app.Author = "MinIO, Inc."
|
||||||
app.Usage = "mcs COMMAND"
|
app.Usage = "mcs"
|
||||||
app.Description = `MinIO Console Server`
|
app.Description = `MinIO Console Server`
|
||||||
app.Commands = commands
|
app.Commands = commands
|
||||||
app.HideHelpCommand = true // Hide `help, h` command, we already have `minio --help`.
|
app.HideHelpCommand = true // Hide `help, h` command, we already have `minio --help`.
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
// This file is part of MinIO Console Server
|
|
||||||
// Copyright (c) 2020 MinIO, Inc.
|
|
||||||
//
|
|
||||||
// This program is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU Affero General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU Affero General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/minio/cli"
|
|
||||||
"github.com/minio/mcs/pkg"
|
|
||||||
)
|
|
||||||
|
|
||||||
// starts the server
|
|
||||||
var versionCmd = cli.Command{
|
|
||||||
Name: "version",
|
|
||||||
Usage: "shows mcs version",
|
|
||||||
Action: version,
|
|
||||||
}
|
|
||||||
|
|
||||||
// starts the controller
|
|
||||||
func version(ctx *cli.Context) error {
|
|
||||||
fmt.Printf("MCS version %s (%s - %s. Commit %s)", pkg.Version, pkg.ReleaseTag, pkg.ReleaseTime, pkg.CommitID)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user