v4.05-9416-beta

3 files changed, 97 insertions, 5 deletions

diff --git a/src/BuildUtil/BuildUtilCommands.cs b/src/BuildUtil/BuildUtilCommands.cs
index 2ba6f836..f244444c 100644
--- a/src/BuildUtil/BuildUtilCommands.cs
+++ b/src/BuildUtil/BuildUtilCommands.cs
@@ -487,9 +487,64 @@ namespace BuildUtil
 			txt.WriteLine("*");

 			txt.WriteLine();

 

+			string src_bindir = Path.Combine(Paths.BaseDirName, "bin");

+			string vpnsmgr_zip_filename_relative = @"Windows\Admin Tools\VPN Server Manager and Command-line Utility Package\";

+			vpnsmgr_zip_filename_relative += 

+#if BU_SOFTETHER

+				"softether-" + 

+#endif	// BU_SOFTETHER

+			string.Format("vpn_admin_tools-v{0}.{1:D2}-{2}-{3}-{4:D4}.{5:D2}.{6:D2}-win32.zip",

+				version / 100, version % 100, build, name,

+				date.Year, date.Month, date.Day);

+

+			string vpnsmgr_zip_filename_full = Path.Combine(Path.Combine(publicDir, cddir), vpnsmgr_zip_filename_relative);

+

+			ZipPacker zip = new ZipPacker();

+			zip.AddFileSimple("vpnsmgr.exe", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, "vpnsmgr.exe")), true);

+			zip.AddFileSimple("vpncmd.exe", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, "vpncmd.exe")), true);

+			zip.AddFileSimple("hamcore.se2", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, @"BuiltHamcoreFiles\hamcore_win32\hamcore.se2")), true);

+			zip.AddFileSimple("ReadMeFirst_License.txt", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\eula.txt")), true);

+			zip.AddFileSimple("ReadMeFirst_Important_Notices_ja.txt", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_ja.txt")), true);

+			zip.AddFileSimple("ReadMeFirst_Important_Notices_en.txt", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_en.txt")), true);

+			zip.AddFileSimple("ReadMeFirst_Important_Notices_cn.txt", DateTime.Now, FileAttributes.Normal,

+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_cn.txt")), true);

+			zip.Finish();

+			byte[] zip_data = zip.GeneratedData.Read();

+			IO.MakeDirIfNotExists(Path.GetDirectoryName(vpnsmgr_zip_filename_full));

+			IO.SaveFile(vpnsmgr_zip_filename_full, zip_data);

+

+			// ZIP package for VPN Server Manager GUI

+			txt.WriteLine("FILENAME\t" + Str.ReplaceStr(vpnsmgr_zip_filename_relative, @"\", "/"));

+#if BU_SOFTETHER

+			txt.WriteLine("DESCRIPTION\t" + "ZIP Package of vpnsmgr.exe and vpncmd.exe (without installers)");

+			txt.WriteLine("CATEGORY\t" + "SoftEther VPN (Freeware)");

+			txt.WriteLine("PRODUCT\t" + "SoftEther VPN Server Manager for Windows, SoftEther VPN Command-Line Admin Utility (vpncmd)");

+#else	// BU_SOFTETHER

+			txt.WriteLine("DESCRIPTION\t" + "ZIP Package of vpnsmgr.exe and vpncmd.exe (without installers)");

+			txt.WriteLine("CATEGORY\t" + "PacketiX VPN (Commercial)");

+			txt.WriteLine("PRODUCT\t" + "PacketiX VPN Server Manager for Windows, PacketiX VPN Command-Line Admin Utility (vpncmd)");

+#endif	// BU_SOFTETHER

+			txt.WriteLine("OS\t" + "Windows (.zip package without installers)");

+			txt.WriteLine("OSLIST\t" + OSList.Windows.OSSimpleList);

+			txt.WriteLine("CPU\t" + "Intel (x86 and x64)");

+			txt.WriteLine("VERSION\t" + BuildHelper.VersionIntToString(version));

+			txt.WriteLine("BUILD\t" + build.ToString());

+			txt.WriteLine("VERSTR\t" + name);

+			txt.WriteLine("DATE\t" + Str.DateTimeToStrShortWithMilliSecs(date));

+			txt.WriteLine("LANGUAGE\t" + "English, Japanese, Simplified Chinese");

+			txt.WriteLine("*");

+			txt.WriteLine();

+

 			IO.MakeDirIfNotExists(Path.Combine(publicDir, cddir));

 			File.WriteAllText(Path.Combine(Path.Combine(publicDir, cddir), "files.txt"), txt.ToString(), Str.Utf8Encoding);

 

+

 			// Execution of batch file

 			string old_cd = Environment.CurrentDirectory;

 

diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs
index 3d64a97d..56d20588 100644
--- a/src/BuildUtil/UnixBuildSoftwares.cs
+++ b/src/BuildUtil/UnixBuildSoftwares.cs
@@ -277,7 +277,17 @@ namespace BuildUtil
 

 				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_cn.txt"),

+					enc);

+

+				byte[] destData = enc.GetBytes(srcData);

+

+				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_cn.txt", destData, 0, destData.Length, DateTime.Now);

+			}

+	

 

 			// Codes

 			string[] dirs =

diff --git a/src/BuildUtil/VpnBuilderConfig.cs b/src/BuildUtil/VpnBuilderConfig.cs
index 3da2b82a..91109249 100644
--- a/src/BuildUtil/VpnBuilderConfig.cs
+++ b/src/BuildUtil/VpnBuilderConfig.cs
@@ -268,6 +268,24 @@ namespace BuildUtil
 				"macos-x86-64bit", true, "macos-x86-64bit-4.0.4", true,

 				null);

 

+		// Client

+		public static readonly BuildSoftware vpnclient_macos_ppc32_ja =

+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.ppc32, OSList.MacOS,

+				"macos-ppc-32bit", true, "macos-ppc-32bit-4.0.4", true,

+				"-isysroot /cygdrive/s/CommomDev/xc/common/apple_xcode/xcode_2.4/Developer/SDKs/MacOSX10.4u.sdk");

+		public static readonly BuildSoftware vpnclient_macos_ppc64_ja =

+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.ppc64, OSList.MacOS,

+				"macos-ppc-64bit", true, "macos-ppc-64bit-4.0.4", true,

+				null);

+		public static readonly BuildSoftware vpnclient_macos_x86_ja =

+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.x86, OSList.MacOS,

+				"macos-x86-32bit", true, "macos-x86-32bit-4.0.4", true,

+				"-isysroot /cygdrive/s/CommomDev/xc/common/apple_xcode/xcode_2.4/Developer/SDKs/MacOSX10.4u.sdk");

