Commit graph

1683 commits

Author SHA1 Message Date
Anatol Belski
78a164bad5 rename the env setting target and reuse it for build-snap 2016-10-30 15:22:45 +01:00
Anatol Belski
ee5c450694 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix condition
2016-10-29 17:58:01 +02:00
Anatol Belski
87cb91ea7c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix condition
2016-10-29 17:57:33 +02:00
Anatol Belski
c7ec36d4fa fix condition 2016-10-29 17:54:26 +02:00
Anatol Belski
5ada01ee75 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix test run with autogenerated ini
2016-10-29 03:18:43 +02:00
Anatol Belski
8e4ea7a188 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test run with autogenerated ini
2016-10-29 03:18:19 +02:00
Anatol Belski
ddbcb2084a fix test run with autogenerated ini 2016-10-29 03:17:29 +02:00
Anatol Belski
9112e29890 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
2016-10-29 02:27:13 +02:00
Anatol Belski
3f35078857 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too
2016-10-29 02:12:05 +02:00
Anatol Belski
5b04a2187e generate test ini file, so shared exts are loaded for nmake test 2016-10-29 02:08:48 +02:00
Anatol Belski
f5131c6c04 additional env is generated for phpize, too 2016-10-28 23:11:47 +02:00
Michele Locati
33301d5bae Add VT100 support for Windows
Fix function names prefix

Use Unicode version of GetFinalPathNameByHandle

Use EG(windows_version_info) instead of RtlGetVersion

Use the specified handle_id instead of STD_OUTPUT_HANDLE

Switch from stream name to stream resource

Allow running tests capturing only stdout and/or stderr

Add tests for stream_vt100_support function

Export Win32 console functions

Fix x64 build

Use zend_long instead of long long, use GetConsole instead of GetFinalPathNameByHandleW to check if a handle is a valid console stream

Always use zend_long on any platform

Use _get_osfhandle to determine the standard handle

Accept stream names

Raise warnings in case of invalid stream parameter

Return true if disabling VT100 support on a not-console/redirected stream or on old Windows versions

Remove php_win32_console_os_supports_vt100

Differentiate stdin vs stdout/stderr

Simplify setting flag

Allow avoid piping STDIN

Let stream_vt100_support accept only resources

Fix run-tests

Revert console flags in case of failure

Simplify logic of stream_vt100_support when setting the flag

Return true if succeeded, false otherwise

Drop support for STDIN

More comprehensive tests for stream_vt100_support

Remove old tests

Fix name of included file and use absolute paths

Enable ENABLE_VIRTUAL_TERMINAL_PROCESSING on Windows by default

Remove tests for stream_vt100_support

Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support

Add tests for stream_isatty

Add tests for sapi_windows_vt100_support

Return null from stream_isatty is neither Windows nor Posix

Fallback to S_ISCHR if neither Windows nor Posix

Avoid defining argc since it's only used once

Better comment about php_win32_console_fileno_is_console

Use events instead of cNumberOfEvents

Do not restore previous console mode

We need to restore previous console mode on failing SetConsole calls only for STDIN

Don't configure STDOUT/STDERR on Windows with PHP_CLI_WIN32_NO_CONSOLE
2016-10-28 19:23:00 +02:00
Anatol Belski
c62d90650a Merge branch 'PHP-7.1'
* PHP-7.1:
  use rather the nmake var as it's evaluated on every run
2016-10-27 22:36:28 +02:00
Anatol Belski
3f12d852ec Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  use rather the nmake var as it's evaluated on every run
2016-10-27 22:36:00 +02:00
Anatol Belski
a481291f02 use rather the nmake var as it's evaluated on every run 2016-10-27 22:34:34 +02:00
Anatol Belski
5fa9a6d176 Merge branch 'PHP-7.1'
* PHP-7.1:
  prepend known bin folders to the path for nmake test runs
