com php-src: Do not overwrite config.nice.bat if --with-config-profile is used on Windows: win32/build/confutils.js

Commit: dfbcd4e20727b82e5e093d4e8f404aaefd9fbae5 Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 20 Oct 2016 13:10:28 +0200 Parents: a64c02fbb573177aeea4233328747663fbca55b2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dfbcd4e20727b82e5e093d4e8f404aaefd9fbae5 Log: Do not overwrite config.nice.bat if --with-config-profile is used on Windows Changed paths: M win32/build/confutils.js Diff: diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 7516f82..14012fd 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -336,10 +336,8 @@ function conf_process_args() args = WScript.Arguments; for (i = 0; i < args.length; i++) { arg = args(i); - // Ignore --with-config-profile for config.nice.bat - if (arg.toLowerCase().substring(0, arg.indexOf('=')) != '--with-config-profile' && arg != '--with-config-profile') { - nice += ' "' + arg + '"'; - } + nice += ' "' + arg + '"'; + if (arg == "--help") { configure_help_mode = true; break; @@ -521,11 +519,7 @@ can be built that way. \ MFO = FSO.CreateTextFile("Makefile.objects", true); - STDOUT.WriteLine("Saving configure options to config.nice.bat"); - var nicefile = FSO.CreateTextFile("config..nice.bat", true); - nicefile.WriteLine('@echo off'); - nicefile.WriteLine(nice + " %*"); - nicefile.Close(); + var profile = false; if (PHP_CONFIG_PROFILE != 'no') { if (PHP_CONFIG_PROFILE.toLowerCase() == 'nice') { @@ -536,9 +530,21 @@ can be built that way. \ config_profile.WriteLine('@echo off'); config_profile.WriteLine(nice + ' %*'); config_profile.Close(); + + profile = true; } } + // Only generate an updated config.nice.bat file if a profile was not used + if (!profile) { + STDOUT.WriteLine("Saving configure options to config.nice.bat"); + + var nicefile = FSO.CreateTextFile("config.nice.bat", true); + nicefile.WriteLine('@echo off'); + nicefile.WriteLine(nice + " %*"); + nicefile.Close(); + } + AC_DEFINE('CONFIGURE_COMMAND', nice, "Configure line"); }