use Dir instead of Root

xhd2015 · Apr 21, 2024 · 71d181d · 71d181d
1 parent ee13987
commit 71d181d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,8 @@ func TestCleanSpecial(t *testing.T) {
 		Res string
 	}{
 		{"", ""},
-		{" ", "_"}, // space to _
+		{" ", "_"},     // space to _
+		{"._-", "._-"}, // ._- reserved
 		{"/", ""},
 		{"/a", "a"},
 		{"C:/a", "Ca"}, // Windows