浏览代码

Merge pull request #826 from chipitsine/issue_689

Merge PR #826: missing warning_ru.txt which caused null pointer dereference
Ilya Shipitsin 7 年之前
父节点
当前提交
cbaf198bd1
共有 3 个文件被更改,包括 150 次插入0 次删除
  1. 2 0
      src/BuildUtil/BuildUtilCommands.cs
  2. 11 0
      src/BuildUtil/UnixBuildSoftwares.cs
  3. 137 0
      src/bin/hamcore/warning_ru.txt

+ 2 - 0
src/BuildUtil/BuildUtilCommands.cs

@@ -535,6 +535,8 @@ namespace BuildUtil
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_ja.txt")), true);
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_ja.txt")), true);
 			zip.AddFileSimple("ReadMeFirst_Important_Notices_en.txt", DateTime.Now, FileAttributes.Normal,
 			zip.AddFileSimple("ReadMeFirst_Important_Notices_en.txt", DateTime.Now, FileAttributes.Normal,
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_en.txt")), true);
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_en.txt")), true);
+			zip.AddFileSimple("ReadMeFirst_Important_Notices_ru.txt", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_ru.txt")), true);
 			zip.AddFileSimple("ReadMeFirst_Important_Notices_cn.txt", DateTime.Now, FileAttributes.Normal,
 			zip.AddFileSimple("ReadMeFirst_Important_Notices_cn.txt", DateTime.Now, FileAttributes.Normal,
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_cn.txt")), true);
 				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_cn.txt")), true);
 			zip.Finish();
 			zip.Finish();

+ 11 - 0
src/BuildUtil/UnixBuildSoftwares.cs

@@ -308,6 +308,17 @@ namespace BuildUtil
 				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_en.txt", destData, 0, destData.Length, DateTime.Now);
 				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_en.txt", destData, 0, destData.Length, DateTime.Now);
 			}
 			}
 
 
+			if (true)
+			{
+				string srcData = File.ReadAllText(Path.Combine(Paths.BinDirName, @"hamcore\warning_ru.txt"),
+					enc);
+
+				byte[] destData = enc.GetBytes(srcData);
+
+				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_ru.txt", destData, 0, destData.Length, DateTime.Now);
+			}
+
+
 			if (true)
 			if (true)
 			{
 			{
 				string srcData = File.ReadAllText(Path.Combine(Paths.BinDirName, @"hamcore\warning_cn.txt"),
 				string srcData = File.ReadAllText(Path.Combine(Paths.BinDirName, @"hamcore\warning_cn.txt"),

文件差异内容过多而无法显示
+ 137 - 0
src/bin/hamcore/warning_ru.txt


部分文件因为文件数量过多而无法显示