diff --git a/cmd/xgo/runtime_gen/core/version.go b/cmd/xgo/runtime_gen/core/version.go index 03e08dfa..946d28b9 100755 --- a/cmd/xgo/runtime_gen/core/version.go +++ b/cmd/xgo/runtime_gen/core/version.go @@ -7,8 +7,8 @@ import ( ) const VERSION = "1.0.25" -const REVISION = "6a13d77b507fde52f56e8fa8db12e89b2a325a5e+1" -const NUMBER = 197 +const REVISION = "4e6a5615d778b8909e3315a2ead323822581dd0e+1" +const NUMBER = 198 // these fields will be filled by compiler const XGO_VERSION = "" diff --git a/cmd/xgo/trace.go b/cmd/xgo/trace.go index 8d211b2f..916c21b7 100644 --- a/cmd/xgo/trace.go +++ b/cmd/xgo/trace.go @@ -407,7 +407,7 @@ func addBlankImports(goroot string, goBinary string, projectDir string, pkgArgs // no files continue } - srcFile := filepath.Join(pkg.Root, file) + srcFile := filepath.Join(pkg.Dir, file) dstFile := filepath.Join(tmpProjectDir, srcFile) err := filecopy.CopyFileAll(srcFile, dstFile) if err != nil { @@ -445,9 +445,9 @@ func isDir(path string) bool { } type GoListPkg struct { - Dir string + Dir string // real dir ImportPath string - Root string + Root string // project root Standard bool GoFiles []string TestGoFiles []string diff --git a/cmd/xgo/version.go b/cmd/xgo/version.go index 708721a8..5ff41c11 100644 --- a/cmd/xgo/version.go +++ b/cmd/xgo/version.go @@ -3,8 +3,8 @@ package main import "fmt" const VERSION = "1.0.25" -const REVISION = "6a13d77b507fde52f56e8fa8db12e89b2a325a5e+1" -const NUMBER = 197 +const REVISION = "4e6a5615d778b8909e3315a2ead323822581dd0e+1" +const NUMBER = 198 func getRevision() string { revSuffix := "" diff --git a/runtime/core/version.go b/runtime/core/version.go index 03e08dfa..946d28b9 100644 --- a/runtime/core/version.go +++ b/runtime/core/version.go @@ -7,8 +7,8 @@ import ( ) const VERSION = "1.0.25" -const REVISION = "6a13d77b507fde52f56e8fa8db12e89b2a325a5e+1" -const NUMBER = 197 +const REVISION = "4e6a5615d778b8909e3315a2ead323822581dd0e+1" +const NUMBER = 198 // these fields will be filled by compiler const XGO_VERSION = "" diff --git a/support/fileutil/path.go b/support/fileutil/path.go index 39ee3297..8a75b375 100644 --- a/support/fileutil/path.go +++ b/support/fileutil/path.go @@ -11,7 +11,7 @@ func CleanSpecial(path string) string { j++ continue } - if ch < 128 && !(ch == '_' || ch == '-' || (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) { + if ch < 128 && !(ch == '.' || ch == '_' || ch == '-' || (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) { continue } chars[j] = chars[i] diff --git a/support/fileutil/path_test.go b/support/fileutil/path_test.go index f33e9c84..d7e8c0e2 100644 --- a/support/fileutil/path_test.go +++ b/support/fileutil/path_test.go @@ -9,7 +9,8 @@ func TestCleanSpecial(t *testing.T) { Res string }{ {"", ""}, - {" ", "_"}, // space to _ + {" ", "_"}, // space to _ + {"._-", "._-"}, // ._- reserved {"/", ""}, {"/a", "a"}, {"C:/a", "Ca"}, // Windows