1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-26 10:03:34 +03:00

Minor fixes to configure.js

- Semicolon coding style
- Remove duplicated option check

Found by lgtm.com
This commit is contained in:
Nick Wellnhofer 2020-01-02 15:19:57 +01:00
parent 52649b63eb
commit 3e7e75bed2

View File

@ -210,16 +210,16 @@ function discoverVersion()
s = new String(ln); s = new String(ln);
if (s.search(/^LIBXML_MAJOR_VERSION=/) != -1) { if (s.search(/^LIBXML_MAJOR_VERSION=/) != -1) {
vf.WriteLine(s); vf.WriteLine(s);
verMajor = s.substring(s.indexOf("=") + 1, s.length) verMajor = s.substring(s.indexOf("=") + 1, s.length);
} else if(s.search(/^LIBXML_MINOR_VERSION=/) != -1) { } else if(s.search(/^LIBXML_MINOR_VERSION=/) != -1) {
vf.WriteLine(s); vf.WriteLine(s);
verMinor = s.substring(s.indexOf("=") + 1, s.length) verMinor = s.substring(s.indexOf("=") + 1, s.length);
} else if(s.search(/^LIBXML_MICRO_VERSION=/) != -1) { } else if(s.search(/^LIBXML_MICRO_VERSION=/) != -1) {
vf.WriteLine(s); vf.WriteLine(s);
verMicro = s.substring(s.indexOf("=") + 1, s.length) verMicro = s.substring(s.indexOf("=") + 1, s.length);
} else if(s.search(/^LIBXML_MICRO_VERSION_SUFFIX=/) != -1) { } else if(s.search(/^LIBXML_MICRO_VERSION_SUFFIX=/) != -1) {
vf.WriteLine(s); vf.WriteLine(s);
verMicroSuffix = s.substring(s.indexOf("=") + 1, s.length) verMicroSuffix = s.substring(s.indexOf("=") + 1, s.length);
} }
} }
cf.Close(); cf.Close();
@ -280,7 +280,7 @@ function discoverVersion()
vf.WriteLine("DYNRUNTIME=" + (dynruntime? "1" : "0")); vf.WriteLine("DYNRUNTIME=" + (dynruntime? "1" : "0"));
} }
vf.Close(); vf.Close();
versionFile = "rcVersion.h" versionFile = "rcVersion.h";
vf = fso.CreateTextFile(versionFile, true); vf = fso.CreateTextFile(versionFile, true);
vf.WriteLine("/*"); vf.WriteLine("/*");
vf.WriteLine(" " + versionFile); vf.WriteLine(" " + versionFile);
@ -291,7 +291,7 @@ function discoverVersion()
vf.WriteLine("#define LIBXML_MINOR_VERSION " + verMinor); vf.WriteLine("#define LIBXML_MINOR_VERSION " + verMinor);
vf.WriteLine("#define LIBXML_MICRO_VERSION " + verMicro); vf.WriteLine("#define LIBXML_MICRO_VERSION " + verMicro);
vf.WriteLine("#define LIBXML_DOTTED_VERSION " + "\"" + verMajor + "." + verMinor + "." + verMicro + "\""); vf.WriteLine("#define LIBXML_DOTTED_VERSION " + "\"" + verMajor + "." + verMinor + "." + verMicro + "\"");
vf.Close() vf.Close();
} }
/* Configures libxml. This one will generate xmlversion.h from xmlversion.h.in /* Configures libxml. This one will generate xmlversion.h from xmlversion.h.in
@ -544,8 +544,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
buildStatic = strToBool(arg.substring(opt.length + 1, arg.length)); buildStatic = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "prefix") else if (opt == "prefix")
buildPrefix = arg.substring(opt.length + 1, arg.length); buildPrefix = arg.substring(opt.length + 1, arg.length);
else if (opt == "incdir")
buildIncPrefix = arg.substring(opt.length + 1, arg.length);
else if (opt == "bindir") else if (opt == "bindir")
buildBinPrefix = arg.substring(opt.length + 1, arg.length); buildBinPrefix = arg.substring(opt.length + 1, arg.length);
else if (opt == "libdir") else if (opt == "libdir")