Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Another try at handling *.inc.js cleanly #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 21, 2015
Merged

Another try at handling *.inc.js cleanly #335

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c20fe8
return PackageData instead of build.Package from build.Import()
flimzy Oct 19, 2015
399990f
Rename JsFiles to JSFiles for consistency with Go norms.
flimzy Oct 18, 2015
4c19f4e
Find JSFiles in Import() and ImportDir(), not ImportPackage()
flimzy Oct 19, 2015
8c83af6
s/ImportPath/BuildImportPath/
flimzy Oct 20, 2015
73c9542
Ignore .inc.js files beginning with '.'
flimzy Oct 20, 2015
a74ee2a
Document Import() and ImportDir() functions
flimzy Oct 20, 2015
ee2186c
Rename variable from 'path' to 'dir'
flimzy Oct 20, 2015
e5aa7c2
Handle *.inc.js files in collectTests().
flimzy Oct 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
s/ImportPath/BuildImportPath/
  • Loading branch information
@flimzy
flimzy committed Oct 20, 2015
commit 8c83af6e8967589e6914247c592c7b48abc2dd11
6 changes: 3 additions & 3 deletions build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func NewSession(options *Options) *Session {
options: options,
Packages: make(map[string]*PackageData),
}
s.ImportContext = compiler.NewImportContext(s.ImportPackage)
s.ImportContext = compiler.NewImportContext(s.BuildImportPath)
if options.Watch {
if out, err := exec.Command("ulimit", "-n").Output(); err == nil {
if n, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil && n < 1024 {
Expand Down Expand Up @@ -371,7 +371,7 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
return s.WriteCommandPackage(pkg, pkgObj)
}

func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
func (s *Session) BuildImportPath(path string) (*compiler.Archive, error) {
if pkg, found := s.Packages[path]; found {
return pkg.Archive, nil
}
Expand Down Expand Up @@ -427,7 +427,7 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
if importedPkgPath == "unsafe" || ignored {
continue
}
_, err := s.ImportPackage(importedPkgPath)
_, err := s.BuildImportPath(importedPkgPath)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func main() {
}
for _, pkgPath := range pkgs {
pkgPath = filepath.ToSlash(pkgPath)
if _, err := s.ImportPackage(pkgPath); err != nil {
if _, err := s.BuildImportPath(pkgPath); err != nil {
return err
}
pkg := s.Packages[pkgPath]
Expand Down