From e2584eed1c84c18f16e42188c30d2c3d8e3e8853 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 12 Nov 2019 17:37:05 +0800 Subject: [PATCH] win32: Add configuration for profiler Without this the generated xsltconfig.h will not be complete as there will be a configuration variable that is left in the header, breaking builds. This will allow one to enable or disable profiler support in Windows builds, and the default is to enable this. --- win32/configure.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/win32/configure.js b/win32/configure.js index 56694cce..12c99f30 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -47,6 +47,7 @@ var withIconv = true; var withZlib = false; var withCrypto = true; var withModules = false; +var withProfiler = true; /* Win32 build options. */ var dirSep = "\\"; var compiler = "msvc"; @@ -106,6 +107,7 @@ function usage() txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n"; txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n"; + txt += " profiler: Enable Profiler support (" + (withProfiler? "yes" : "no") + ")\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n"; txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n"; txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n"; @@ -192,6 +194,7 @@ function discoverVersion() vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); vf.WriteLine("WITH_CRYPTO=" + (withCrypto? "1" : "0")); vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0")); + vf.WriteLine("WITH_PROFILER=" + (withProfiler? "1" : "0")); vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0")); vf.WriteLine("STATIC=" + (buildStatic? "1" : "0")); vf.WriteLine("PREFIX=" + buildPrefix); @@ -240,6 +243,8 @@ function configureXslt() of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0")); } else if (s.search(/\@WITH_MODULES\@/) != -1) { of.WriteLine(s.replace(/\@WITH_MODULES\@/, withModules? "1" : "0")); + } else if (s.search(/\@WITH_PROFILER\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_PROFILER\@/, withProfiler? "1" : "0")); } else if (s.search(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/) != -1) { of.WriteLine(s.replace(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/, "NULL")); } else @@ -343,6 +348,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withCrypto = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "modules") withModules = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "profiler") + withProfiler = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "compiler") compiler = arg.substring(opt.length + 1, arg.length); else if (opt == "cruntime") @@ -477,6 +484,7 @@ txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; txtOut += " With zlib: " + boolToStr(withZlib) + "\n"; txtOut += " Crypto: " + boolToStr(withCrypto) + "\n"; txtOut += " Modules: " + boolToStr(withModules) + "\n"; +txtOut += " Profiler: " + boolToStr(withProfiler) + "\n"; txtOut += "\n"; txtOut += "Win32 build configuration\n"; txtOut += "-------------------------\n";