2016-10-27 20:44:30 +02:00
Anatol Belski
66f3fcee08 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  prepend known bin folders to the path for nmake test runs
2016-10-27 20:43:25 +02:00
Anatol Belski
1be8339891 prepend known bin folders to the path for nmake test runs 2016-10-27 20:41:41 +02:00
Kalle Sommer Nielsen
dfbcd4e207 Do not overwrite config.nice.bat if --with-config-profile is used on Windows 2016-10-20 13:10:28 +02:00
Kalle Sommer Nielsen
465fdd1de8 T1Lib support was removed in 7.0 2016-10-19 09:02:41 +02:00
Kalle Sommer Nielsen
60d847a0cf Fix typo 2016-10-19 09:01:29 +02:00
Kalle Sommer Nielsen
6ebb447d77 Poor copy/paste mistake, nobody saw I used getrusage.[c|h] as skeleton here! 2016-10-19 07:10:28 +02:00
Kalle Sommer Nielsen
63869d9491 Move these files to the same compilation batch instead of two 2016-10-19 06:44:30 +02:00
Kalle Sommer Nielsen
59090b6499 Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows.
This is very minor and only happens so far for zlib.h, which both ext/zip and ext/zlib looks for.
2016-10-19 06:29:15 +02:00
Kalle Sommer Nielsen
0ffd0a0217 Improve the config.simple.bat for Windows a little;
This adds --with-config-profile=foobar, this generates a config.foobar.bat file in the root of php-src directory with the relevant configuration arguments.
2016-10-19 01:14:15 +02:00
Kalle Sommer Nielsen
d0a3f2e46d Make proc_nice() more in line with that of Unix, as discussed with Anatol 2016-10-18 23:25:59 +02:00
Kalle Sommer Nielsen
6cb13be2c8 Added config.simple for the Windows build system, this is pretty much
like running configure for only the core of PHP and sapi/cli for quick
and fast building.

buildconf
config.simple
nmake
Release_TS\php -v

(This also enables --with-mp for multi processing for a faster build)
2016-10-18 23:13:30 +02:00
Leigh
56908edfbe Merge branch 'master' into remove-mcrypt 2016-10-18 09:17:03 +01:00
Kalle Sommer Nielsen
5c169af7c9 Change the semantics of proc_nice() for Windows to better match the values of the wmic output 2016-10-16 05:21:30 +02:00
Kalle Sommer Nielsen
64945e9387 Implemented proc_nice() for Windows (FR #49806)
The core implementation details are described in win32/nice.c for values sent to proc_nice(), these can however be discussed to maybe comply with those of wmic, Anatol, thoughts?

The test supplied uses wmic for testing the functionality, it could potentially fail on systems where either wmic is not available or the system language is not english (as Microsoft tends to translate even CLI programs).
2016-10-16 04:17:35 +02:00
Anatol Belski
63c7a09786 Merge branch 'PHP-7.1'
* PHP-7.1:
  add zend_bailout to cppcheck conf
2016-10-10 13:12:34 +02:00
Anatol Belski
4b8bdac8db add zend_bailout to cppcheck conf 2016-10-10 13:11:45 +02:00
Leigh
bc4676e050 Remove mcrypt 2016-10-04 13:20:36 +01:00
Anatol Belski
e017b940ab Merge branch 'PHP-7.1'
* PHP-7.1:
  sync win32 makefile with makedist zendparse exports
2016-09-29 13:02:54 +02:00
Anatol Belski
3828323290 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  sync win32 makefile with makedist zendparse exports
2016-09-29 13:02:03 +02:00
Anatol Belski
62bed405da sync win32 makefile with makedist zendparse exports
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
2016-09-29 12:56:49 +02:00
Anatol Belski
558f684e60 Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs_versions.txt
  update libs_versions.txt
2016-09-26 15:42:56 +02:00
Anatol Belski
5e24fe9fde Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs_versions.txt
  update libs_versions.txt
2016-09-26 15:42:32 +02:00
Anatol Belski
eaee65080e update libs_versions.txt 2016-09-26 15:41:41 +02:00
Anatol Belski
59c72a6edb Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs versions
  update libs versions
2016-09-22 17:04:06 +02:00
Anatol Belski
5b46c2b67d Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs versions
  update libs versions
2016-09-22 17:03:49 +02:00
Anatol Belski
11ff616d0f update libs versions 2016-09-22 17:02:54 +02:00
Anatol Belski
edc4de58b7 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
2016-09-01 23:54:33 +02:00
Anatol Belski
7020e6f9ae fix leak 2016-09-01 23:45:31 +02:00
Anatol Belski
cd7853b455 remove duplicated symbol 2016-09-01 23:45:31 +02:00
Anatol Belski
40b49a7f9e Merge branch 'PHP-7.1'
* PHP-7.1:
  add more defs for resource alloc/dealloc
  add yet one define
2016-08-31 12:11:19 +02:00
Anatol Belski
e446ec14e5 add more defs for resource alloc/dealloc 2016-08-31 12:10:40 +02:00
Anatol Belski
4c8e6a2c95 add yet one define 2016-08-31 12:10:40 +02:00
Anatol Belski
5101bd026c Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help message
2016-08-29 18:25:38 +02:00
Anatol Belski
78401a7f01 extend help message 2016-08-29 18:25:00 +02:00