From: Anatol Belski <ab@php.net>
Date: Sat, 29 Oct 2016 00:27:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9112e29890af32f6916e18d30894c1e0123ca0ef;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too
---

9112e29890af32f6916e18d30894c1e0123ca0ef
diff --cc win32/build/config.w32
index c727cf8081,4c476e682a..188c1dc9e2
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@@ -298,8 -294,9 +298,15 @@@ toolset_setup_codegen_arch()
  
  ARG_WITH("all-shared", "Force all the non obligatory extensions to be shared", "no");
  
 +// Config profiles (--with-config-profile=<name>) will save a certain config to php-src/config.<name>.bat
 +// so that it can be executed like: cofig.<name> instead of a long list of parameters
 +//
 +// Note, nice as a name is disallowed and will generate a warning and skip saving
 +ARG_WITH('config-profile', 'Name of the configuration profile to save this to in php-src/config.name.bat', 'no');
++
+ ARG_ENABLE("test-ini", "Enable automatic php.ini generation. The test.ini will be put \
+ 		into the build dir and used to automatically load the shared extensions.", "yes");
+ 
+ ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \
+ 		be excluded from the test.ini", "no");
+