add string.convert

3 files changed, 15 insertions, 3 deletions

diff --git a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
index ddc34a8c6..b2c9e7705 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua
@@ -103,7 +103,8 @@ function make(vsinfo)
     vsinfo.solution_name = project.name() or "vs" .. vsinfo.vstudio_version
 
     -- open solution file
-    local slnfile = vsfile.open(path.join(vsinfo.solution_dir, vsinfo.solution_name .. ".sln"), "w")
+    local slnpath = path.join(vsinfo.solution_dir, vsinfo.solution_name .. ".sln")
+    local slnfile = vsfile.open(slnpath, "w")
 
     -- init indent character
     vsfile.indentchar('\t')
@@ -119,4 +120,7 @@ function make(vsinfo)
 
     -- exit solution file
     slnfile:close()
+
+    -- convert gb2312 to utf8
+    io.writefile(slnpath, io.readfile(slnpath):convert("gb2312", "utf8"))
 end
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 967c52cb7..7fc12a53a 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -705,7 +705,8 @@ function make(vsinfo, target)
     local vcxprojdir = path.join(vsinfo.solution_dir, targetname)
 
     -- open vcxproj file
-    local vcxprojfile = vsfile.open(path.join(vcxprojdir, targetname .. ".vcxproj"), "w")
+    local vcxprojpath = path.join(vcxprojdir, targetname .. ".vcxproj")
+    local vcxprojfile = vsfile.open(vcxprojpath, "w")
 
     -- init indent character
     vsfile.indentchar('  ')
@@ -727,4 +728,7 @@ function make(vsinfo, target)
 
     -- exit solution file
     vcxprojfile:close()
+
+    -- convert gb2312 to utf8
+    io.writefile(vcxprojpath, io.readfile(vcxprojpath):convert("gb2312", "utf8"))
 end
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
index 714c7b788..9bcaad9ec 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
@@ -137,7 +137,8 @@ function make(vsinfo, target)
     local vcxprojdir = path.join(vsinfo.solution_dir, targetname)

 

     -- open vcxproj.filters file

-    local filtersfile = vsfile.open(path.join(vcxprojdir, targetname .. ".vcxproj.filters"), "w")

+    local filterspath = path.join(vcxprojdir, targetname .. ".vcxproj.filters")

+    local filtersfile = vsfile.open(filterspath, "w")

 

     -- init indent character

     vsfile.indentchar('  ')

@@ -159,4 +160,7 @@ function make(vsinfo, target)
 

     -- exit solution file

     filtersfile:close()

+

+    -- convert gb2312 to utf8

+    io.writefile(filterspath, io.readfile(filterspath):convert("gb2312", "utf8"))

 end