MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from harshavardhana/pr_out_remove_dependency_on_minio_cli_for_make_go_fixes_738 

Remove dependency on minio/cli for make.go fixes #738
This commit is contained in:
Harshavardhana 2015-07-13 18:41:21 +00:00
parent dfa43f7982 1e80925ca7
commit 70e56dc594
3 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -33,13 +33,13 @@ cyclo:
gomake-all: getdeps verifiers gomake-all: getdeps verifiers
@echo "Installing minio:" @echo "Installing minio:"
@go run make.go install @go run make.go -install
@go run cmd/mkdonut/make.go install @go run cmd/mkdonut/make.go -install
release: getdeps verifiers release: getdeps verifiers
@echo "Installing minio:" @echo "Installing minio:"
@go run make.go release @go run make.go -release
@go run make.go install @go run make.go -install
godepupdate: godepupdate:
@for i in $(grep ImportPath Godeps/Godeps.json | grep -v minio/minio | cut -f2 -d: | sed -e 's/,//' -e 's/^[ \t]*//' -e 's/[ \t]*$//' -e 's/\"//g'); do godep update $i; done @for i in $(grep ImportPath Godeps/Godeps.json | grep -v minio/minio | cut -f2 -d: | sed -e 's/,//' -e 's/^[ \t]*//' -e 's/[ \t]*$//' -e 's/\"//g'); do godep update $i; done

35
cmd/mkdonut/make.go
View File

@ -20,13 +20,12 @@ package main
import ( import (
"bytes" "bytes"
"flag"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"text/template" "text/template"
"time" "time"
"github.com/minio/cli"
) )
type Version struct { type Version struct {
@ -86,10 +85,7 @@ func (c command) String() string {
return message return message
} }
func runMkdonutInstall(ctx *cli.Context) { func runMkdonutInstall() {
if ctx.Args().First() == "help" {
cli.ShowCommandHelpAndExit(ctx, "install", 1) // last argument is exit code
}
mkdonutInstall := command{exec.Command("godep", "go", "install", "-a", "github.com/minio/minio/cmd/mkdonut"), &bytes.Buffer{}, &bytes.Buffer{}} mkdonutInstall := command{exec.Command("godep", "go", "install", "-a", "github.com/minio/minio/cmd/mkdonut"), &bytes.Buffer{}, &bytes.Buffer{}}
mkdonutInstallErr := mkdonutInstall.runCommand() mkdonutInstallErr := mkdonutInstall.runCommand()
if mkdonutInstallErr != nil { if mkdonutInstallErr != nil {
@ -99,10 +95,7 @@ func runMkdonutInstall(ctx *cli.Context) {
fmt.Print(mkdonutInstall) fmt.Print(mkdonutInstall)
} }
func runMkdonutRelease(ctx *cli.Context) { func runMkdonutRelease() {
if ctx.Args().First() == "help" {
cli.ShowCommandHelpAndExit(ctx, "release", 1) // last argument is exit code
}
t := time.Now().UTC() t := time.Now().UTC()
date := t.Format(time.RFC3339Nano) date := t.Format(time.RFC3339Nano)
version := Version{Date: date} version := Version{Date: date}
@ -114,17 +107,15 @@ func runMkdonutRelease(ctx *cli.Context) {
} }
func main() { func main() {
app := cli.NewApp() releaseFlag := flag.Bool("release", false, "make a release")
app.Commands = []cli.Command{ installFlag := flag.Bool("install", false, "install mkdonut")
{
Name: "release", flag.Parse()
Action: runMkdonutRelease,
}, if *releaseFlag {
{ runMkdonutRelease()
Name: "install", }
Action: runMkdonutInstall, if *installFlag {
}, runMkdonutInstall()
} }
app.Author = "Minio.io"
app.RunAndExitOnError()
} }

35
make.go
View File

@ -20,13 +20,12 @@ package main
import ( import (
"bytes" "bytes"
"flag"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"text/template" "text/template"
"time" "time"
"github.com/minio/cli"
) )
type Version struct { type Version struct {
@ -87,10 +86,7 @@ func (c command) String() string {
return message return message
} }
func runMinioInstall(ctx *cli.Context) { func runMinioInstall() {
if ctx.Args().First() == "help" {
cli.ShowCommandHelpAndExit(ctx, "install", 1) // last argument is exit code
}
minioGenerate := command{exec.Command("godep", "go", "generate", "./..."), &bytes.Buffer{}, &bytes.Buffer{}} minioGenerate := command{exec.Command("godep", "go", "generate", "./..."), &bytes.Buffer{}, &bytes.Buffer{}}
minioBuild := command{exec.Command("godep", "go", "build", "-a", "./..."), &bytes.Buffer{}, &bytes.Buffer{}} minioBuild := command{exec.Command("godep", "go", "build", "-a", "./..."), &bytes.Buffer{}, &bytes.Buffer{}}
minioTest := command{exec.Command("godep", "go", "test", "-race", "./..."), &bytes.Buffer{}, &bytes.Buffer{}} minioTest := command{exec.Command("godep", "go", "test", "-race", "./..."), &bytes.Buffer{}, &bytes.Buffer{}}
@ -121,10 +117,7 @@ func runMinioInstall(ctx *cli.Context) {
fmt.Print(minioInstall) fmt.Print(minioInstall)
} }
func runMinioRelease(ctx *cli.Context) { func runMinioRelease() {
if ctx.Args().First() == "help" {
cli.ShowCommandHelpAndExit(ctx, "release", 1) // last argument is exit code
}
t := time.Now().UTC() t := time.Now().UTC()
date := t.Format(time.RFC3339Nano) date := t.Format(time.RFC3339Nano)
version := Version{Date: date} version := Version{Date: date}
@ -136,17 +129,15 @@ func runMinioRelease(ctx *cli.Context) {
} }
func main() { func main() {
app := cli.NewApp() releaseFlag := flag.Bool("release", false, "make a release")
app.Commands = []cli.Command{ installFlag := flag.Bool("install", false, "install minio")
{
Name: "release", flag.Parse()
Action: runMinioRelease,
}, if *releaseFlag {
{ runMinioRelease()
Name: "install", }
Action: runMinioInstall, if *installFlag {
}, runMinioInstall()
} }
app.Author = "Minio.io"
app.RunAndExitOnError()
} }