From 173991115932e219cb3a94fd77970bbfe1a33845 Mon Sep 17 00:00:00 2001
From: Stéphane Raimbault <stephane.raimbault@gmail.com>
Date: Sun, 27 Nov 2022 22:23:59 +0100
Subject: [PATCH] Display created files in configure.js

---
 src/win32/configure.js | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------
 1 file changed, 99 insertions(+), 88 deletions(-)

diff --git a/src/win32/configure.js b/src/win32/configure.js
index aa21e49..6c96a90 100644
--- a/src/win32/configure.js
+++ b/src/win32/configure.js
@@ -29,135 +29,146 @@ var newFile;
 
 /* Displays the details about how to use this script. */
 function usage() {
-	var txt;
+    var txt;
 
-	txt = "Usage:\n";
-	txt += "  cscript " + WScript.ScriptName + " <options>\n";
-	txt += "  cscript " + WScript.ScriptName + " help\n\n";
-	txt += "Options can be specified in the form <option>=<value>, where the value is\n";
-	txt += "either 'yes' or 'no', if not stated otherwise.\n\n";
-	txt += "\nModbus library configure options, default value given in parentheses:\n\n";
-	txt += "  dry-run:  Run configure without creating files (" + (dryRun ? "yes" : "no")  + ")\n";
-	txt += "\nWin32 build options, default value given in parentheses:\n\n";
-	txt += "  compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
-	WScript.Echo(txt);
+    txt = "Usage:\n";
+    txt += "  cscript " + WScript.ScriptName + " <options>\n";
+    txt += "  cscript " + WScript.ScriptName + " help\n\n";
+    txt +=
+        "Options can be specified in the form <option>=<value>, where the value is\n";
+    txt += "either 'yes' or 'no', if not stated otherwise.\n\n";
+    txt +=
+        "\nModbus library configure options, default value given in parentheses:\n\n";
+    txt +=
+        "  dry-run:  Run configure without creating files (" +
+        (dryRun ? "yes" : "no") +
+        ")\n";
+    txt += "\nWin32 build options, default value given in parentheses:\n\n";
+    txt += "  compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
+    WScript.Echo(txt);
 }
 
 /* read the version from the configuration file */
 function readVersion() {
-	var fso, cf, ln, s;
-	fso = new ActiveXObject("Scripting.FileSystemObject");
-	cf = fso.OpenTextFile(configFile, 1);
-	while (cf.AtEndOfStream !== true) {
-		ln = cf.ReadLine();
-		s = new String(ln);
-		if (s.search(/^m4_define\(\[libmodbus_version_major/) != -1) {
-			verMajor = s.substr(s.indexOf(",") + 3, 1);
-		} else if (s.search(/^m4_define\(\[libmodbus_version_minor/) != -1) {
-			verMinor = s.substr(s.indexOf(",") + 3, 1);
-		} else if (s.search(/^m4_define\(\[libmodbus_version_micro/) != -1) {
-			verMicro = s.substr(s.indexOf(",") + 3, 1);
-		}
-	}
-	cf.Close();
+    var fso, cf, ln, s;
+    fso = new ActiveXObject("Scripting.FileSystemObject");
+    cf = fso.OpenTextFile(configFile, 1);
+    while (cf.AtEndOfStream !== true) {
+        ln = cf.ReadLine();
+        s = new String(ln);
+        if (s.search(/^m4_define\(\[libmodbus_version_major/) != -1) {
+            verMajor = s.substr(s.indexOf(",") + 3, 1);
+        } else if (s.search(/^m4_define\(\[libmodbus_version_minor/) != -1) {
+            verMinor = s.substr(s.indexOf(",") + 3, 1);
+        } else if (s.search(/^m4_define\(\[libmodbus_version_micro/) != -1) {
+            verMicro = s.substr(s.indexOf(",") + 3, 1);
+        }
+    }
+    cf.Close();
 }
 
 /* create the versioned file */
 function createVersionedFile(newfile, unversioned) {
-	var fso, ofi, of, ln, s;
-	fso = new ActiveXObject("Scripting.FileSystemObject");
-	ofi = fso.OpenTextFile(unversioned, 1);
-	if (!dryRun) {
-		of = fso.CreateTextFile(newfile, true);
-	}
-	while (ofi.AtEndOfStream !== true) {
-		ln = ofi.ReadLine();
-		s = new String(ln);
-		if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MAJOR\@/) != -1) {
-			of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MAJOR\@/, verMajor));
-		} else if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MINOR\@/) != -1) {
-			of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MINOR\@/, verMinor));
-		} else if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MICRO\@/) != -1) {
-			of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MICRO\@/, verMicro));
-		} else if (!dryRun && s.search(/\@LIBMODBUS_VERSION\@/) != -1) {
-			of.WriteLine(s.replace(/\@LIBMODBUS_VERSION\@/, verMajor + "." + verMinor + "." + verMicro));
-		} else {
-			if (!dryRun) {
-				of.WriteLine(ln);
-			}
-		}
-	}
-	ofi.Close();
-	if (!dryRun) {
-		of.Close();
-	}
+    var fso, ofi, of, ln, s;
+    fso = new ActiveXObject("Scripting.FileSystemObject");
+    ofi = fso.OpenTextFile(unversioned, 1);
+    if (!dryRun) {
+        of = fso.CreateTextFile(newfile, true);
+    }
+    while (ofi.AtEndOfStream !== true) {
+        ln = ofi.ReadLine();
+        s = new String(ln);
+        if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MAJOR\@/) != -1) {
+            of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MAJOR\@/, verMajor));
+        } else if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MINOR\@/) != -1) {
+            of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MINOR\@/, verMinor));
+        } else if (!dryRun && s.search(/\@LIBMODBUS_VERSION_MICRO\@/) != -1) {
+            of.WriteLine(s.replace(/\@LIBMODBUS_VERSION_MICRO\@/, verMicro));
+        } else if (!dryRun && s.search(/\@LIBMODBUS_VERSION\@/) != -1) {
+            of.WriteLine(
+                s.replace(
+                    /\@LIBMODBUS_VERSION\@/,
+                    verMajor + "." + verMinor + "." + verMicro
+                )
+            );
+        } else {
+            if (!dryRun) {
+                of.WriteLine(ln);
+            }
+        }
+    }
+    ofi.Close();
+    if (!dryRun) {
+        of.Close();
+    }
 }
 
