Browse Source

Merge branch 'dev' of github.com:gpmgo/gopm into dev

pull/103/head
Unknown 11 years ago
parent
commit
39b043eb32
  1. 2
      README.md
  2. 13
      cmd/gen.go
  3. 2
      gopm.go
  4. 1
      wercker.yml

2
README.md

@ -1,4 +1,4 @@
gopm - Go Package Manager
gopm - Go Package Manager [![wercker status](https://app.wercker.com/status/899e79d6738e606dab98c915a269d531/s/ "wercker status")](https://app.wercker.com/project/bykey/899e79d6738e606dab98c915a269d531)
=========================
![GPMGo_Logo](https://raw.github.com/gpmgo/gopmweb/master/static/img/gpmgo.png?raw=true)

13
cmd/gen.go

@ -41,6 +41,8 @@ Make sure you run this command in the root path of a go project.`,
},
}
var commonRes = []string{"views", "templates", "static", "public", "conf"}
func runGen(ctx *cli.Context) {
setup(ctx)
@ -55,7 +57,7 @@ func runGen(ctx *cli.Context) {
}
targetPath := parseTarget(gf.MustValue("target", "path"))
// Get dependencies.
// Get and set dependencies.
imports := doc.GetAllImports([]string{workDir}, targetPath, ctx.Bool("example"))
log.Log("%v", imports)
for _, p := range imports {
@ -71,6 +73,15 @@ func runGen(ctx *cli.Context) {
}
}
// Get and set resources.
res := make([]string, 0, len(commonRes))
for _, cr := range commonRes {
if com.IsExist(cr) {
res = append(res, cr)
}
}
gf.SetValue("res", "include", strings.Join(res, "|"))
err = goconfig.SaveConfigFile(gf, ".gopmfile")
if err != nil {
log.Error("gen", "Fail to save gopmfile:")

2
gopm.go

@ -29,7 +29,7 @@ import (
// Test that go1.1 tag above is included in builds. main.go refers to this definition.
const go11tag = true
const APP_VER = "0.6.3.0311"
const APP_VER = "0.6.3.0312"
// //cmd.CmdSearch,
// cmdClean,

1
wercker.yml

@ -0,0 +1 @@
box: wercker/default
Loading…
Cancel
Save