[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2011-03-28 Thread Pierre Joye
pajoye   Mon, 28 Mar 2011 10:55:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=309779

Log:
- re enable static analyzer, crash fixed with snapshot builds

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-28 10:53:13 UTC 
(rev 309778)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-28 10:55:34 UTC 
(rev 309779)
@@ -414,7 +414,7 @@
 }

 ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
-if (PHP_STATIC_ANALYZE == yes  PHP_SNAPSHOT_BUILD == no) {
+if (PHP_STATIC_ANALYZE == yes) {
ADD_FLAG(CFLAGS,  /analyze );
ADD_FLAG(CFLAGS,  /wd6308 );
 }

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-03-28 10:53:13 UTC (rev 
309778)
+++ php/php-src/trunk/win32/build/config.w322011-03-28 10:55:34 UTC (rev 
309779)
@@ -414,7 +414,7 @@
 }

 ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
-if (PHP_STATIC_ANALYZE == yes  PHP_SNAPSHOT_BUILD == no) {
+if (PHP_STATIC_ANALYZE == yes) {
ADD_FLAG(CFLAGS,  /analyze );
ADD_FLAG(CFLAGS,  /wd6308 );
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2011-02-07 Thread Pierre Joye
pajoye   Mon, 07 Feb 2011 10:17:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=308089

Log:
- disable realloc warning about not checking its return value, 100% valid but 
way too many of them for now, reduce noises

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-02-07 08:51:52 UTC 
(rev 308088)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-02-07 10:17:14 UTC 
(rev 308089)
@@ -416,4 +416,5 @@
 ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
 if (PHP_STATIC_ANALYZE == yes  PHP_SNAPSHOT_BUILD == no) {
ADD_FLAG(CFLAGS,  /analyze );
+   ADD_FLAG(CFLAGS,  /wd6308 );
 }

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-02-07 08:51:52 UTC (rev 
308088)
+++ php/php-src/trunk/win32/build/config.w322011-02-07 10:17:14 UTC (rev 
308089)
@@ -416,4 +416,5 @@
 ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
 if (PHP_STATIC_ANALYZE == yes  PHP_SNAPSHOT_BUILD == no) {
ADD_FLAG(CFLAGS,  /analyze );
+   ADD_FLAG(CFLAGS,  /wd6308 );
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2011-01-09 Thread Pierre Joye
pajoye   Sun, 09 Jan 2011 21:38:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307311

Log:
- add configure option to enable the builtin static analyzer (will be enabled 
for snaps' log)

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-01-09 20:13:40 UTC 
(rev 307310)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-01-09 21:38:46 UTC 
(rev 307311)
@@ -407,3 +407,13 @@
}
FSO.CreateFolder(tmp);
 }
+
+ARG_ENABLE(security-flags, Enable the compiler security flags, yes);
+if (PHP_SECURITY_FLAGS == yes) {
+   ADD_FLAG(LDFLAGS, /NXCOMPAT /DYNAMICBASE );
+}
+
+ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
+if (PHP_STATIC_ANALYZE == yes) {
+   ADD_FLAG(CFLAGS,  /analyze );
+}

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-01-09 20:13:40 UTC (rev 
307310)
+++ php/php-src/trunk/win32/build/config.w322011-01-09 21:38:46 UTC (rev 
307311)
@@ -411,3 +411,8 @@
 if (PHP_SECURITY_FLAGS == yes) {
ADD_FLAG(LDFLAGS, /NXCOMPAT /DYNAMICBASE );
 }
+
+ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
+if (PHP_STATIC_ANALYZE == yes) {
+   ADD_FLAG(CFLAGS,  /analyze );
+}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2010-12-02 Thread Pierre Joye
pajoye   Thu, 02 Dec 2010 23:23:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305923

Log:
- Fix #29085, bad default include_path on Windows

Bug: http://bugs.php.net/29085 (Closed) bad default include_path on Windows
  
Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-12-02 23:12:07 UTC 
(rev 305922)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-12-02 23:23:14 UTC 
(rev 305923)
@@ -104,7 +104,7 @@
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
-   PHP_PREFIX = C:\\php + PHP_VERSION;
+   PHP_PREFIX = C:\\php;
if (PHP_DEBUG == yes)
PHP_PREFIX += \\debug;
 }

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322010-12-02 23:12:07 UTC (rev 
305922)
+++ php/php-src/trunk/win32/build/config.w322010-12-02 23:23:14 UTC (rev 
305923)
@@ -109,7 +109,7 @@
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
-   PHP_PREFIX = C:\\php + PHP_VERSION;
+   PHP_PREFIX = C:\\php;
if (PHP_DEBUG == yes)
PHP_PREFIX += \\debug;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2009-10-30 Thread Kalle Sommer Nielsen
kalleFri, 30 Oct 2009 14:20:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=290074

Log:
Set WINVER to Windows 2000 like in config.w32.h.in

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-30 13:23:33 UTC 
(rev 290073)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-30 14:20:15 UTC 
(rev 290074)
@@ -113,7 +113,7 @@

 // CFLAGS for building the PHP dll
 DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
-/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400);
+/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500);

 DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');


Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322009-10-30 13:23:33 UTC (rev 
290073)
+++ php/php-src/trunk/win32/build/config.w322009-10-30 14:20:15 UTC (rev 
290074)
@@ -114,7 +114,7 @@

 // CFLAGS for building the PHP dll
 DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
-/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400);
+/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500);

 DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2009-09-30 Thread Pierre-Alain Joye
pajoye   Wed, 30 Sep 2009 11:53:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288988

Log:
- restore W3 flag to get usefull errors (unused vars, etc.)

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-09-30 11:52:14 UTC 
(rev 288987)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-09-30 11:53:29 UTC 
(rev 288988)
@@ -119,7 +119,7 @@

 // General CFLAGS for building objects
 DEFINE(CFLAGS, /nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
-/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
+/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 );

 if (VCVERS  1400) {
// Enable automatic precompiled headers
@@ -177,7 +177,7 @@

 // Set some debug/release specific options
 if (PHP_DEBUG == yes) {
-   ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1  +
+   ADD_FLAG(CFLAGS, /LDd /MDd /W3 /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

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322009-09-30 11:52:14 UTC (rev 
288987)
+++ php/php-src/trunk/win32/build/config.w322009-09-30 11:53:29 UTC (rev 
288988)
@@ -177,7 +177,7 @@

 // Set some debug/release specific options
 if (PHP_DEBUG == yes) {
-   ADD_FLAG(CFLAGS, /LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1  +
+   ADD_FLAG(CFLAGS, /LDd /MDd /W3 /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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32

2009-08-24 Thread Pierre-Alain Joye
pajoye   Mon, 24 Aug 2009 14:18:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287638

Log:
- fix object dir usage (ie: relative path called from a symlinked dir), also 
fix nmake test for similar cases

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/build/config.w32
U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:10:30 UTC 
(rev 287637)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:18:19 UTC 
(rev 287638)
@@ -82,6 +82,7 @@
 // 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) {
+   PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' 
does not exist');
}

Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322009-08-24 14:10:30 UTC (rev 
287637)
+++ php/php-src/trunk/win32/build/config.w322009-08-24 14:18:19 UTC (rev 
287638)
@@ -82,6 +82,7 @@
 // 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) {
+   PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' 
does not exist');
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php