[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Fri Apr 24 11:34:27 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- fix logic
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.101r2=1.102diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.101
php-src/win32/build/config.w32:1.102
--- php-src/win32/build/config.w32:1.101Thu Apr 23 20:19:31 2009
+++ php-src/win32/build/config.w32 Fri Apr 24 11:34:27 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.101 2009/04/23 20:19:31 pajoye Exp $
+// $Id: config.w32,v 1.102 2009/04/24 11:34:27 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -150,11 +150,12 @@
if (VCVERS = 1500 PHP_MP != 'disable') {
if(PHP_MP == 'auto') {
ADD_FLAG('CFLAGS', ' /MP ');
- }
- if(parseInt(PHP_MP) != 0) {
- ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');
} else {
- STDOUT.WriteLine('WARNING: Invalid argument for MP: ' +
PHP_MP);
+ if(parseInt(PHP_MP) != 0) {
+ ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');
+ } else {
+ STDOUT.WriteLine('WARNING: Invalid argument for
MP: ' + PHP_MP);
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Fri Apr 24 15:19:10 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- make MP survive --disable-all (=disable to disable it)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.102r2=1.103diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.102
php-src/win32/build/config.w32:1.103
--- php-src/win32/build/config.w32:1.102Fri Apr 24 11:34:27 2009
+++ php-src/win32/build/config.w32 Fri Apr 24 15:19:10 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.102 2009/04/24 11:34:27 pajoye Exp $
+// $Id: config.w32,v 1.103 2009/04/24 15:19:10 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -148,7 +148,7 @@
ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for
compilation', 'auto');
if (VCVERS = 1500 PHP_MP != 'disable') {
- if(PHP_MP == 'auto') {
+ if(PHP_MP == 'auto' || PHP_MP == 'no') {
ADD_FLAG('CFLAGS', ' /MP ');
} else {
if(parseInt(PHP_MP) != 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Thu Apr 23 20:19:31 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: allow to set or disable the multithreaded build (n, auto or disable)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.100r2=1.101diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.100
php-src/win32/build/config.w32:1.101
--- php-src/win32/build/config.w32:1.100Wed Mar 18 10:49:36 2009
+++ php-src/win32/build/config.w32 Thu Apr 23 20:19:31 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.100 2009/03/18 10:49:36 dmitry Exp $
+// $Id: config.w32,v 1.101 2009/04/23 20:19:31 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -146,8 +146,16 @@
}
}
-if (VCVERS = 1500) {
- ADD_FLAG('CFLAGS', ' /MP ');
+ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for
compilation', 'auto');
+if (VCVERS = 1500 PHP_MP != 'disable') {
+ if(PHP_MP == 'auto') {
+ADD_FLAG('CFLAGS', ' /MP ');
+ }
+ if(parseInt(PHP_MP) != 0) {
+ ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');
+ } else {
+ STDOUT.WriteLine('WARNING: Invalid argument for MP: ' +
PHP_MP);
+ }
}
// General link flags
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
kalle Mon Apr 6 09:12:16 2009 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: Fix redef warnings http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.25r2=1.26diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.25 php-src/win32/build/config.w32.h.in:1.26 --- php-src/win32/build/config.w32.h.in:1.25Mon Feb 2 09:49:57 2009 +++ php-src/win32/build/config.w32.h.in Mon Apr 6 09:12:16 2009 @@ -1,9 +1,11 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.25 2009/02/02 09:49:57 pajoye Exp $ + $Id: config.w32.h.in,v 1.26 2009/04/06 09:12:16 kalle Exp $ */ /* Define the minimum supported version */ +#undef _WIN32_WINNT +#undef NTDDI_VERSION #define _WIN32_WINNT 0x500 #define NTDDI_VERSION _WIN32_WIN2K -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Mon Feb 2 09:49:57 2009 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - define HAVE_SOCKLEN_T as it exists (vc6+) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.24r2=1.25diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.24 php-src/win32/build/config.w32.h.in:1.25 --- php-src/win32/build/config.w32.h.in:1.24Fri Jan 23 15:48:58 2009 +++ php-src/win32/build/config.w32.h.in Mon Feb 2 09:49:57 2009 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.24 2009/01/23 15:48:58 kalle Exp $ + $Id: config.w32.h.in,v 1.25 2009/02/02 09:49:57 pajoye Exp $ */ /* Define the minimum supported version */ @@ -148,6 +148,7 @@ /* Win32 supports socketpair by the emulation in win32/sockets.c */ #define HAVE_SOCKETPAIR 1 +#define HAVE_SOCKLEN_T 1 /* Win32 support proc_open */ #define PHP_CAN_SUPPORT_PROC_OPEN 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Mon Jan 19 02:30:18 2009 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - add HAVE_NANOSLEEP http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.21r2=1.22diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.21 php-src/win32/build/config.w32.h.in:1.22 --- php-src/win32/build/config.w32.h.in:1.21Wed Dec 31 19:49:06 2008 +++ php-src/win32/build/config.w32.h.in Mon Jan 19 02:30:18 2009 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.21 2008/12/31 19:49:06 pajoye Exp $ + $Id: config.w32.h.in,v 1.22 2009/01/19 02:30:18 pajoye Exp $ */ /* Define the minimum supported version */ @@ -52,7 +52,9 @@ /* its in win32/time.c */ #define HAVE_USLEEP 1 +#define HAVE_NANOSLEEP 1 +#define HAVE_GETHOSTNAME 1 #define HAVE_GETCWD 1 #define HAVE_POSIX_READDIR_R 1 #define NEED_ISBLANK 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Tue Jan 6 20:47:06 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- add DNSApi for the DNS functions
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.93r2=1.94diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.93 php-src/win32/build/config.w32:1.94
--- php-src/win32/build/config.w32:1.93 Fri Dec 26 14:10:26 2008
+++ php-src/win32/build/config.w32 Tue Jan 6 20:47:06 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.93 2008/12/26 14:10:26 pajoye Exp $
+// $Id: config.w32,v 1.94 2009/01/06 20:47:06 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -157,7 +157,7 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
-DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
+DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib Dnsapi.lib );
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Tue Jan 6 20:51:37 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: add multi threaded build support (automatic detection of the number of
cpus, add a custom number if you prefer to use only a few of your available
cores)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.94r2=1.95diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.94 php-src/win32/build/config.w32:1.95
--- php-src/win32/build/config.w32:1.94 Tue Jan 6 20:47:06 2009
+++ php-src/win32/build/config.w32 Tue Jan 6 20:51:37 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.94 2009/01/06 20:47:06 pajoye Exp $
+// $Id: config.w32,v 1.95 2009/01/06 20:51:37 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -145,6 +145,10 @@
}
}
+if (VCVERS = 1500) {
+ ADD_FLAG('CFLAGS', ' /MP ');
+}
+
// General link flags
DEFINE(LDFLAGS, /nologo /version: +
PHP_VERSION + . + PHP_MINOR_VERSION + . + PHP_RELEASE_VERSION);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Fri Dec 26 14:10:26 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- usual suspects must be in the default include/lib path (thx Rob for the
notice!)
- fix the --wtih-php-build doc, remove dead url, update the name of the deps
dir
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.92r2=1.93diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.92 php-src/win32/build/config.w32:1.93
--- php-src/win32/build/config.w32:1.92 Thu Dec 25 00:03:39 2008
+++ php-src/win32/build/config.w32 Fri Dec 26 14:10:26 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.92 2008/12/25 00:03:39 pajoye Exp $
+// $Id: config.w32,v 1.93 2008/12/26 14:10:26 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -209,7 +209,7 @@
// Find the php_build dir - it contains headers and libraries
// that we need
-ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted the development libraries
(http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of
this source dir (..\\deps) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
if (FSO.FolderExists(..\\deps)) {
@@ -242,6 +242,9 @@
var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\deps\\include;
var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\deps\\lib;
+ADD_FLAG(CFLAGS, '/I ' + php_usual_include_suspects + ' ');
+ADD_FLAG(LDFLAGS, '/libpath:\\' + php_usual_lib_suspects + '\\ ');
+
// Poke around for some headers
function probe_basic_headers()
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Thu Dec 25 00:03:39 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- the config summary is a must, do not allow to disable
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.91r2=1.92diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.91 php-src/win32/build/config.w32:1.92
--- php-src/win32/build/config.w32:1.91 Thu Dec 18 23:20:44 2008
+++ php-src/win32/build/config.w32 Thu Dec 25 00:03:39 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.91 2008/12/18 23:20:44 pajoye Exp $
+// $Id: config.w32,v 1.92 2008/12/25 00:03:39 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -398,8 +398,6 @@
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
-ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
-
if (PHP_DSP != no) {
if (FSO.FolderExists(tmp)) {
FSO.DeleteFolder(tmp);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.81r2=1.82diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.81
php-src/win32/build/confutils.js:1.82
--- php-src/win32/build/confutils.js:1.81 Fri Nov 21 14:03:23 2008
+++ php-src/win32/build/confutils.jsThu Dec 25 00:03:39 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.81 2008/11/21 14:03:23 pajoye Exp $
+// $Id: confutils.js,v 1.82 2008/12/25 00:03:39 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1462,9 +1462,6 @@
function write_summary()
{
var ar = new Array();
- if (PHP_SUMMARY == no) {
- return;
- }
STDOUT.WriteBlankLines(2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Thu Dec 18 23:20:44 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- no need to look for bindlib_w32, not used anymore
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.90r2=1.91diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.90 php-src/win32/build/config.w32:1.91
--- php-src/win32/build/config.w32:1.90 Sat Dec 13 11:59:03 2008
+++ php-src/win32/build/config.w32 Thu Dec 18 23:20:44 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.90 2008/12/13 11:59:03 pajoye Exp $
+// $Id: config.w32,v 1.91 2008/12/18 23:20:44 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -239,8 +239,8 @@
ARG_WITH('extra-includes', 'Extra include path to use when building
everything', '');
ARG_WITH('extra-libs', 'Extra library path to use when linking everything',
'');
-var php_usual_include_suspects =
PHP_PHP_BUILD+\\include;..\\deps\\include;..\\bindlib_w32;;
-var php_usual_lib_suspects =
PHP_PHP_BUILD+\\lib;..\\deps\\lib;..\\bindlib_w32;
+var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\deps\\include;
+var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\deps\\lib;
// Poke around for some headers
function probe_basic_headers()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sat Dec 13 11:59:03 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: fix builds for VC8+, strnlen is available in vc8 and later (used in
spprintf.c)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.89r2=1.90diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.89 php-src/win32/build/config.w32:1.90
--- php-src/win32/build/config.w32:1.89 Fri Nov 21 14:05:04 2008
+++ php-src/win32/build/config.w32 Sat Dec 13 11:59:03 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.89 2008/11/21 14:05:04 pajoye Exp $
+// $Id: config.w32,v 1.90 2008/12/13 11:59:03 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -349,6 +349,9 @@
if (VCVERS = 1300) {
ADD_SOURCES(win32, strtoi64.c);
}
+if (VCVERS = 1400) {
+ AC_DEFINE('HAVE_STRNLEN', 1);
+}
ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c
plain_wrapper.c \
userspace.c transports.c xp_socket.c mmap.c unicode_filter.c
glob_wrapper.c);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
scottmacSat Nov 22 12:39:13 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: Fix build on Windows http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.17r2=1.18diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.17 php-src/win32/build/config.w32.h.in:1.18 --- php-src/win32/build/config.w32.h.in:1.17Sat Aug 23 20:03:29 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 12:39:13 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.17 2008/08/23 20:03:29 pajoye Exp $ + $Id: config.w32.h.in,v 1.18 2008/11/22 12:39:13 scottmac Exp $ */ /* Define the minimum supported version */ @@ -159,3 +159,4 @@ #endif #define HAVE_STDLIB_H 1 +#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Sat Nov 22 13:39:04 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - MFB: make va_copy safer using () around arguments http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.18r2=1.19diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.18 php-src/win32/build/config.w32.h.in:1.19 --- php-src/win32/build/config.w32.h.in:1.18Sat Nov 22 12:39:13 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 13:39:04 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.18 2008/11/22 12:39:13 scottmac Exp $ + $Id: config.w32.h.in,v 1.19 2008/11/22 13:39:04 pajoye Exp $ */ /* Define the minimum supported version */ @@ -159,4 +159,4 @@ #endif #define HAVE_STDLIB_H 1 -#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) +#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sat Aug 23 19:39:07 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- readd the usual suspects to lib/include (was droped with the resolv.h check
removal)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.83r2=1.84diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.83 php-src/win32/build/config.w32:1.84
--- php-src/win32/build/config.w32:1.83 Thu Aug 21 23:37:40 2008
+++ php-src/win32/build/config.w32 Sat Aug 23 19:39:07 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.83 2008/08/21 23:37:40 pajoye Exp $
+// $Id: config.w32,v 1.84 2008/08/23 19:39:07 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -246,6 +246,25 @@
if (PHP_PHP_BUILD != no) {
php_usual_include_suspects += ; + PHP_PHP_BUILD + \\include;
php_usual_lib_suspects += ; + PHP_PHP_BUILD + \\lib;
+
+ path = php_usual_include_suspects.split(';');
+ for (i = 0; i path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ ADD_FLAG(CFLAGS, '/I ' + f + ' ');
+ }
+ }
+ path = php_usual_lib_suspects.split(';');
+ for (i = 0; i path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ if (VCVERS = 1200 f.indexOf( ) = 0) {
+ ADD_FLAG(LDFLAGS, '/libpath:\\' + f
+ '\\ ');
+ } else {
+ ADD_FLAG(LDFLAGS, '/libpath:' + f +
' ');
+ }
+ }
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sat Aug 23 19:50:36 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: - we need it for vc 9 (even if php6 will support officially only 9) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.84r2=1.85diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.84 php-src/win32/build/config.w32:1.85 --- php-src/win32/build/config.w32:1.84 Sat Aug 23 19:39:07 2008 +++ php-src/win32/build/config.w32 Sat Aug 23 19:50:36 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.84 2008/08/23 19:39:07 pajoye Exp $ +// $Id: config.w32,v 1.85 2008/08/23 19:50:36 pajoye Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -339,6 +339,8 @@ php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c \ getopt.c); +ADD_SOURCES(win32, inet.c); + ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c plain_wrapper.c \ userspace.c transports.c xp_socket.c mmap.c unicode_filter.c glob_wrapper.c); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Sat Aug 23 20:03:29 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - MFB!!! _WIN32_WINNT and NTDDI_VERSION (bunnie--;) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.16r2=1.17diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.16 php-src/win32/build/config.w32.h.in:1.17 --- php-src/win32/build/config.w32.h.in:1.16Mon Jul 28 11:34:53 2008 +++ php-src/win32/build/config.w32.h.in Sat Aug 23 20:03:29 2008 @@ -1,8 +1,12 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.16 2008/07/28 11:34:53 pajoye Exp $ + $Id: config.w32.h.in,v 1.17 2008/08/23 20:03:29 pajoye Exp $ */ +/* Define the minimum supported version */ +#define _WIN32_WINNT 0x500 +#define NTDDI_VERSION _WIN32_WIN2K + /* Default PHP / PEAR directories */ #define PHP_CONFIG_FILE_PATH (getenv(SystemRoot))?getenv(SystemRoot): #define CONFIGURATION_FILE_PATH php.ini -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Fri Aug 1 11:25:17 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- add new default dir (old still works)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.81r2=1.82diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.81 php-src/win32/build/config.w32:1.82
--- php-src/win32/build/config.w32:1.81 Thu Jul 31 23:05:02 2008
+++ php-src/win32/build/config.w32 Fri Aug 1 11:25:16 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.81 2008/07/31 23:05:02 pajoye Exp $
+// $Id: config.w32,v 1.82 2008/08/01 11:25:16 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -209,20 +209,24 @@
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
- if (FSO.FolderExists(..\\php_build)) {
- PHP_PHP_BUILD = ..\\php_build;
+ if (FSO.FolderExists(..\\deps)) {
+ PHP_PHP_BUILD = ..\\deps;
} else {
- if (X64) {
- if (FSO.FolderExists(..\\win64build)) {
- PHP_PHP_BUILD = ..\\win64build;
- } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win64-dev\\php_build;
- }
+ if (FSO.FolderExists(..\\php_build)) {
+ PHP_PHP_BUILD = ..\\php_build;
} else {
- if (FSO.FolderExists(..\\win32build)) {
- PHP_PHP_BUILD = ..\\win32build;
- } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
+ if (X64) {
+ if (FSO.FolderExists(..\\win64build)) {
+ PHP_PHP_BUILD = ..\\win64build;
+ } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win64-dev\\php_build;
+ }
+ } else {
+ if (FSO.FolderExists(..\\win32build)) {
+ PHP_PHP_BUILD = ..\\win32build;
+ } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win32-dev\\php_build;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Thu Jul 31 23:05:03 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- new usual suspects
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.80r2=1.81diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.80 php-src/win32/build/config.w32:1.81
--- php-src/win32/build/config.w32:1.80 Mon Jul 28 11:51:28 2008
+++ php-src/win32/build/config.w32 Thu Jul 31 23:05:02 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.80 2008/07/28 11:51:28 pajoye Exp $
+// $Id: config.w32,v 1.81 2008/07/31 23:05:02 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -231,8 +231,8 @@
ARG_WITH('extra-includes', 'Extra include path to use when building
everything', '');
ARG_WITH('extra-libs', 'Extra library path to use when linking everything',
'');
-var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\bindlib_w32;
-var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\bindlib_w32;
+var php_usual_include_suspects =
PHP_PHP_BUILD+\\include;..\\deps\\include;..\\bindlib_w32;;
+var php_usual_lib_suspects =
PHP_PHP_BUILD+\\lib;..\\deps\\lib;..\\bindlib_w32;
// Poke around for some headers
function probe_basic_headers()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Mon Jul 28 11:51:28 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: - not here anymore (old crypt implementation) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.79r2=1.80diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.79 php-src/win32/build/config.w32:1.80 --- php-src/win32/build/config.w32:1.79 Mon Jul 21 09:56:37 2008 +++ php-src/win32/build/config.w32 Mon Jul 28 11:51:28 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.79 2008/07/21 09:56:37 sfox Exp $ +// $Id: config.w32,v 1.80 2008/07/28 11:51:28 pajoye Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -336,7 +336,7 @@ ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c plain_wrapper.c \ userspace.c transports.c xp_socket.c mmap.c unicode_filter.c glob_wrapper.c); -ADD_SOURCES(win32, crypt_win32.c glob.c md5crypt.c readdir.c \ +ADD_SOURCES(win32, glob.c readdir.c \ registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c globals.c); STDOUT.WriteBlankLines(1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sun Jul 13 09:34:46 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: wrong bracket position while merging
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.77r2=1.78diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.77 php-src/win32/build/config.w32:1.78
--- php-src/win32/build/config.w32:1.77 Sat Jul 12 23:42:09 2008
+++ php-src/win32/build/config.w32 Sun Jul 13 09:34:46 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.77 2008/07/12 23:42:09 pajoye Exp $
+// $Id: config.w32,v 1.78 2008/07/13 09:34:46 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -295,7 +295,7 @@
// We can't probe for libs before this line
-if (!(CHECK_LIB(resolv_a.lib) ) || CHECK_LIB(resolv.lib) ) {
+if (!(CHECK_LIB(resolv_a.lib) || CHECK_LIB(resolv.lib))) {
ERROR(We really need that arpa\\nameser.h file - it is part of the
bindlib package);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sat Jul 12 23:42:09 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- support for new naming
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.76r2=1.77diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.76 php-src/win32/build/config.w32:1.77
--- php-src/win32/build/config.w32:1.76 Wed Jul 9 10:39:11 2008
+++ php-src/win32/build/config.w32 Sat Jul 12 23:42:09 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.76 2008/07/09 10:39:11 scottmac Exp $
+// $Id: config.w32,v 1.77 2008/07/12 23:42:09 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -295,7 +295,9 @@
// We can't probe for libs before this line
-CHECK_LIB(resolv.lib);
+if (!(CHECK_LIB(resolv_a.lib) ) || CHECK_LIB(resolv.lib) ) {
+ ERROR(We really need that arpa\\nameser.h file - it is part of the
bindlib package);
+}
// Do we want static ICU lib
ARG_WITH('static-icu', 'Link against the static version of the ICU library',
'no');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
scottmacWed Jul 9 10:39:11 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: Fix windows build http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.75r2=1.76diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.75 php-src/win32/build/config.w32:1.76 --- php-src/win32/build/config.w32:1.75 Mon Jul 7 13:48:23 2008 +++ php-src/win32/build/config.w32 Wed Jul 9 10:39:11 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.75 2008/07/07 13:48:23 pajoye Exp $ +// $Id: config.w32,v 1.76 2008/07/09 10:39:11 scottmac Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -311,7 +311,7 @@ } ADD_FLAG(LIBS, icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib); } - + //DEFINE(PHP_BUILD, PHP_PHP_BUILD); STDOUT.WriteBlankLines(1); @@ -328,7 +328,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c \ - zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c); + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Mon Jul 7 13:48:23 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- move common functions to confutil
- MFB: allow to disable the summary (and move test in the function)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.74r2=1.75diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.74 php-src/win32/build/config.w32:1.75
--- php-src/win32/build/config.w32:1.74 Sun Jul 6 09:56:01 2008
+++ php-src/win32/build/config.w32 Mon Jul 7 13:48:23 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.74 2008/07/06 09:56:01 pajoye Exp $
+// $Id: config.w32,v 1.75 2008/07/07 13:48:23 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -8,38 +8,16 @@
if (!CL) {
ERROR(MS C++ compiler is required);
}
-// Which version of the compiler do we have ?
-function probe_binary(EXE, what)
-{
- // tricky escapes to get stderr redirection to work
- var command = 'cmd /c ' + EXE;
- if (what == version) {
- command = command + ' -v';
- }
- var version = execute(command + ' 21');
-
- if (what == 64) {
- if (version.match(/x64/)) {
- return 1;
- }
- } else {
- if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
- return RegExp.$1;
- }
- }
- return 0;
-}
-
-// Which version of the compiler do we have?
-VCVERS = probe_binary(CL);
-VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
-STDOUT.WriteLine(Detected MS compiler version + VCVERS);
// 1200 is VC6
// 1300 is vs.net 2002
// 1310 is vs.net 2003
// 1400 is vs.net 2005
// 1500 is vs.net 2008
+// Which version of the compiler do we have?
+VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine( Detected compiler + VC_VERSIONS[VCVERS]);
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
@@ -402,3 +380,5 @@
}
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
+
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.75r2=1.76diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.75
php-src/win32/build/confutils.js:1.76
--- php-src/win32/build/confutils.js:1.75 Sat Jul 5 19:52:45 2008
+++ php-src/win32/build/confutils.jsMon Jul 7 13:48:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.75 2008/07/05 19:52:45 pajoye Exp $
+// $Id: confutils.js,v 1.76 2008/07/07 13:48:23 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -31,11 +31,11 @@
var sapi_enabled = new Array();
var VC_VERSIONS = new Array();
-VC_VERSIONS[1200] = 'VC6';
-VC_VERSIONS[1300] = 'Visual C++ 2002';
-VC_VERSIONS[1310] = 'Visual C++ 2003';
-VC_VERSIONS[1400] = 'Visual C++ 2005';
-VC_VERSIONS[1500] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
@@ -108,6 +108,27 @@
return ret;
}
+function probe_binary(EXE, what)
+{
+ // tricky escapes to get stderr redirection to work
+ var command = 'cmd /c ' + EXE;
+ if (what == version) {
+ command = command + ' -v';
+ }
+ var version = execute(command + ' 21');
+
+ if (what == 64) {
+ if (version.match(/x64/)) {
+ return 1;
+ }
+ } else {
+ if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+ return RegExp.$1;
+ }
+ }
+ return 0;
+}
+
function condense_path(path)
{
path = FSO.GetAbsolutePathName(path);
@@ -1376,6 +1397,9 @@
function write_summary()
{
var ar = new Array();
+ if (PHP_SUMMARY == no) {
+ return;
+ }
STDOUT.WriteBlankLines(2);
@@ -1426,7 +1450,6 @@
generate_config_h();
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
-
write_summary();
if (PHP_SNAPSHOT_BUILD != no) {
@@ -1732,7 +1755,6 @@
return items;
}
-
// for snapshot builders, this option will attempt to enable everything
// and you can then build everything, ignoring fatal errors within a module
// by running nmake snap
@@ -1743,5 +1765,3 @@
// several objects at once, reducing overhead of starting new
// compiler processes.
ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and
snapshot
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sun Jul 6 09:56:01 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: correctly test the VCVERS (four digits now)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.73r2=1.74diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.73 php-src/win32/build/config.w32:1.74
--- php-src/win32/build/config.w32:1.73 Sat Jul 5 19:52:44 2008
+++ php-src/win32/build/config.w32 Sun Jul 6 09:56:01 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.73 2008/07/05 19:52:44 pajoye Exp $
+// $Id: config.w32,v 1.74 2008/07/06 09:56:01 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -144,7 +144,7 @@
DEFINE(CFLAGS, /nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
-if (VCVERS 14) {
+if (VCVERS 1400) {
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
@@ -154,7 +154,7 @@
}
}
-if (VCVERS = 14) {
+if (VCVERS = 1400) {
// fun stuff: MS deprecated ANSI stdio and similar functions
// disable annoying warnings. In addition, time_t defaults
// to 64-bit. Ask for 32-bit.
@@ -301,7 +301,7 @@
for (i = 0; i path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- if (VCVERS = 12 f.indexOf( ) = 0) {
+ if (VCVERS = 1200 f.indexOf( ) = 0) {
ADD_FLAG(LDFLAGS, '/libpath:\\' + f
+ '\\ ');
} else {
ADD_FLAG(LDFLAGS, '/libpath:' + f +
' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Sat Jul 5 19:52:45 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- improve detection of VC version and summary (2k2 and 2k3 are 1300 and resp.
1310) (Thx Marcus)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.72r2=1.73diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.72 php-src/win32/build/config.w32:1.73
--- php-src/win32/build/config.w32:1.72 Wed Jul 2 20:55:33 2008
+++ php-src/win32/build/config.w32 Sat Jul 5 19:52:44 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.72 2008/07/02 20:55:33 pajoye Exp $
+// $Id: config.w32,v 1.73 2008/07/05 19:52:44 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -31,13 +31,15 @@
}
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 2);
+VCVERS = probe_binary(CL);
+VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
STDOUT.WriteLine(Detected MS compiler version + VCVERS);
-// 12 is VC6
-// 13 is vs.net 2003
-// 14 is vs.net 2005
-// 15 is vs.net 2008
+// 1200 is VC6
+// 1300 is vs.net 2002
+// 1310 is vs.net 2003
+// 1400 is vs.net 2005
+// 1500 is vs.net 2008
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.74r2=1.75diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.74
php-src/win32/build/confutils.js:1.75
--- php-src/win32/build/confutils.js:1.74 Wed Jul 2 20:54:10 2008
+++ php-src/win32/build/confutils.jsSat Jul 5 19:52:45 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.74 2008/07/02 20:54:10 pajoye Exp $
+// $Id: confutils.js,v 1.75 2008/07/05 19:52:45 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -30,15 +30,12 @@
var extensions_enabled = new Array();
var sapi_enabled = new Array();
-// 12 is VC6
-// 13 is vs.net 2003
-// 14 is vs.net 2005
-// 15 is vs.net 2008
var VC_VERSIONS = new Array();
-VC_VERSIONS[12] = 'VC6';
-VC_VERSIONS[13] = 'Visual C++ 2003';
-VC_VERSIONS[14] = 'Visual C++ 2005';
-VC_VERSIONS[15] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'VC6';
+VC_VERSIONS[1300] = 'Visual C++ 2002';
+VC_VERSIONS[1310] = 'Visual C++ 2003';
+VC_VERSIONS[1400] = 'Visual C++ 2005';
+VC_VERSIONS[1500] = 'Visual C++ 2008';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Wed Jul 2 20:55:33 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: compiler version and architecture detections
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.71r2=1.72diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.71 php-src/win32/build/config.w32:1.72
--- php-src/win32/build/config.w32:1.71 Wed Mar 26 14:46:17 2008
+++ php-src/win32/build/config.w32 Wed Jul 2 20:55:33 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.71 2008/03/26 14:46:17 scottmac Exp $
+// $Id: config.w32,v 1.72 2008/07/02 20:55:33 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -9,35 +9,38 @@
ERROR(MS C++ compiler is required);
}
// Which version of the compiler do we have ?
-function probe_msvc_compiler_version(CL)
+function probe_binary(EXE, what)
{
// tricky escapes to get stderr redirection to work
- var banner = execute('cmd /c ' + CL + ' 21');
- if (banner.match(/(\d+)\.(\d+)\.(\d+)(\.(\d+))?/)) {
- return RegExp.$1;
+ var command = 'cmd /c ' + EXE;
+ if (what == version) {
+ command = command + ' -v';
+ }
+ var version = execute(command + ' 21');
+
+ if (what == 64) {
+ if (version.match(/x64/)) {
+ return 1;
+ }
+ } else {
+ if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+ return RegExp.$1;
+ }
}
return 0;
}
-VCVERS = probe_msvc_compiler_version(CL);
+// Which version of the compiler do we have?
+VCVERS = probe_binary(CL).substr(0, 2);
STDOUT.WriteLine(Detected MS compiler version + VCVERS);
// 12 is VC6
// 13 is vs.net 2003
// 14 is vs.net 2005
+// 15 is vs.net 2008
// do we use x64 or 80x86 version of compiler?
-function probe_msvc_compiler_x64(CL)
-{
- // tricky escapes to get stderr redirection to work
- var banner = execute('cmd /c ' + CL + ' 21');
- if (banner.match(/x64/)) {
- return 1;
- }
- return 0;
-}
-
-X64 = probe_msvc_compiler_x64(CL);
+X64 = probe_binary(CL, 64);
if (X64) {
STDOUT.WriteLine(Detected 64-bit compiler);
} else {
@@ -47,7 +50,6 @@
// cygwin now ships with link.exe. Avoid searching the cygwin path
// for this, as we want the MS linker, not the fileutil
PATH_PROG('link', WshShell.Environment(Process).Item(PATH));
-
PATH_PROG('nmake');
// we don't want to define LIB, as that will override the default library path
@@ -152,7 +154,8 @@
if (VCVERS = 14) {
// fun stuff: MS deprecated ANSI stdio and similar functions
- // disable annoying warnings
+ // disable annoying warnings. In addition, time_t defaults
+ // to 64-bit. Ask for 32-bit.
if (X64) {
ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
} else {
@@ -176,17 +179,13 @@
DEFINE(PHP_LDFLAGS, $(DLL_LDFLAGS));
// General libs
-// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
+// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
-
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
- if (X64) {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Zi /Od /D _DEBUG /D
ZEND_DEBUG=1);
- } else {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /D _DEBUG /D
ZEND_DEBUG=1);
- }
+ ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 +
+ (X64?/Zi:/ZI));
ADD_FLAG(LDFLAGS, /debug);
// Avoid problems when linking to release libraries that use the release
// version of the libc
@@ -207,7 +206,7 @@
if (PHP_ZTS == yes) {
ADD_FLAG(CFLAGS, /D ZTS=1);
}
-
+
// we want msvcrt in the PHP DLL
ADD_FLAG(PHP_LDFLAGS, /nodefaultlib:libcmt);
@@ -278,7 +277,7 @@
ADD_FLAG(LDFLAGS, '/libpath:' + p + ' ');
php_usual_lib_suspects += ; + p;
} else if (!p) {
- ERROR(We really need that arpa\\nameser.h file - it is part of
the win32build package);
+ ERROR(We really need that arpa\\nameser.h file - it is part of
the bindlib package);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
dmitry Thu Jan 24 18:08:23 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: Fixed win32 build http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.69r2=1.70diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.69 php-src/win32/build/config.w32:1.70 --- php-src/win32/build/config.w32:1.69 Mon Oct 1 12:32:39 2007 +++ php-src/win32/build/config.w32 Thu Jan 24 18:08:23 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.69 2007/10/01 12:32:39 jani Exp $ +// $Id: config.w32,v 1.70 2008/01/24 18:08:23 dmitry Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -319,7 +319,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c \ - zend_default_classes.c zend_execute.c zend_strtod.c); + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
stasTue May 29 19:44:24 2007 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
fix build on msvc 8
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.66r2=1.67diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.66 php-src/win32/build/config.w32:1.67
--- php-src/win32/build/config.w32:1.66 Wed Apr 18 09:48:07 2007
+++ php-src/win32/build/config.w32 Tue May 29 19:44:24 2007
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.66 2007/04/18 09:48:07 rrichards Exp $
+// $Id: config.w32,v 1.67 2007/05/29 19:44:24 stas Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -126,7 +126,7 @@
if (X64) {
ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
} else {
- ADD_FLAG('CFLAGS', ' /wd4996 ');
+ ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
}
if (PHP_DEBUG == yes) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 config.w32.h.in
dmitry Tue Apr 10 06:22:45 2007 UTC
Modified files:
/php-src/win32/buildconfig.w32 config.w32.h.in
Log:
Initial WIN64 support
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.63r2=1.64diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.63 php-src/win32/build/config.w32:1.64
--- php-src/win32/build/config.w32:1.63 Sat Mar 3 21:40:23 2007
+++ php-src/win32/build/config.w32 Tue Apr 10 06:22:45 2007
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.63 2007/03/03 21:40:23 helly Exp $
+// $Id: config.w32,v 1.64 2007/04/10 06:22:45 dmitry Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -26,6 +26,24 @@
// 13 is vs.net 2003
// 14 is vs.net 2005
+// do we use x64 or 80x86 version of compiler?
+function probe_msvc_compiler_x64(CL)
+{
+ // tricky escapes to get stderr redirection to work
+ var banner = execute('cmd /c ' + CL + ' 21');
+ if (banner.match(/x64/)) {
+ return 1;
+ }
+ return 0;
+}
+
+X64 = probe_msvc_compiler_x64(CL);
+if (X64) {
+ STDOUT.WriteLine(Detected 64-bit compiler);
+} else {
+ STDOUT.WriteLine(Detected 32-bit compiler);
+}
+
// cygwin now ships with link.exe. Avoid searching the cygwin path
// for this, as we want the MS linker, not the fileutil
PATH_PROG('link', WshShell.Environment(Process).Item(PATH));
@@ -58,6 +76,11 @@
ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + '
does not exist');
}
PHP_OBJECT_OUT_DIR += '\\';
+} else if (X64) {
+ if (!FSO.FolderExists(x64)) {
+ FSO.CreateFolder(x64);
+ }
+ PHP_OBJECT_OUT_DIR = 'x64\\';
}
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
@@ -100,7 +123,12 @@
if (VCVERS = 14) {
// fun stuff: MS deprecated ANSI stdio and similar functions
// disable annoying warnings
- ADD_FLAG('CFLAGS', ' /wd4996 ');
+ if (X64) {
+ ADD_FLAG('CFLAGS', ' /wd4996 ');
+// ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
+ } else {
+ ADD_FLAG('CFLAGS', ' /wd4996 ');
+ }
if (PHP_DEBUG == yes) {
// Set some debug/release specific options
@@ -125,7 +153,11 @@
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /D _DEBUG /D ZEND_DEBUG=1);
+ if (X64) {
+ ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Zi /Od /D _DEBUG /D
ZEND_DEBUG=1);
+ } else {
+ ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /D _DEBUG /D
ZEND_DEBUG=1);
+ }
ADD_FLAG(LDFLAGS, /debug);
// Avoid problems when linking to release libraries that use the release
// version of the libc
@@ -176,18 +208,28 @@
if (PHP_PHP_BUILD == 'no') {
if (FSO.FolderExists(..\\php_build)) {
PHP_PHP_BUILD = ..\\php_build;
- } else if (FSO.FolderExists(..\\win32build)) {
- PHP_PHP_BUILD = ..\\win32build;
- } else if (FSO.FolderExists(..\\php-win32-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
+ } else {
+ if (X64) {
+ if (FSO.FolderExists(..\\win64build)) {
+ PHP_PHP_BUILD = ..\\win64build;
+ } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
+ PHP_PHP_BUILD = ..\\php-win64-dev\\php_build;
+ }
+ } else {
+ if (FSO.FolderExists(..\\win32build)) {
+ PHP_PHP_BUILD = ..\\win32build;
+ } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
+ }
+ }
}
}
ARG_WITH('extra-includes', 'Extra include path to use when building
everything', '');
ARG_WITH('extra-libs', 'Extra library path to use when linking everything',
'');
-var php_usual_include_suspects =
..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32;
-var php_usual_lib_suspects =
..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32;
+var php_usual_include_suspects = PHP_PHP_BUILD+\\include;..\\bindlib_w32;
+var php_usual_lib_suspects = PHP_PHP_BUILD+\\lib;..\\bindlib_w32;
// Poke around for some headers
function probe_basic_headers()
@@ -323,7 +365,9 @@
if (PHP_SNAPSHOT_TEMPLATE == no) {
/* default is as a sibling of the php_build dir */
- if (FSO.FolderExists(PHP_PHP_BUILD + \\..\\template)) {
+ if (FSO.FolderExists(PHP_PHP_BUILD + \\template)) {
+ PHP_SNAPSHOT_TEMPLATE = FSO.GetAbsolutePathName(PHP_PHP_BUILD +
\\template);
+ } else if (FSO.FolderExists(PHP_PHP_BUILD + \\..\\template)) {
PHP_SNAPSHOT_TEMPLATE =
[PHP-CVS] cvs: php-src /win32/build config.w32
dmitry Tue Nov 14 14:20:41 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Fixed VC2005 support
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.58r2=1.59diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.58 php-src/win32/build/config.w32:1.59
--- php-src/win32/build/config.w32:1.58 Tue Nov 14 14:11:05 2006
+++ php-src/win32/build/config.w32 Tue Nov 14 14:20:41 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.58 2006/11/14 14:11:05 dmitry Exp $
+// $Id: config.w32,v 1.59 2006/11/14 14:20:41 dmitry Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -226,7 +226,7 @@
for (i = 0; i path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- if (f.indexOf( ) = 0) {
+ if (VCVERS = 12 f.indexOf( ) = 0) {
ADD_FLAG(LDFLAGS, '/libpath:\\' + f
+ '\\ ');
} else {
ADD_FLAG(LDFLAGS, '/libpath:' + f +
' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
dmitry Tue Nov 14 14:11:05 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Fixed problem with spaces in libpath
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.57r2=1.58diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.57 php-src/win32/build/config.w32:1.58
--- php-src/win32/build/config.w32:1.57 Fri Nov 10 09:56:37 2006
+++ php-src/win32/build/config.w32 Tue Nov 14 14:11:05 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.57 2006/11/10 09:56:37 dmitry Exp $
+// $Id: config.w32,v 1.58 2006/11/14 14:11:05 dmitry Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -226,7 +226,11 @@
for (i = 0; i path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- ADD_FLAG(LDFLAGS, '/libpath:' + f + ' ');
+ if (f.indexOf( ) = 0) {
+ ADD_FLAG(LDFLAGS, '/libpath:\\' + f
+ '\\ ');
+ } else {
+ ADD_FLAG(LDFLAGS, '/libpath:' + f +
' ');
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Sat Apr 29 06:24:21 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Add new configure option --enable-pdb-files
This will generate .pdb files for debugging
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.53r2=1.54diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.53 php-src/win32/build/config.w32:1.54
--- php-src/win32/build/config.w32:1.53 Wed Mar 29 01:20:43 2006
+++ php-src/win32/build/config.w32 Sat Apr 29 06:24:21 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.53 2006/03/29 01:20:43 pollita Exp $
+// $Id: config.w32,v 1.54 2006/04/29 06:24:21 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -313,6 +313,11 @@
ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
+ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
+if (PHP_PDB_FILES == yes) {
+ ADD_FLAG(LDFLAGS, /debug /opt:ref);
+}
+
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Sat Apr 29 14:33:35 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Revert patch for pdb files. No need to have it twice!
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.54r2=1.55diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.54 php-src/win32/build/config.w32:1.55
--- php-src/win32/build/config.w32:1.54 Sat Apr 29 06:24:21 2006
+++ php-src/win32/build/config.w32 Sat Apr 29 14:33:35 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.54 2006/04/29 06:24:21 fmk Exp $
+// $Id: config.w32,v 1.55 2006/04/29 14:33:35 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -313,11 +313,6 @@
ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
-ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
-if (PHP_PDB_FILES == yes) {
- ADD_FLAG(LDFLAGS, /debug /opt:ref);
-}
-
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in ZendEngine2 zend.h zend_config.w32.h ZendEngine2/tests bug36568.phpt
dmitry Tue Mar 14 14:19:20 2006 UTC
Modified files:
/ZendEngine2zend.h zend_config.w32.h
/ZendEngine2/tests bug36568.phpt
/php-src/win32/buildconfig.w32.h.in
Log:
Fixed bug #36568 (memory_limit setting on win32 has no effect)
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.h?r1=1.316r2=1.317diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.316 ZendEngine2/zend.h:1.317
--- ZendEngine2/zend.h:1.316Fri Mar 3 09:56:47 2006
+++ ZendEngine2/zend.h Tue Mar 14 14:19:19 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.h,v 1.316 2006/03/03 09:56:47 johannes Exp $ */
+/* $Id: zend.h,v 1.317 2006/03/14 14:19:19 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -92,7 +92,7 @@
#endif /* HAVE_MACH_O_DYLD_H */
-#if defined(HAVE_LIBDL) !defined(HAVE_MACH_O_DYLD_H)
+#if defined(HAVE_LIBDL) !defined(HAVE_MACH_O_DYLD_H) !defined(ZEND_WIN32)
# ifndef RTLD_LAZY
# define RTLD_LAZY 1/* Solaris 1, FreeBSD's (2.1.7.1 and older) */
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_config.w32.h?r1=1.41r2=1.42diff_format=u
Index: ZendEngine2/zend_config.w32.h
diff -u ZendEngine2/zend_config.w32.h:1.41 ZendEngine2/zend_config.w32.h:1.42
--- ZendEngine2/zend_config.w32.h:1.41 Tue Feb 21 08:00:38 2006
+++ ZendEngine2/zend_config.w32.h Tue Mar 14 14:19:19 2006
@@ -17,14 +17,15 @@
+--+
*/
-/* $Id: zend_config.w32.h,v 1.41 2006/02/21 08:00:38 dmitry Exp $ */
+/* $Id: zend_config.w32.h,v 1.42 2006/03/14 14:19:19 dmitry Exp $ */
#ifndef ZEND_CONFIG_W32_H
#define ZEND_CONFIG_W32_H
#define USE_ZEND_ALLOC 1
-#define HAVE_ALLOCA 1
-#define HAVE_LIMITS_H 1
+
+#include ../main/config.w32.h
+
#define _CRTDBG_MAP_ALLOC
#include malloc.h
@@ -44,19 +45,9 @@
typedef unsigned long ulong;
typedef unsigned int uint;
-#undef HAVE_KILL
-#define HAVE_GETPID 1
-/* #define HAVE_ALLOCA_H 1 */
-#define HAVE_MEMCPY 1
-#define HAVE_STRDUP 1
-#define HAVE_SYS_TYPES_H 1
#define HAVE_STDIOSTR_H 1
#define HAVE_CLASS_ISTDIOSTREAM
#define istdiostream stdiostream
-#define HAVE_STDARG_H 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_STRCOLL 1
#define snprintf _snprintf
#define vsnprintf _vsnprintf
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/bug36568.phpt?r1=1.1r2=1.2diff_format=u
Index: ZendEngine2/tests/bug36568.phpt
diff -u /dev/null ZendEngine2/tests/bug36568.phpt:1.2
--- /dev/null Tue Mar 14 14:19:20 2006
+++ ZendEngine2/tests/bug36568.phpt Tue Mar 14 14:19:19 2006
@@ -0,0 +1,15 @@
+--TEST--
+Bug #36568 (memory_limit has no effect)
+--SKIPIF--
+?php
+ if (!function_exists('memory_get_usage')) die('skip PHP is configured
without memory_limit');
+?
+--INI--
+memory_limit=16M
+--FILE--
+?php
+ini_set(memory_limit, 32M);
+echo ini_get(memory_limit);
+?
+--EXPECT--
+32M
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32.h.in?r1=1.9r2=1.10diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.9
php-src/win32/build/config.w32.h.in:1.10
--- php-src/win32/build/config.w32.h.in:1.9 Wed Jan 11 20:24:07 2006
+++ php-src/win32/build/config.w32.h.in Tue Mar 14 14:19:19 2006
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.9 2006/01/11 20:24:07 helly Exp $
+ $Id: config.w32.h.in,v 1.10 2006/03/14 14:19:19 dmitry Exp $
*/
/* Default PHP / PEAR directories */
@@ -107,7 +107,11 @@
#undef HAVE_SYS_WAIT_H
#define HAVE_SYSLOG_H 1
#undef HAVE_UNISTD_H
-#define HAVE_LIBDL 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDARG_H 1
+#undef HAVE_ALLOCA_H
+#undef HAVE_KILL
+#define HAVE_GETPID 1
#define HAVE_LIBM 1
#define HAVE_CUSERID 0
#undef HAVE_RINT
@@ -143,3 +147,10 @@
#undef HAVE_ATOF_ACCEPTS_NAN
#undef HAVE_ATOF_ACCEPTS_INF
#define HAVE_HUGE_VAL_NAN 1
+
+/* vs.net 2005 has a 64-bit time_t. This will likely break
+ * 3rdParty libs that were built with older compilers; switch
+ * back to 32-bit */
+#define _USE_32BIT_TIME_T 1
+#define HAVE_STDLIB_H 1
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
helly Wed Jan 11 20:24:07 2006 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - Add short size info http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32.h.in?r1=1.8r2=1.9diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.8 php-src/win32/build/config.w32.h.in:1.9 --- php-src/win32/build/config.w32.h.in:1.8 Wed Sep 21 08:40:52 2005 +++ php-src/win32/build/config.w32.h.in Wed Jan 11 20:24:07 2006 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.8 2005/09/21 08:40:52 derick Exp $ + $Id: config.w32.h.in,v 1.9 2006/01/11 20:24:07 helly Exp $ */ /* Default PHP / PEAR directories */ @@ -112,6 +112,7 @@ #define HAVE_CUSERID 0 #undef HAVE_RINT #define HAVE_STRFTIME 1 +#define SIZEOF_SHORT 2 /* int and long are stll 32bit in 64bit compiles */ #define SIZEOF_INT 4 #define SIZEOF_LONG 4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Mon Nov 21 19:29:34 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
/Gz and /RTC1 is for debug builds
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.50r2=1.51ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.50 php-src/win32/build/config.w32:1.51
--- php-src/win32/build/config.w32:1.50 Sun Nov 20 12:03:58 2005
+++ php-src/win32/build/config.w32 Mon Nov 21 19:29:30 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.50 2005/11/20 17:03:58 sebastian Exp $
+// $Id: config.w32,v 1.51 2005/11/22 00:29:30 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -88,8 +88,10 @@
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /GZ ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
}
if (VCVERS = 14) {
@@ -97,8 +99,10 @@
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /RTC1 ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
+ }
}
// General link flags
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
sebastian Sun Nov 20 12:03:59 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
MFB: Use /RTC1 instead of /GZ for MS VisualStudio 2005.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.49r2=1.50ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.49 php-src/win32/build/config.w32:1.50
--- php-src/win32/build/config.w32:1.49 Thu Nov 17 21:50:46 2005
+++ php-src/win32/build/config.w32 Sun Nov 20 12:03:58 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.49 2005/11/18 02:50:46 rrichards Exp $
+// $Id: config.w32,v 1.50 2005/11/20 17:03:58 sebastian Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -87,12 +87,18 @@
if (VCVERS 14) {
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
+
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
}
if (VCVERS = 14) {
// fun stuff: MS deprecated ANSI stdio and similar functions
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
+
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
}
// General link flags
@@ -112,7 +118,7 @@
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
- ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /GZ /D _DEBUG /D
ZEND_DEBUG=1);
+ ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /D _DEBUG /D ZEND_DEBUG=1);
ADD_FLAG(LDFLAGS, /debug);
// Avoid problems when linking to release libraries that use the release
// version of the libc
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
rrichards Thu Nov 17 21:50:49 2005 EDT Modified files: /php-src/win32/buildconfig.w32 Log: fix configure - reflection is its own extension http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.48r2=1.49ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.48 php-src/win32/build/config.w32:1.49 --- php-src/win32/build/config.w32:1.48 Thu Sep 22 09:18:14 2005 +++ php-src/win32/build/config.w32 Thu Nov 17 21:50:46 2005 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.48 2005/09/22 13:18:14 edink Exp $ +// $Id: config.w32,v 1.49 2005/11/18 02:50:46 rrichards Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -261,7 +261,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c \ - zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c zend_strtod.c); + zend_mm.c zend_default_classes.c zend_execute.c zend_strtod.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Thu Sep 22 09:18:14 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
MFB: Fix building of extensions that inlcude extname/header.h
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.47r2=1.48ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.47 php-src/win32/build/config.w32:1.48
--- php-src/win32/build/config.w32:1.47 Fri Aug 12 22:47:24 2005
+++ php-src/win32/build/config.w32 Thu Sep 22 09:18:14 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.47 2005/08/13 02:47:24 wez Exp $
+// $Id: config.w32,v 1.48 2005/09/22 13:18:14 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -72,7 +72,7 @@
}
DEFINE('PHP_PREFIX', PHP_PREFIX);
-DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM );
+DEFINE(BASE_INCLUDES, /I . /I main /I regex /I Zend /I TSRM /I ext );
// CFLAGS for building the PHP dll
DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32
On Thu, 22 Sep 2005, Edin Kadribasic wrote: edink Thu Sep 22 09:18:14 2005 EDT Modified files: /php-src/win32/build config.w32 Log: MFB: Fix building of extensions that inlcude extname/header.h Wouldn't it be better to fix the extensions to include ext/ in their include path to the headers? This makes more sense IMO. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
derick Wed Sep 21 04:40:56 2005 EDT Modified files: /php-src/win32/buildconfig.w32.h.in Log: - Fixed definition in correct file. (Patch by Nuno) http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.7r2=1.8ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7 php-src/win32/build/config.w32.h.in:1.8 --- php-src/win32/build/config.w32.h.in:1.7 Thu Jun 9 09:09:04 2005 +++ php-src/win32/build/config.w32.h.in Wed Sep 21 04:40:52 2005 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7 2005/06/09 13:09:04 wez Exp $ + $Id: config.w32.h.in,v 1.8 2005/09/21 08:40:52 derick Exp $ */ /* Default PHP / PEAR directories */ @@ -117,7 +117,7 @@ #define SIZEOF_LONG 4 /* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */ #define SIZEOF_LONG_LONG_INT 0 -#define SIZEOF_LONG_LONG 0 +#define SIZEOF_LONG_LONG 8 /* defined as __int64 */ #define SIZEOF_INTMAX_T 0 #define ssize_t SSIZE_T #ifdef _WIN64 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Fri Aug 12 07:37:45 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Added --enable-static-icu / --disable-static-icu windows configure
options that allow you to pick weather you want to link against static
or DLL version of the ICU library.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.44r2=1.45ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.44 php-src/win32/build/config.w32:1.45
--- php-src/win32/build/config.w32:1.44 Thu Aug 11 20:08:28 2005
+++ php-src/win32/build/config.w32 Fri Aug 12 07:37:44 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.44 2005/08/12 00:08:28 sniper Exp $
+// $Id: config.w32,v 1.45 2005/08/12 11:37:44 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -76,8 +76,17 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
-DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib);
+DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
+// Do we want static ICU lib
+ARG_ENABLE('static-icu', 'Link against the static version of the ICU library',
'no');
+if (PHP_STATIC_ICU == yes) {
+ ADD_FLAG(LIBS, sicuuc.lib sicuin.lib sicuio.lib sicule.lib
siculx.lib sicudt.lib);
+ ADD_FLAG(CFLAGS, /D U_STATIC_IMPLEMENTATION=1)
+} else {
+ ADD_FLAG(LIBS, icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib);
+}
+
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /GZ /D _DEBUG /D
ZEND_DEBUG=1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Fri Aug 12 16:05:24 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
/GB option is the default; remove it.
Add compiler version checks, as vs.net 2005 has dropped support for /YX and
/GB
options, and deprecated ANSI stdio (in favour of more secure, non-standard
versions).
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.45r2=1.46ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.45 php-src/win32/build/config.w32:1.46
--- php-src/win32/build/config.w32:1.45 Fri Aug 12 07:37:44 2005
+++ php-src/win32/build/config.w32 Fri Aug 12 16:05:19 2005
@@ -1,10 +1,30 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.45 2005/08/12 11:37:44 edink Exp $
+// $Id: config.w32,v 1.46 2005/08/12 20:05:19 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-PATH_PROG('cl');
+CL = PATH_PROG('cl');
+if (!CL) {
+ ERROR(MS C++ compiler is required);
+}
+// Which version of the compiler do we have ?
+function probe_msvc_compiler_version(CL)
+{
+ // tricky escapes to get stderr redirection to work
+ var banner = execute('cmd /c ' + CL + ' 21');
+ if (banner.match(/(\d+)\.(\d+)\.(\d+)(\.(\d+))?/)) {
+ return RegExp.$1;
+ }
+ return 0;
+}
+
+VCVERS = probe_msvc_compiler_version(CL);
+STDOUT.WriteLine(Detected MS compiler version + VCVERS);
+
+// 12 is VC6
+// 13 is vs.net 2003
+// 14 is vs.net 2005
// cygwin now ships with link.exe. Avoid searching the cygwin path
// for this, as we want the MS linker, not the fileutil
@@ -61,9 +81,20 @@
DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
// General CFLAGS for building objects
-DEFINE(CFLAGS, /nologo /YX /FD $(BASE_INCLUDES) /D _WINDOWS \
+DEFINE(CFLAGS, /nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
+if (VCVERS 14) {
+ // Enable automatic precompiled headers
+ ADD_FLAG('CFLAGS', ' /YX ');
+}
+
+if (VCVERS = 14) {
+ // fun stuff: MS deprecated ANSI stdio and similar functions
+ // disable annoying warnings
+ ADD_FLAG('CFLAGS', ' /wd4996 ');
+}
+
// General link flags
DEFINE(LDFLAGS, /nologo /version: +
PHP_VERSION + . + PHP_MINOR_VERSION + . + PHP_RELEASE_VERSION);
@@ -102,7 +133,7 @@
}
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /Ox /D NDebug /D NDEBUG \
-/D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);
+/D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0);
// if you have VS.Net /GS hardens the binary against buffer overruns
// ADD_FLAG(CFLAGS, /GS);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Fri Aug 12 22:47:25 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
make the icu library detection more friendly.
Also note that we can only probe for libraries after we've set up the
implicit php_build path.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.46r2=1.47ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.46 php-src/win32/build/config.w32:1.47
--- php-src/win32/build/config.w32:1.46 Fri Aug 12 16:05:19 2005
+++ php-src/win32/build/config.w32 Fri Aug 12 22:47:24 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.46 2005/08/12 20:05:19 wez Exp $
+// $Id: config.w32,v 1.47 2005/08/13 02:47:24 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -109,15 +109,7 @@
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
-// Do we want static ICU lib
-ARG_ENABLE('static-icu', 'Link against the static version of the ICU library',
'no');
-if (PHP_STATIC_ICU == yes) {
- ADD_FLAG(LIBS, sicuuc.lib sicuin.lib sicuio.lib sicule.lib
siculx.lib sicudt.lib);
- ADD_FLAG(CFLAGS, /D U_STATIC_IMPLEMENTATION=1)
-} else {
- ADD_FLAG(LIBS, icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib);
-}
-
+
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
ADD_FLAG(CFLAGS, /LDd /MDd /Gm /ZI /Od /GZ /D _DEBUG /D
ZEND_DEBUG=1);
@@ -233,8 +225,26 @@
probe_basic_headers();
add_extra_dirs();
+
+// We can't probe for libs before this line
+
CHECK_LIB(resolv.lib);
+// Do we want static ICU lib
+ARG_WITH('static-icu', 'Link against the static version of the ICU library',
'no');
+if (PHP_STATIC_ICU == yes) {
+ if (!CHECK_LIB('sicuuc.lib', null, PHP_STATIC_ICU)) {
+ ERROR('static ICU library not found');
+ }
+ ADD_FLAG(LIBS, sicuuc.lib sicuin.lib sicuio.lib sicule.lib
siculx.lib sicudt.lib);
+ ADD_FLAG(CFLAGS, /D U_STATIC_IMPLEMENTATION=1)
+} else {
+ if (!CHECK_LIB('icuuc.lib', null)) {
+ ERROR('ICU library not found');
+ }
+ ADD_FLAG(LIBS, icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib);
+}
+
//DEFINE(PHP_BUILD, PHP_PHP_BUILD);
STDOUT.WriteBlankLines(1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
sniper Thu Aug 11 20:08:30 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Not used
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.43r2=1.44ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.43 php-src/win32/build/config.w32:1.44
--- php-src/win32/build/config.w32:1.43 Thu Aug 11 19:36:07 2005
+++ php-src/win32/build/config.w32 Thu Aug 11 20:08:28 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.43 2005/08/11 23:36:07 andrei Exp $
+// $Id: config.w32,v 1.44 2005/08/12 00:08:28 sniper Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -208,7 +208,7 @@
zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \
- zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
+ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c
\
zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c
zend_strtod.c);
@@ -253,12 +253,6 @@
ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
-ARG_ENABLE(zend-multibyte, Enable Zend multibyte encoding support, no);
-if (PHP_ZEND_MULTIBYTE == yes) {
- STDOUT.WriteLine(Enabling Zend multibyte encoding support);
- AC_DEFINE('ZEND_MULTIBYTE', 1);
-}
-
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Wed Aug 10 23:16:09 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
rename dll's to php6
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.40r2=1.41ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40 php-src/win32/build/config.w32:1.41
--- php-src/win32/build/config.w32:1.40 Thu Jun 9 09:09:04 2005
+++ php-src/win32/build/config.w32 Wed Aug 10 23:16:08 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40 2005/06/09 13:09:04 wez Exp $
+// $Id: config.w32,v 1.41 2005/08/11 03:16:08 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -108,20 +108,20 @@
// set up the build dir and DLL name
if (PHP_DEBUG == yes PHP_ZTS == yes) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug_TS);
- DEFINE(PHPDLL, php5ts_debug.dll);
- DEFINE(PHPLIB, php5ts_debug.lib);
+ DEFINE(PHPDLL, php6ts_debug.dll);
+ DEFINE(PHPLIB, php6ts_debug.lib);
} else if (PHP_DEBUG == yes PHP_ZTS == no) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug);
- DEFINE(PHPDLL, php5_debug.dll);
- DEFINE(PHPLIB, php5_debug.lib);
+ DEFINE(PHPDLL, php6_debug.dll);
+ DEFINE(PHPLIB, php6_debug.lib);
} else if (PHP_DEBUG == no PHP_ZTS == yes) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release_TS);
- DEFINE(PHPDLL, php5ts.dll);
- DEFINE(PHPLIB, php5ts.lib);
+ DEFINE(PHPDLL, php6ts.dll);
+ DEFINE(PHPLIB, php6ts.lib);
} else if (PHP_DEBUG == no PHP_ZTS == no) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release);
- DEFINE(PHPDLL, php5.dll);
- DEFINE(PHPLIB, php5.lib);
+ DEFINE(PHPDLL, php6.dll);
+ DEFINE(PHPLIB, php6.lib);
}
// Find the php_build dir - it contains headers and libraries
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 config.w32.h.in confutils.js
wez Thu Jun 9 09:09:05 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32 config.w32.h.in confutils.js
Log:
add --enable-memory-manager switch for win32 too
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.39r2=1.40ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.39 php-src/win32/build/config.w32:1.40
--- php-src/win32/build/config.w32:1.39 Sat Jun 4 21:57:03 2005
+++ php-src/win32/build/config.w32 Thu Jun 9 09:09:04 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.39 2005/06/05 01:57:03 wez Exp $
+// $Id: config.w32,v 1.40 2005/06/09 13:09:04 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -248,9 +248,11 @@
ADD_FLAG(CFLAGS, /D FD_SETSIZE= + parseInt(PHP_FD_SETSIZE));
ARG_ENABLE(memory-limit, Enable memory limit checking code, no);
-
AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == yes ? 1 : 0);
+ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
+AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
+
ARG_ENABLE(zend-multibyte, Enable Zend multibyte encoding support, no);
if (PHP_ZEND_MULTIBYTE == yes) {
STDOUT.WriteLine(Enabling Zend multibyte encoding support);
http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.6r2=1.7ty=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.6
php-src/win32/build/config.w32.h.in:1.7
--- php-src/win32/build/config.w32.h.in:1.6 Wed Jun 8 16:50:44 2005
+++ php-src/win32/build/config.w32.h.in Thu Jun 9 09:09:04 2005
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.6 2005/06/08 20:50:44 fmk Exp $
+ $Id: config.w32.h.in,v 1.7 2005/06/09 13:09:04 wez Exp $
*/
/* Default PHP / PEAR directories */
@@ -63,7 +63,6 @@
#define HAVE_TZSET 1
#define HAVE_TZNAME 1
#undef HAVE_FLOCK
-#define USE_ZEND_ALLOC 1
#define HAVE_ALLOCA 1
#undef HAVE_SYS_TIME_H
#define HAVE_SIGNAL_H 1
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.56r2=1.57ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.56
php-src/win32/build/confutils.js:1.57
--- php-src/win32/build/confutils.js:1.56 Sun Jun 5 15:19:09 2005
+++ php-src/win32/build/confutils.jsThu Jun 9 09:09:04 2005
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.56 2005/06/05 19:19:09 wez Exp $
+// $Id: confutils.js,v 1.57 2005/06/09 13:09:04 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -350,7 +350,7 @@
'php-build', 'snapshot-template',
'pcre-regex', 'fastcgi', 'force-cgi-redirect',
'path-info-check', 'zts', 'ipv6', 'memory-limit',
-'zend-multibyte', 'fd-setsize'
+'zend-multibyte', 'fd-setsize', 'memory-manager'
);
var force;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in
I made this happen today (but only just saw this email). --Wez. On 6/9/05, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 8 Jun 2005, Frank M. Kromann wrote: fmk Wed Jun 8 16:50:46 2005 EDT Modified files: /php-src/win32/build config.w32.h.in Log: USE_ZEND_ALLOC should be defined here too. No :) It should be set by config.js... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in
Doesn't this mean the memory manager is now undefined for 'the old build'? (And if so, will /D USE_ZEND_ALLOC = 1 in a few .dsp's fix it non-intrusively?) - Original Message - From: Wez Furlong [EMAIL PROTECTED] To: Derick Rethans [EMAIL PROTECTED] Cc: Frank M. Kromann [EMAIL PROTECTED]; php-cvs@lists.php.net Sent: Thursday, June 09, 2005 3:25 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in I made this happen today (but only just saw this email). --Wez. On 6/9/05, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 8 Jun 2005, Frank M. Kromann wrote: fmk Wed Jun 8 16:50:46 2005 EDT Modified files: /php-src/win32/build config.w32.h.in Log: USE_ZEND_ALLOC should be defined here too. No :) It should be set by config.js... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in
Nope, it's already in the hardcoded config.h for win32. No further changes should be required. --Wez. On 6/9/05, Steph [EMAIL PROTECTED] wrote: Doesn't this mean the memory manager is now undefined for 'the old build'? (And if so, will /D USE_ZEND_ALLOC = 1 in a few .dsp's fix it non-intrusively?) - Original Message - From: Wez Furlong [EMAIL PROTECTED] To: Derick Rethans [EMAIL PROTECTED] Cc: Frank M. Kromann [EMAIL PROTECTED]; php-cvs@lists.php.net Sent: Thursday, June 09, 2005 3:25 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in I made this happen today (but only just saw this email). --Wez. On 6/9/05, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 8 Jun 2005, Frank M. Kromann wrote: fmk Wed Jun 8 16:50:46 2005 EDT Modified files: /php-src/win32/build config.w32.h.in Log: USE_ZEND_ALLOC should be defined here too. No :) It should be set by config.js... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in
Ah, hadn't spotted Jani's commit, sorry. - Original Message - From: Wez Furlong [EMAIL PROTECTED] To: Steph [EMAIL PROTECTED] Cc: Derick Rethans [EMAIL PROTECTED]; Frank M. Kromann [EMAIL PROTECTED]; php-cvs@lists.php.net Sent: Thursday, June 09, 2005 4:46 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in Nope, it's already in the hardcoded config.h for win32. No further changes should be required. --Wez. On 6/9/05, Steph [EMAIL PROTECTED] wrote: Doesn't this mean the memory manager is now undefined for 'the old build'? (And if so, will /D USE_ZEND_ALLOC = 1 in a few .dsp's fix it non-intrusively?) - Original Message - From: Wez Furlong [EMAIL PROTECTED] To: Derick Rethans [EMAIL PROTECTED] Cc: Frank M. Kromann [EMAIL PROTECTED]; php-cvs@lists.php.net Sent: Thursday, June 09, 2005 3:25 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build config.w32.h.in I made this happen today (but only just saw this email). --Wez. On 6/9/05, Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 8 Jun 2005, Frank M. Kromann wrote: fmk Wed Jun 8 16:50:46 2005 EDT Modified files: /php-src/win32/build config.w32.h.in Log: USE_ZEND_ALLOC should be defined here too. No :) It should be set by config.js... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
fmk Wed Jun 8 16:50:46 2005 EDT Modified files: /php-src/win32/buildconfig.w32.h.in Log: USE_ZEND_ALLOC should be defined here too. http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.5r2=1.6ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.5 php-src/win32/build/config.w32.h.in:1.6 --- php-src/win32/build/config.w32.h.in:1.5 Wed Apr 28 20:17:09 2004 +++ php-src/win32/build/config.w32.h.in Wed Jun 8 16:50:44 2005 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.5 2004/04/29 00:17:09 wez Exp $ + $Id: config.w32.h.in,v 1.6 2005/06/08 20:50:44 fmk Exp $ */ /* Default PHP / PEAR directories */ @@ -63,6 +63,7 @@ #define HAVE_TZSET 1 #define HAVE_TZNAME 1 #undef HAVE_FLOCK +#define USE_ZEND_ALLOC 1 #define HAVE_ALLOCA 1 #undef HAVE_SYS_TIME_H #define HAVE_SIGNAL_H 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Sat Jun 4 21:39:08 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
tweaks for a recent addition to cygwin
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.37r2=1.38ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.37 php-src/win32/build/config.w32:1.38
--- php-src/win32/build/config.w32:1.37 Thu Feb 24 19:20:19 2005
+++ php-src/win32/build/config.w32 Sat Jun 4 21:39:07 2005
@@ -1,23 +1,34 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.37 2005/02/25 00:20:19 edink Exp $
+// $Id: config.w32,v 1.38 2005/06/05 01:39:07 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-
PATH_PROG('cl');
-PATH_PROG('link');
+
+// cygwin now ships with link.exe. Avoid searching the cygwin path
+// for this, as we want the MS linker, not the fileutil
+PATH_PROG('link', WshShell.Environment(Process).Item(PATH));
+
PATH_PROG('nmake');
+
// we don't want to define LIB, as that will override the default library path
// that is set in that env var
PATH_PROG('lib', null, 'MAKE_LIB');
-PATH_PROG('bison');
-PATH_PROG('flex');
+if (!PATH_PROG('bison')) {
+ ERROR('bison is required')
+}
+if (!PATH_PROG('flex')) {
+ ERROR('flex is required')
+}
PATH_PROG('re2c');
PATH_PROG('zip');
PATH_PROG('lemon');
+
+// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
+
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols
(--enable-debug must not be specified)', 'no');
if (PHP_DEBUG == yes PHP_DEBUG_PACK == yes) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Sat Jun 4 21:57:04 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Add option for placing the big binaries outside of the source tree.
I find that having Debug_TS sitting in the source tree makes cvs seem much
slower.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.38r2=1.39ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.38 php-src/win32/build/config.w32:1.39
--- php-src/win32/build/config.w32:1.38 Sat Jun 4 21:39:07 2005
+++ php-src/win32/build/config.w32 Sat Jun 4 21:57:03 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.38 2005/06/05 01:39:07 wez Exp $
+// $Id: config.w32,v 1.39 2005/06/05 01:57:03 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -28,6 +28,14 @@
// avoid picking up midnight commander from cygwin
PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
+// stick objects somewhere outside of the source tree
+ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
+if (PHP_OBJECT_OUT_DIR.length) {
+ if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
+ ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + '
does not exist');
+ }
+ PHP_OBJECT_OUT_DIR += '\\';
+}
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols
(--enable-debug must not be specified)', 'no');
@@ -99,19 +107,19 @@
// set up the build dir and DLL name
if (PHP_DEBUG == yes PHP_ZTS == yes) {
- DEFINE(BUILD_DIR, Debug_TS);
+ DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug_TS);
DEFINE(PHPDLL, php5ts_debug.dll);
DEFINE(PHPLIB, php5ts_debug.lib);
} else if (PHP_DEBUG == yes PHP_ZTS == no) {
- DEFINE(BUILD_DIR, Debug);
+ DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug);
DEFINE(PHPDLL, php5_debug.dll);
DEFINE(PHPLIB, php5_debug.lib);
} else if (PHP_DEBUG == no PHP_ZTS == yes) {
- DEFINE(BUILD_DIR, Release_TS);
+ DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release_TS);
DEFINE(PHPDLL, php5ts.dll);
DEFINE(PHPLIB, php5ts.lib);
} else if (PHP_DEBUG == no PHP_ZTS == no) {
- DEFINE(BUILD_DIR, Release);
+ DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release);
DEFINE(PHPDLL, php5.dll);
DEFINE(PHPLIB, php5.lib);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Tue Feb 15 08:57:51 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Really disable zend multibyte by default. mbstring is using #ifdef all over
the place so defining to '0' doesn't help much
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.35r2=1.36ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.35 php-src/win32/build/config.w32:1.36
--- php-src/win32/build/config.w32:1.35 Sun Feb 13 08:03:03 2005
+++ php-src/win32/build/config.w32 Tue Feb 15 08:57:49 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.35 2005/02/13 13:03:03 hirokawa Exp $
+// $Id: config.w32,v 1.36 2005/02/15 13:57:49 edink Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -225,7 +225,10 @@
AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == yes ? 1 : 0);
ARG_ENABLE(zend-multibyte, Enable Zend multibyte encoding support, no);
-AC_DEFINE('ZEND_MULTIBYTE', PHP_ZEND_MULTIBYTE == yes ? 1 : 0);
+if (PHP_ZEND_MULTIBYTE == yes) {
+ STDOUT.WriteLine(Enabling Zend multibyte encoding support);
+ AC_DEFINE('ZEND_MULTIBYTE', 1);
+}
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
hirokawaSun Feb 13 08:03:03 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
added --enable-zend-multibute for win32
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.34r2=1.35ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.34 php-src/win32/build/config.w32:1.35
--- php-src/win32/build/config.w32:1.34 Mon Nov 15 13:27:10 2004
+++ php-src/win32/build/config.w32 Sun Feb 13 08:03:03 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.34 2004/11/15 18:27:10 fmk Exp $
+// $Id: config.w32,v 1.35 2005/02/13 13:03:03 hirokawa Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -224,6 +224,9 @@
AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == yes ? 1 : 0);
+ARG_ENABLE(zend-multibyte, Enable Zend multibyte encoding support, no);
+AC_DEFINE('ZEND_MULTIBYTE', PHP_ZEND_MULTIBYTE == yes ? 1 : 0);
+
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Wed Nov 3 21:06:04 2004 EDT Modified files: /php-src/win32/buildconfig.w32 Log: Added zend_strtod.c to the new build http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.32r2=1.33ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.32 php-src/win32/build/config.w32:1.33 --- php-src/win32/build/config.w32:1.32 Fri Sep 17 10:36:55 2004 +++ php-src/win32/build/config.w32 Wed Nov 3 21:06:04 2004 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.32 2004/09/17 14:36:55 wez Exp $ +// $Id: config.w32,v 1.33 2004/11/04 02:06:04 edink Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -184,7 +184,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ - zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c); + zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c zend_strtod.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Mon Aug 2 21:03:32 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Explicitly check PATH before cygwin for mc.exe, as we want MS message compiler,
not GNU Midnight Commander.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.29r2=1.30ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.29 php-src/win32/build/config.w32:1.30
--- php-src/win32/build/config.w32:1.29 Sat Jul 31 20:29:50 2004
+++ php-src/win32/build/config.w32 Mon Aug 2 21:03:32 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.29 2004/08/01 00:29:50 wez Exp $
+// $Id: config.w32,v 1.30 2004/08/03 01:03:32 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -16,7 +16,7 @@
PATH_PROG('re2c');
PATH_PROG('zip');
PATH_PROG('lemon');
-PATH_PROG('mc');
+PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
ARG_ENABLE('zts', 'Thread safety', 'yes');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Sat Jul 31 20:29:51 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Enable usleep under win32
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.28r2=1.29ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.28 php-src/win32/build/config.w32:1.29
--- php-src/win32/build/config.w32:1.28 Sat Jul 31 19:59:46 2004
+++ php-src/win32/build/config.w32 Sat Jul 31 20:29:50 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.28 2004/07/31 23:59:46 wez Exp $
+// $Id: config.w32,v 1.29 2004/08/01 00:29:50 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -218,6 +218,8 @@
ARG_ENABLE(memory-limit, Enable memory limit checking code, no);
AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == yes ? 1 : 0);
+
+AC_DEFINE('HAVE_USLEEP', 1);
/* For snapshot builders, where can we find the additional
* files that make up the snapshot template? */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Thu May 13 08:14:56 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Add --enable-memory-limit configure option (defaults to off)
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.25r2=1.26ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.25 php-src/win32/build/config.w32:1.26
--- php-src/win32/build/config.w32:1.25 Thu Feb 12 06:55:16 2004
+++ php-src/win32/build/config.w32 Thu May 13 08:14:56 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.25 2004/02/12 11:55:16 wez Exp $
+// $Id: config.w32,v 1.26 2004/05/13 12:14:56 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -214,6 +214,10 @@
AC_DEFINE('HAVE_GAI_STRERROR', main_network_has_ipv6);
AC_DEFINE('HAVE_IPV6', main_network_has_ipv6);
+ARG_ENABLE(memory-limit, Enable memory limit checking code, no);
+
+AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == yes ? 1 : 0);
+
/* For snapshot builders, where can we find the additional
* files that make up the snapshot template? */
ARG_WITH(snapshot-template, Path to snapshot builder template dir, no);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in confutils.js
wez Wed Apr 28 20:17:10 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32.h.in confutils.js
Log:
Add --disable-all switch, which will force all arguments to no if
they are not specified explicitly. (like the snapshot build, but in
reverse).
http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.4r2=1.5ty=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.4 php-src/win32/build/config.w32.h.in:1.5
--- php-src/win32/build/config.w32.h.in:1.4 Mon Mar 29 13:58:28 2004
+++ php-src/win32/build/config.w32.h.in Wed Apr 28 20:17:09 2004
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.4 2004/03/29 18:58:28 helly Exp $
+ $Id: config.w32.h.in,v 1.5 2004/04/29 00:17:09 wez Exp $
*/
/* Default PHP / PEAR directories */
@@ -29,7 +29,6 @@
#define MAGIC_QUOTES 0
#define USE_CONFIG_FILE 1
#define DEFAULT_SHORT_OPEN_TAG 1
-#define ENABLE_PATHINFO_CHECK 1
/* Platform-Specific Configuration. Should not be changed. */
#define PHP_SIGCHILD 0
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.39r2=1.40ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.39 php-src/win32/build/confutils.js:1.40
--- php-src/win32/build/confutils.js:1.39 Thu Apr 15 12:09:36 2004
+++ php-src/win32/build/confutils.jsWed Apr 28 20:17:09 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.39 2004/04/15 16:09:36 wez Exp $
+// $Id: confutils.js,v 1.40 2004/04/29 00:17:09 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -251,6 +251,7 @@
var configure_help_mode = false;
var analyzed = false;
var nice = cscript /nologo configure.js ;
+ var disable_all = false;
args = WScript.Arguments;
for (i = 0; i args.length; i++) {
@@ -260,6 +261,11 @@
configure_help_mode = true;
break;
}
+ if (arg == --disable-all) {
+ disable_all = true;
+ continue;
+ }
+
// If it is --foo=bar, split on the equals sign
arg = arg.split(=, 2);
argname = arg[0];
@@ -345,6 +351,7 @@
'pcre-regex', 'fastcgi', 'force-cgi-redirect',
'path-info-check', 'zts', 'ipv6'
);
+ var force;
// Now set any defaults we might have missed out earlier
for (i = 0; i configure_args.length; i++) {
@@ -358,7 +365,6 @@
// Don't trust a default yes answer for a non-core module
// in a snapshot build
if (PHP_SNAPSHOT_BUILD != no argval == yes !shared) {
- var force;
force = true;
for (j = 0; j snapshot_build_exclusions.length; j++) {
@@ -386,8 +392,6 @@
}
if (PHP_SNAPSHOT_BUILD != no argval == no) {
- var force;
-
force = true;
for (j = 0; j snapshot_build_exclusions.length; j++) {
if (snapshot_build_exclusions[j] == arg.optname) {
@@ -401,6 +405,21 @@
shared = true;
}
}
+
+ if (disable_all) {
+ force = true;
+ for (j = 0; j snapshot_build_exclusions.length; j++) {
+ if (snapshot_build_exclusions[j] == arg.optname) {
+ force = false;
+ break;
+ }
+ }
+ if (force) {
+ argval = no;
+ shared = false;
+ }
+ }
+
eval(PHP_ + arg.symval + = argval;);
eval(PHP_ + arg.symval + _SHARED = shared;);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
helly Mon Mar 29 13:58:28 2004 EDT Modified files: /php-src/win32/buildconfig.w32.h.in Log: Windows part of NAN/INF http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.3r2=1.4ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.3 php-src/win32/build/config.w32.h.in:1.4 --- php-src/win32/build/config.w32.h.in:1.3 Fri Mar 26 20:00:52 2004 +++ php-src/win32/build/config.w32.h.in Mon Mar 29 13:58:28 2004 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.3 2004/03/27 01:00:52 helly Exp $ + $Id: config.w32.h.in,v 1.4 2004/03/29 18:58:28 helly Exp $ */ /* Default PHP / PEAR directories */ @@ -142,3 +142,4 @@ #undef HAVE_ATOF_ACCEPTS_NAN #undef HAVE_ATOF_ACCEPTS_INF +#define HAVE_HUGE_VAL_NAN 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
edink Thu Feb 12 05:53:09 2004 EDT Modified files: /php-src/win32/buildconfig.w32 Log: Added zend_exceptions.c to the build http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.23r2=1.24ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.23 php-src/win32/build/config.w32:1.24 --- php-src/win32/build/config.w32:1.23 Sat Jan 17 08:00:23 2004 +++ php-src/win32/build/config.w32 Thu Feb 12 05:53:08 2004 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.23 2004/01/17 13:00:23 sniper Exp $ +// $Id: config.w32,v 1.24 2004/02/12 10:53:08 edink Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -175,7 +175,8 @@ ADD_SOURCES(Zend, zend_language_parser.c zend_language_scanner.c \ zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \ - zend_constants.c zend_dynamic_array.c zend_execute_API.c zend_highlight.c \ + zend_constants.c zend_dynamic_array.c zend_exceptions.c \ + zend_execute_API.c zend_highlight.c \ zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \ zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \ zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Thu Feb 12 06:55:16 2004 EDT Modified files: /php-src/win32/buildconfig.w32 Log: Fix build; line continuation character should be the very last character on a line, otherwise things b0rk. http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.24r2=1.25ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.24 php-src/win32/build/config.w32:1.25 --- php-src/win32/build/config.w32:1.24 Thu Feb 12 05:53:08 2004 +++ php-src/win32/build/config.w32 Thu Feb 12 06:55:16 2004 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.24 2004/02/12 10:53:08 edink Exp $ +// $Id: config.w32,v 1.25 2004/02/12 11:55:16 wez Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -175,7 +175,7 @@ ADD_SOURCES(Zend, zend_language_parser.c zend_language_scanner.c \ zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \ - zend_constants.c zend_dynamic_array.c zend_exceptions.c \ + zend_constants.c zend_dynamic_array.c zend_exceptions.c \ zend_execute_API.c zend_highlight.c \ zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \ zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 23 07:40:41 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Better implementation of the prefix thing
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.19 php-src/win32/build/config.w32:1.20
--- php-src/win32/build/config.w32:1.19 Tue Dec 23 00:43:19 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 07:40:41 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.19 2003/12/23 05:43:19 fmk Exp $
+// $Id: config.w32,v 1.20 2003/12/23 12:40:41 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -21,10 +21,11 @@
ARG_ENABLE('zts', 'Thread safety', 'yes');
// Configures the hard-coded installation dir
-if (PHP_DEBUG == yes) {
- ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5\\debug');
-} else {
- ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5');
+ARG_ENABLE('prefix', 'where PHP will be installed', '');
+if (PHP_PREFIX == '') {
+ PHP_PREFIX = C:\\php + PHP_VERSION;
+ if (PHP_DEBUG == yes)
+ PHP_PREFIX += \\debug;
}
DEFINE('PHP_PREFIX', PHP_PREFIX);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 23 11:01:41 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Proper check for resolv.lib
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.20 php-src/win32/build/config.w32:1.21
--- php-src/win32/build/config.w32:1.20 Tue Dec 23 07:40:41 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 11:01:41 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.20 2003/12/23 12:40:41 wez Exp $
+// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -53,7 +53,7 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
-DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib
resolv.lib);
+DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
@@ -116,6 +116,12 @@
var php_usual_include_suspects =
..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32;
var php_usual_lib_suspects = ..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32;
+if (PHP_DEBUG == yes) {
+ php_usual_lib_suspects += ;..\\bindlib_w32\\Debug;
+} else {
+ php_usual_lib_suspects += ;..\\bindlib_w32\\Release;
+}
+
// Poke around for some headers
function probe_basic_headers()
{
@@ -165,6 +171,7 @@
probe_basic_headers();
add_extra_dirs();
+CHECK_LIB(resolv.lib);
//DEFINE(PHP_BUILD, PHP_PHP_BUILD);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
wez Tue Dec 23 12:20:51 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
A more general check for dirs under Release or Debug.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.21 php-src/win32/build/config.w32:1.22
--- php-src/win32/build/config.w32:1.21 Tue Dec 23 11:01:41 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 12:20:50 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
+// $Id: config.w32,v 1.22 2003/12/23 17:20:50 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -116,12 +116,6 @@
var php_usual_include_suspects =
..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32;
var php_usual_lib_suspects = ..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32;
-if (PHP_DEBUG == yes) {
- php_usual_lib_suspects += ;..\\bindlib_w32\\Debug;
-} else {
- php_usual_lib_suspects += ;..\\bindlib_w32\\Release;
-}
-
// Poke around for some headers
function probe_basic_headers()
{
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.29 php-src/win32/build/confutils.js:1.30
--- php-src/win32/build/confutils.js:1.29 Tue Dec 23 08:10:54 2003
+++ php-src/win32/build/confutils.jsTue Dec 23 12:20:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
+// $Id: confutils.js,v 1.30 2003/12/23 17:20:50 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -463,7 +463,6 @@
} else {
target = _ + target.toUpperCase();
}
-
if (path_to_check == null) {
path_to_check = php_usual_lib_suspects;
@@ -475,11 +474,20 @@
var i;
var libname;
+ var subdir = PHP_DEBUG == yes ? Debug : Release;
+
libnames = libnames.split(';');
for (i = 0; i libnames.length; i++) {
libname = libnames[i];
p = search_paths(libname, path_to_check, LIB);
+ if (!p) {
+ p = search_paths(subdir + \\ + libname, path_to_check,
LIB);
+ if (p) {
+ p += \\ + subdir;
+ }
+ }
+
if (typeof(p) == string) {
ADD_FLAG(LDFLAGS + target, '/libpath:' + p + ' ');
ADD_FLAG(LIBS + target, libname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js template.rc
wez Wed Dec 3 21:12:36 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js template.rc
Log:
fix a couple of buglets and set version number on DLLs to whatever the PHP major
version is.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.8 php-src/win32/build/config.w32:1.9
--- php-src/win32/build/config.w32:1.8 Wed Dec 3 17:59:48 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 21:12:36 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.8 2003/12/03 22:59:48 wez Exp $
+// $Id: config.w32,v 1.9 2003/12/04 02:12:36 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -35,7 +35,7 @@
DEFINE(LDFLAGS, /nologo /libpath:$(PHP_BUILD)\\lib);
// General DLL link flags
-DEFINE(DLL_LDFLAGS, /dll);
+DEFINE(DLL_LDFLAGS, /dll /version: + PHP_VERSION);
// PHP DLL link flags
DEFINE(PHP_LDFLAGS, $(DLL_LDFLAGS));
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.11 php-src/win32/build/confutils.js:1.12
--- php-src/win32/build/confutils.js:1.11 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 21:12:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.11 2003/12/04 01:37:52 wez Exp $
+// $Id: confutils.js,v 1.12 2003/12/04 02:12:36 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -530,7 +530,7 @@
if (shared) {
dllname = php_ + extname + .dll;
- var resname = generate_version_info_resource(makefiletarget, ext/ +
extname);
+ var resname = generate_version_info_resource(dllname, ext/ +
extname);
MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $( + EXT +
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\ + resname);
MFO.WriteLine(\t$(LD) /out:$(BUILD_DIR)\\ + dllname +
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + ) $( + EXT + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname);
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.1 php-src/win32/build/template.rc:1.2
--- php-src/win32/build/template.rc:1.1 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/template.rc Wed Dec 3 21:12:36 2003
@@ -1,11 +1,10 @@
/* This is a template RC file.
- * $Id: template.rc,v 1.1 2003/12/04 01:37:52 wez Exp $
+ * $Id: template.rc,v 1.2 2003/12/04 02:12:36 wez Exp $
* Do not edit with MSVC */
#ifdef APSTUDIO_INVOKED
# error dont edit with MSVC
#endif
-#include resource.h
#include winres.h
#include main/php_version.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 2 19:46:40 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
make help more useful
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.2 php-src/win32/build/config.w32:1.3
--- php-src/win32/build/config.w32:1.2 Tue Dec 2 19:15:10 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 19:46:40 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/03 00:15:10 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/03 00:46:40 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -85,7 +85,7 @@
// Find the php_build dir - it contains headers and libraries
// that we need
-ARG_WITH('php-build', 'Where the php_build dir can be found. Assumes that it is a
sibling of this source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source
dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == no) {
if (FSO.FolderExists(..\\php_build)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 2 20:10:05 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
avoid vs.net specific option for now
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.3 php-src/win32/build/config.w32:1.4
--- php-src/win32/build/config.w32:1.3 Tue Dec 2 19:46:40 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 20:10:03 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2003/12/03 00:46:40 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/03 01:10:03 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -54,7 +54,9 @@
} else {
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /O2 /D NDebug /D NDEBUG \
-/D ZEND_WIN32_FORCE_INLINE /GB /GF /GS /D ZEND_DEBUG=0);
+/D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);
+ // if you have VS.Net /GS hardens the binary against buffer overruns
+ // ADD_FLAG(CFLAGS, /GS);
}
if (PHP_ZTS == yes) {
@@ -94,7 +96,7 @@
}
if (!FSO.FolderExists(PHP_PHP_BUILD)) {
- ERROR(Could not find the php_build dir; please specify it\r\n\
+ WARNING(Could not find the php_build dir; please specify it\r\n\
using the --with-php-build option to configure);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
