v4.30-9695-betav4.30-9695-beta

4 files changed, 59 insertions, 2 deletions

diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs
index fcf502fa..ad353210 100644
--- a/src/BuildUtil/UnixBuildSoftwares.cs
+++ b/src/BuildUtil/UnixBuildSoftwares.cs
@@ -696,6 +696,9 @@ namespace BuildUtil
 

 			sr.WriteLine("\t@echo");

 			sr.WriteLine("\t@echo");

+			sr.WriteLine("\t@echo \"Note: the administrative password is not set on the VPN Server. Please set your own administrative password as soon as possible by vpncmd or the GUI manager.\"");

+			sr.WriteLine("\t@echo");

+			sr.WriteLine("\t@echo");

 

 			sr.WriteLine("\t@echo \"*** How to start the {0} Service ***\"", BuildHelper.GetSoftwareTitle(this.Software));

 			sr.WriteLine("\t@echo");

@@ -707,6 +710,7 @@ namespace BuildUtil
 			sr.WriteLine("\t@echo \"And please execute './vpncmd' to run the SoftEther VPN Command-Line Utility to configure {0}.\"", BuildHelper.GetSoftwareTitle(this.Software));

 #endif

 			sr.WriteLine("\t@echo");

+

 #if !BU_SOFTETHER

 			sr.WriteLine("\t@echo \"Of course, you can use the VPN Server Manager GUI Application for Windows on the other Windows PC in order to configure the {0} remotely.\"", BuildHelper.GetSoftwareTitle(this.Software));

 #else

@@ -716,7 +720,6 @@ namespace BuildUtil
 #if !BU_SOFTETHER

 #else

 			sr.WriteLine("\t@echo");

-			sr.WriteLine("\t@echo");

 			sr.WriteLine("\t@echo \"*** For Windows users ***\"");

 			sr.WriteLine("\t@echo \"You can download the SoftEther VPN Server Manager for Windows\"");

 			sr.WriteLine("\t@echo \"from the http://www.softether-download.com/ web site.\"");

@@ -730,6 +733,30 @@ namespace BuildUtil
 			sr.WriteLine("\t@echo");

 #endif

 

+			sr.WriteLine("\t@echo");

+

+			sr.WriteLine("\t@echo");

+#if !BU_SOFTETHER

+			sr.WriteLine("\t@echo \"*** SoftEther VPN Server HTML5 Web Administration Console (NEW) ***\"");

+#else

+			sr.WriteLine("\t@echo \"*** PacketiX VPN Server HTML5 Web Administration Console (NEW) ***\"");

+#endif

+			sr.WriteLine("\t@echo \"This VPN Server / Bridge has the built-in HTML5 Web Administration Console.\"");

+			sr.WriteLine("\t@echo");

+			sr.WriteLine("\t@echo \"After you start the server daemon, you can open the HTML5 Web Administration Console is available at\"");

+			sr.WriteLine("\t@echo");

+#if !BU_SOFTETHER

+			sr.WriteLine("\t@echo \"https://127.0.0.1:8888/\"");

+			sr.WriteLine("\t@echo \"  or\"");

+			sr.WriteLine("\t@echo \"https://ip_address_of_the_vpn_server:8888/\"");

+#else

+			sr.WriteLine("\t@echo \"https://127.0.0.1:5555/\"");

+			sr.WriteLine("\t@echo \"or\"");

+			sr.WriteLine("\t@echo \"https://ip_address_of_the_vpn_server:5555/\"");

+#endif

+			sr.WriteLine("\t@echo");

+			sr.WriteLine("\t@echo \"This HTML5 page is obviously under construction, and your HTML5 development contribution is very appreciated.\"");

+			sr.WriteLine("\t@echo");

 

 			sr.WriteLine("\t@echo \"--------------------------------------------------------------------\"");

 			sr.WriteLine("\t@echo");

diff --git a/src/BuildUtil/VpnBuilder.cs b/src/BuildUtil/VpnBuilder.cs
index 801e1cd3..7c135793 100644
--- a/src/BuildUtil/VpnBuilder.cs
+++ b/src/BuildUtil/VpnBuilder.cs
@@ -552,6 +552,24 @@ namespace BuildUtil
 			}

 		}

 

+		// Delete node_modules file

+		public static void DeleteNodeModulesFilesFromHamCoreBuilder(HamCoreBuilder b)

+		{

+			List<string> removeFiles = new List<string>();

+			foreach (HamCoreBuilderFileEntry f in b.FileList)

+			{

+				string name = f.Name;

+				if (name.IndexOf(@"\node_modules\", StringComparison.InvariantCultureIgnoreCase) != -1)

+				{

+					removeFiles.Add(name);

+				}

+			}

+			foreach (string file in removeFiles)

+			{

+				b.DeleteFile(file);

+			}

+		}

+

 		// Build Hamcore file

 		public static void BuildHamcore()

 		{

@@ -594,6 +612,7 @@ namespace BuildUtil
 			Con.WriteLine("* Building hamcore ...");

 

 			DeleteSVNFilesFromHamCoreBuilder(b);

+			DeleteNodeModulesFilesFromHamCoreBuilder(b);

 

 			try

 			{

@@ -619,6 +638,7 @@ namespace BuildUtil
 			}

 

 			DeleteSVNFilesFromHamCoreBuilder(b);

+			DeleteNodeModulesFilesFromHamCoreBuilder(b);

 

 			try

 			{

diff --git a/src/BuildUtil/VpnBuilderConfig.cs b/src/BuildUtil/VpnBuilderConfig.cs
index f84f7c0a..ee9573b2 100644
--- a/src/BuildUtil/VpnBuilderConfig.cs
+++ b/src/BuildUtil/VpnBuilderConfig.cs
@@ -421,7 +421,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 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / 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 / Server 2016",

+			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / 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 / Server 2016 / Server 2019",

 			new Cpu[]

 			{

 				CpuList.intel,

diff --git a/src/BuildUtil/Win32BuildUtil.cs b/src/BuildUtil/Win32BuildUtil.cs
index e621b231..3d80fe2d 100644
--- a/src/BuildUtil/Win32BuildUtil.cs
+++ b/src/BuildUtil/Win32BuildUtil.cs
@@ -581,6 +581,16 @@ namespace BuildUtil
 						return false;

 					}

 

+					if (Str.InStr(srcPath, @"\node_modules\", false))

+					{

+						return false;

+					}

+

+					if (Str.InStr(srcPath, @"\wwwroot\", false))

+					{

+						return true;

+					}

+

 					foreach (string ext in exts)

 					{

 						if (srcPath.EndsWith(ext, StringComparison.InvariantCultureIgnoreCase))