From 616bf6601c51b2c590ef76b264818e335370177e Mon Sep 17 00:00:00 2001
From: Nikhil Vimal <techvoltz@gmail.com>
Date: Mon, 9 Feb 2015 05:41:49 -0600
Subject: [PATCH 1/2] Adding some inline docs/docs cleanup

---
 win32/build/confutils.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 2569ab33a32..c1f71e17a7e 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -105,6 +105,7 @@ var PHP_RELEASE_VERSION = 0;
 var PHP_EXTRA_VERSION = "";
 var PHP_VERSION_STRING = "5.0.0";
 
+/* Get version numbers and DEFINE as a string */
 function get_version_numbers()
 {
 	var cin = file_get_contents("configure.in");
@@ -906,7 +907,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env
 	if (typeof(p) == "string") {
 		ADD_FLAG(flag_name, '/I "' + p + dir_part_to_add + '" ');
 	} else if (p == false) {
-		/* not found in the defaults or the explicit paths,
+		/* Not found in the defaults or the explicit paths,
 		 * so check the general extra includes; if we find
 		 * it here, no need to add another /I for it as we
 		 * already have it covered, unless we are adding
@@ -935,7 +936,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env
 	return p;
 }
 
-/* emits rule to generate version info for a SAPI
+/* Emits rule to generate version info for a SAPI
  * or extension.  Returns the name of the .res file
  * that will be generated */
 function generate_version_info_resource(makefiletarget, basename, creditspath, sapi)
@@ -1036,7 +1037,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
 
 /* Check if PGO is enabled for given module. To disable PGO for a particular module,
 define a global variable by the following name scheme before SAPI() or EXTENSION() call
-	var PHP_MYMODULE_PGO = false; */
+var PHP_MYMODULE_PGO = false; */
 function is_pgo_desired(mod)
 {
 	var varname = "PHP_" + mod.toUpperCase() + "_PGO";
@@ -1576,7 +1577,7 @@ function output_as_table(header, ar_out)
 	for (j=0; j < l; j++) {
 		var tmax, tmin;
 
-		/*Figure out the max length per column */
+		/* Figure out the max length per column */
 		tmin = 0;
 		tmax = 0;
 		for (k = 0; k < ar_out.length; k++) {
@@ -1984,6 +1985,7 @@ function generate_phpize()
 	CJ.Close();
 }
 
+/* Generate the Makefile */
 function generate_makefile()
 {
 	STDOUT.WriteLine("Generating Makefile");
@@ -2318,7 +2320,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
 	}
 }
 
-// for snapshot builders, this option will attempt to enable everything
+// For snapshot builders, this option will attempt to enable everything
 // and you can then build everything, ignoring fatal errors within a module
 // by running "nmake snap"
 PHP_SNAPSHOT_BUILD = "no";
@@ -2331,7 +2333,6 @@ if (!MODE_PHPIZE) {
 	ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and snapshot builders, not so hot for edit-and-rebuild hacking', 'no');
 }
 
-
 function toolset_option_handle()
 {
 	if ("clang" == PHP_TOOLSET) {
@@ -2442,7 +2443,7 @@ function toolset_setup_project_tools()
 		PATH_PROG('mt', WshShell.Environment("Process").Item("PATH"));
 	}
 }
-
+/* Get compiler if the toolset is supported */
 function toolset_get_compiler()
 {
 	if (VS_TOOLSET) {

From 27defce2bc209d227566edda78682c7b7fe0030d Mon Sep 17 00:00:00 2001
From: Nikhil Vimal <techvoltz@gmail.com>
Date: Mon, 16 Feb 2015 23:19:47 -0600
Subject: [PATCH 2/2] More docs for /win32/build/confutils.js

Just adding a few more docs
---
 win32/build/confutils.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c1f71e17a7e..54846f72cad 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1935,6 +1935,7 @@ function generate_config_h()
 	outfile.Close();
 }
 
+/* Generate phpize */
 function generate_phpize()
 {
 	STDOUT.WriteLine("Generating phpize");
@@ -2268,6 +2269,7 @@ function _inner_glob(base, p, parts)
 	return items;
 }
 
+/* Install Headers */
 function PHP_INSTALL_HEADERS(dir, headers_list)
 {
 	headers_list = headers_list.split(new RegExp("\\s+"));
@@ -2457,6 +2459,7 @@ function toolset_get_compiler()
 	ERROR("Unsupported toolset");
 }
 
+/* Get compiler version if the toolset is supported */
 function toolset_get_compiler_version()
 {
 	var version;
@@ -2492,6 +2495,7 @@ function toolset_get_compiler_version()
 	ERROR("Failed to parse compiler version or unsupported toolset");
 }
 
+/* Get compiler name if the toolset is supported */
 function toolset_get_compiler_name()
 {
 	var version;
@@ -2818,4 +2822,3 @@ function trim(s)
 {
 	return s.replace(/^\s+/, "").replace(/\s+$/, "");
 }
-