Commit graph

533 commits

Author SHA1 Message Date
Anatol Belski
c210d6fe9b Merge branch 'PHP-7.1'
* PHP-7.1:
  use rather the makefile var
  rename the env setting target and reuse it for build-snap
2016-10-30 15:30:33 +01:00
Anatol Belski
d23aa74f07 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  use rather the makefile var
  rename the env setting target and reuse it for build-snap
2016-10-30 15:30:17 +01:00
Anatol Belski
cdea5eb941 use rather the makefile var 2016-10-30 15:29:13 +01:00
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
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
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
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
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
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
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
4c8e6a2c95 add yet one define 2016-08-31 12:10:40 +02:00
Anatol Belski
90c38299fd Merge branch 'PHP-7.1'
* PHP-7.1:
  fix search path
  support also cppcheck for static analyze
2016-08-29 17:47:21 +02:00
Anatol Belski
3ab2a58753 support also cppcheck for static analyze 2016-08-29 17:44:37 +02:00
Anatol Belski
d2ac2cd40d Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help msg
  fix leak
  extend clang vs compat options
  fix leak
  integrate clang analyzer
2016-08-28 21:20:31 +02:00
Anatol Belski
48b1cb2f12 extend clang vs compat options 2016-08-28 19:42:41 +02:00
Anatol Belski
10c2ac8c81 integrate clang analyzer 2016-08-28 19:42:41 +02:00
Anatol Belski
845f66ba64 increase versions for 7.2 2016-08-02 11:01:57 +02:00
Anatol Belski
661f17663a Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  Make phpize set a proper build type (windows)
2016-07-12 13:03:30 +02:00
y-uti
acc58f1845 Make phpize set a proper build type (windows) 2016-07-12 12:59:11 +02:00
Anatol Belski
d789c4ceb0 Merge branch 'PHP-7.0'
* PHP-7.0:
  extend check for add_flag
2016-03-01 09:36:36 +01:00
Anatol Belski
0df2575e9f extend check for add_flag 2016-03-01 09:36:07 +01:00
Xinchen Hui
dd47b3b963 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed another segfault with file_cache_only now
  Fixed bugs #71317 and #71504
  add test for bug #68957
  update NEWS
  update NEWS
  Fixed #54648 PDO::MSSQL forces format of datetime fields
  remove unneeded free parts
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
  fix nmake clean in phpize mode
2016-03-01 10:51:36 +08:00
Anatol Belski
9ccf3a0292 fix nmake clean in phpize mode 2016-02-29 11:00:09 +01:00
Anatol Belski
e644c9457e Merge branch 'PHP-7.0'
* PHP-7.0:
  cleanup duplicated var
  fix file lists with subdirs passed to EXTENSION()
2016-02-14 17:28:38 +01:00
Anatol Belski
9bef2212aa cleanup duplicated var 2016-02-14 17:20:37 +01:00
Anatol Belski
8289f11390 fix file lists with subdirs passed to EXTENSION()
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like

EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)

are working correctly. Same for

ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
2016-02-14 17:15:20 +01:00
Anatol Belski
6f19ca8553 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix extensions path for nmake install
  fix extensions path for nmake install
  use correct pointer in the math
2016-02-01 15:43:49 +01:00
Anatol Belski
2764586c6d fix extensions path for nmake install 2016-02-01 15:42:32 +01:00
Anatol Belski
5e73db9cb7 integrate the /Gw compiler switch 2016-01-18 18:32:19 +01:00
Anatol Belski
cce370d4c9 fix compiler version check 2016-01-18 18:32:17 +01:00
Anatol Belski
b94ed769f4 integrate /Zc:inline switch 2016-01-18 18:32:15 +01:00
Anatol Belski
e4c190ef6d adjust versions in confutils 2015-09-17 13:31:27 +02:00
Anatol Belski
7f4ae19c80 added /guard:cf to release builds 2015-08-19 10:56:43 +02:00
Kalle Sommer Nielsen
41404bfafd Also silence copy here 2015-06-22 15:26:21 +02:00