Skip to content

Commit

Permalink
Merge pull request #24 for v0.13.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
jeevatkm authored Dec 5, 2018
2 parents 58019f8 + a9025b3 commit f26cb36
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 35 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ _testmain.go
*.test
*.prof
*.bak

go.sum
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

### News

* `v0.13.1` [released](https://github.com/go-aah/tools/releases/tag/v0.13.1) and tagged on Dec 04, 2018.
* `v0.13.0` [released](https://github.com/go-aah/tools/releases/tag/v0.13.0) and tagged on Dec 02, 2018.
* `v0.12.2` [released](https://github.com/go-aah/tools/releases/tag/v0.12.2) and tagged on Jul 20, 2018.

Expand Down
7 changes: 4 additions & 3 deletions aah/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu
if mode {
cliLog.Infof("|-- Processing mount: '%s' <== '%s'", vroot, proot)
}
b, err := generateVFSSource(mode, vroot, proot, skipList, noGzipList)
b, err := generateVFSSource(mode, appBaseDir, vroot, proot, skipList, noGzipList)
if err != nil {
return err
}
Expand All @@ -53,7 +53,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu
// generateVFSSource method creates Virtual FileSystem (VFS) code
// to add files and directories within binary for configured Mount points
// on file aah.project.
func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) {
func generateVFSSource(mode bool, appBaseDir, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) {
err := skipList.Validate()
if err != nil {
return nil, err
Expand Down Expand Up @@ -87,7 +87,8 @@ func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, no
fpath = filepath.ToSlash(fpath)
fname := path.Base(fpath)
if skipList.Match(fname) {
if fname == "app" && strings.Contains(fpath, "/pages/") {
if fname == "app" && (strings.Contains(fpath, "/pages/") ||
fpath == filepath.ToSlash(appBaseDir)) {
goto sc
}

Expand Down
31 changes: 0 additions & 31 deletions aah/go.sum

This file was deleted.

2 changes: 1 addition & 1 deletion aah/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
)

// Version no. of aah framework CLI tool
var Version = "0.13.0"
var Version = "0.13.1"

var (
errVersionNotExists = errors.New("version not exists")
Expand Down

0 comments on commit f26cb36

Please sign in to comment.