-
 /*
  * main(),
  * Execution begins here.
  */
 
 // Parse the command-line arguments.
-for (i = 0; (i < WScript.Arguments.length) && (error === 0); i++) {
-	var arg, opt;
-	arg = WScript.Arguments(i);
-	opt = arg.substring(0, arg.indexOf("="));
-	if (opt.length > 0) {
-		if (opt == "dry-run") {
-			var str = arg.substring(opt.length + 1, arg.length);
-			if (opt == 1 || opt == "yes") {
-				dryRun = true;
-			}
-		} else if (opt == "compiler") {
-			compiler = arg.substring(opt.length + 1, arg.length);
-		} else {
-			error = 1;
-		}
-	} else if (i === 0) {
-		if (arg == "help") {
-			usage();
-			WScript.Quit(0);
-		}
-	} else {
-		error = 1;
-	}
+for (i = 0; i < WScript.Arguments.length && error === 0; i++) {
+    var arg, opt;
+    arg = WScript.Arguments(i);
+    opt = arg.substring(0, arg.indexOf("="));
+    if (opt.length > 0) {
+        if (opt == "dry-run") {
+            var str = arg.substring(opt.length + 1, arg.length);
+            if (opt == 1 || opt == "yes") {
+                dryRun = true;
+            }
+        } else if (opt == "compiler") {
+            compiler = arg.substring(opt.length + 1, arg.length);
+        } else {
+            error = 1;
+        }
+    } else if (i === 0) {
+        if (arg == "help") {
+            usage();
+            WScript.Quit(0);
+        }
+    } else {
+        error = 1;
+    }
 }
 
-
 // If we fail here, it is because the user supplied an unrecognised argument.
 if (error !== 0) {
-	usage();
-	WScript.Quit(error);
+    usage();
+    WScript.Quit(error);
 }
 
 // Read the the version.
 readVersion();
 if (error !== 0) {
-	WScript.Echo("Version discovery failed, aborting.");
-	WScript.Quit(error);
+    WScript.Echo("Version discovery failed, aborting.");
+    WScript.Quit(error);
 }
 
 newfile = srcDir + "\\modbus-version.h";
 createVersionedFile(newfile, srcDir + "\\modbus-version.h.in");
 if (error !== 0) {
-	WScript.Echo("Creation of " + newfile + " failed, aborting.");
-	WScript.Quit(error);
+    WScript.Echo("Creation of " + newfile + " failed, aborting.");
+    WScript.Quit(error);
 }
+WScript.Echo(newfile + " created.");
 
 newfile = "modbus.dll.manifest";
 createVersionedFile(newfile, "modbus.dll.manifest.in");
 if (error !== 0) {
-	WScript.Echo("Creation of " + newfile + " failed, aborting.");
-	WScript.Quit(error);
+    WScript.Echo("Creation of " + newfile + " failed, aborting.");
+    WScript.Quit(error);
 }
+WScript.Echo(newfile + " created.");
 
 newfile = "config.h";
 createVersionedFile(newfile, "config.h.win32");
 if (error !== 0) {
-	WScript.Echo("Creation of " + newfile + " failed, aborting.");
-	WScript.Quit(error);
+    WScript.Echo("Creation of " + newfile + " failed, aborting.");
+    WScript.Quit(error);
 }
+WScript.Echo(newfile + " created.");
 
 WScript.Echo("\nLibmodbus configuration completed\n");
--
libgit2 0.21.4