+		public static readonly BuildSoftware vpnclient_macos_x64_ja =

+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.x64, OSList.MacOS,

+				"macos-x86-64bit", true, "macos-x86-64bit-4.0.4", true,

+				null);

+

 		// Bridge

 		public static readonly BuildSoftware vpnbridge_macos_ppc32_ja =

 			new BuildSoftwareUnix(Software.vpnbridge, 0, 0, "", CpuList.ppc32, OSList.MacOS,

@@ -345,7 +363,7 @@ namespace BuildUtil
 					{

 						s.GccMacros.Add("UNIX_MACOS");

 						s.GccMacros.Add("BRIDGE_PCAP");

-						s.GccMacros.Add("NO_VLAN");

+						//s.GccMacros.Add("NO_VLAN");

 					}

 					else if (soft.Os == OSList.Solaris)

 					{

@@ -391,7 +409,7 @@ namespace BuildUtil
 	{

 		// Windows

 		public static readonly OS Windows = new OS("windows", "Windows",

-			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Server 2003 SP2 / Vista SP1, SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / 7 SP1 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / 8 / Server 2012 / Hyper-V Server 2012 / 8.1 / Server 2012 R2 / Hyper-V Server 2012 R2",

+			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2",

 			new Cpu[]

 			{

 				CpuList.intel,

@@ -414,7 +432,16 @@ namespace BuildUtil
 

 		// FreeBSD

 		public static readonly OS FreeBSD = new OS("freebsd", "FreeBSD",

-			"FreeBSD 5 / 6 / 7 / 8 / 9",

+			"FreeBSD 5 / 6 / 7 / 8 / 9 / 10",

+			new Cpu[]

+			{

+				CpuList.x86,

+				CpuList.x64,

+			});

+

+		// OpenBSD

+		public static readonly OS OpenBSD = new OS("openbsd", "OpenBSD",

+			"OpenBSD 5 / 6 / 7 / 8 / 9 / 10",

 			new Cpu[]

 			{

 				CpuList.x86,

@@ -434,7 +461,7 @@ namespace BuildUtil
 

 		// Mac OS X

 		public static readonly OS MacOS = new OS("macos", "Mac OS X",

-			"Mac OS X 10.4 Tiger / 10.5 Leopard / 10.6 Snow Leopard / 10.7 Lion / 10.8 Mountain Lion",

+			"Mac OS X 10.4 Tiger / 10.5 Leopard / 10.6 Snow Leopard / 10.7 Lion / 10.8 Mountain Lion / 10.9 Mavericks",

 			new Cpu[]

 			{

 				CpuList.x86,