[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/win32/build/config.w32.h.in PHP_5_4/win32/build/config.w32.h.in
pajoye Sun, 04 Mar 2012 22:15:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=323903 Log: - fix bug #54407, Incorrectly defined NTDDI_VERSION macro Bug: https://bugs.php.net/54407 (Closed) Incorrectly defined NTDDI_VERSION macro Changed paths: U php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in U php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in === --- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 20:37:28 UTC (rev 323902) +++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04 22:15:12 UTC (rev 323903) @@ -6,7 +6,7 @@ /* Define the minimum supported version */ #undef _WIN32_WINNT #undef NTDDI_VERSION -#define _WIN32_WINNT 0x502 +#define _WIN32_WINNT 0x0501 #define NTDDI_VERSION 0x05010200 /* Default PHP / PEAR directories */ Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in === --- php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 20:37:28 UTC (rev 323902) +++ php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04 22:15:12 UTC (rev 323903) @@ -6,7 +6,7 @@ /* Define the minimum supported version */ #undef _WIN32_WINNT #undef NTDDI_VERSION -#define _WIN32_WINNT 0x502 +#define _WIN32_WINNT 0x0501 #define NTDDI_VERSION 0x05010200 /* Default PHP / PEAR directories */ -- 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.h.in PHP_5_4/win32/build/config.w32.h.in
pajoye Sun, 04 Mar 2012 15:23:24 +
Revision: http://svn.php.net/viewvc?view=revision&revision=323866
Log:
- fix bug #54407, Incorrectly defined NTDDI_VERSION macro
Bug: https://bugs.php.net/54407 (Assigned) Incorrectly defined NTDDI_VERSION
macro
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
U php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04
15:08:12 UTC (rev 323865)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2012-03-04
15:23:24 UTC (rev 323866)
@@ -6,8 +6,8 @@
/* Define the minimum supported version */
#undef _WIN32_WINNT
#undef NTDDI_VERSION
-#define _WIN32_WINNT 0x500
-#define NTDDI_VERSION _WIN32_WIN2K
+#define _WIN32_WINNT 0x502
+#define NTDDI_VERSION 0x05010200
/* Default PHP / PEAR directories */
#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04
15:08:12 UTC (rev 323865)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32.h.in2012-03-04
15:23:24 UTC (rev 323866)
@@ -7,7 +7,7 @@
#undef _WIN32_WINNT
#undef NTDDI_VERSION
#define _WIN32_WINNT 0x502
-#define NTDDI_VERSION _WIN32_WIN2K
+#define NTDDI_VERSION 0x05010200
/* Default PHP / PEAR directories */
#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
--
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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Mon, 30 Jan 2012 11:04:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=322929 Log: - libssh2 1.3.0 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-30 10:51:02 UTC (rev 322928) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-30 11:04:19 UTC (rev 322929) @@ -9,7 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 -libssh2-1.2.7 +libssh2-1.3.0 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-30 10:51:02 UTC (rev 322928) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-30 11:04:19 UTC (rev 322929) @@ -9,7 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 -libssh2-1.2.7 +libssh2-1.3.0 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-30 10:51:02 UTC (rev 322928) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-30 11:04:19 UTC (rev 322929) @@ -9,7 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 -libssh2-1.2.7 +libssh2-1.3.0 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 17:35:01 + Revision: http://svn.php.net/viewvc?view=revision&revision=322858 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 17:31:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=322857 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,11 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,10 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t -zlib-1.2.5 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,10 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t - -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 13:27:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=322845 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t + Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t +zlib-1.2.5 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t + -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Thu, 26 Jan 2012 12:11:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=322809 Log: - openssl 0.9.8t, curl 7.24.0 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-26 11:55:09 UTC (rev 322808) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-26 12:11:02 UTC (rev 322809) @@ -1,2 +1,3 @@ -libcurl-7.21.7 +libcurl-7.24.0 libpng-1.2.46 +openssl-0.9.8t Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-26 11:55:09 UTC (rev 322808) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-26 12:11:02 UTC (rev 322809) @@ -1,2 +1,3 @@ -libcurl-7.21.7 +libcurl-7.24.0 libpng-1.2.46 +openssl-0.9.8t Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-26 11:55:09 UTC (rev 322808) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-26 12:11:02 UTC (rev 322809) @@ -1,2 +1,3 @@ -libcurl-7.21.7 +libcurl-7.24.0 libpng-1.2.46 +openssl-0.9.8t -- 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/mkdist.php branches/PHP_5_4/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 09 Jan 2012 13:56:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321952
Log:
- spl tests are also under examples (sigh)
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/branches/PHP_5_4/win32/build/mkdist.php
U php/php-src/trunk/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2012-01-09 13:16:02 UTC
(rev 321951)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2012-01-09 13:56:46 UTC
(rev 321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}
- if ($directory == 'tests') {
+ if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, true);
}
Modified: php/php-src/branches/PHP_5_4/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_4/win32/build/mkdist.php 2012-01-09 13:16:02 UTC
(rev 321951)
+++ php/php-src/branches/PHP_5_4/win32/build/mkdist.php 2012-01-09 13:56:46 UTC
(rev 321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}
- if ($directory == 'tests') {
+ if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, true);
}
Modified: php/php-src/trunk/win32/build/mkdist.php
===
--- php/php-src/trunk/win32/build/mkdist.php2012-01-09 13:16:02 UTC (rev
321951)
+++ php/php-src/trunk/win32/build/mkdist.php2012-01-09 13:56:46 UTC (rev
321952)
@@ -382,7 +382,7 @@
$directory = substr($directory,0,-1);
}
- if ($directory == 'tests') {
+ if ($directory == 'tests' || $directory == 'examples') {
if (!is_dir($dest . '/tests')) {
mkdir($dest . '/tests', 0775, true);
}
--
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/ mkdist.php
pajoye Mon, 12 Dec 2011 15:10:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=320910
Log:
- copy run-test php
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2011-12-12 15:09:52 UTC
(rev 320909)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2011-12-12 15:10:40 UTC
(rev 320910)
@@ -459,6 +459,7 @@
foreach ($dirs as $dir) {
copy_test_dir($dir, $test_dir);
}
+copy('run-tests.php', $test_dir . '/run-test.php');
/* change this next line to true to use good-old
* hand-assembled go-pear-bundle from the snapshot template */
--
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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Wed, 03 Aug 2011 13:19:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=314161 Log: - update libcurl to 7.21.7 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Tue, 19 Jul 2011 10:22:42 + Revision: http://svn.php.net/viewvc?view=revision&revision=313417 Log: - update libpng to 1.2.46 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1 +1,2 @@ libcurl-7.21.6 +libpng-1.2.46 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1,2 +1,2 @@ libcurl-7.21.6 -libpng-1.2.45 \ No newline at end of file +libpng-1.2.46 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1,2 +1,2 @@ libcurl-7.21.6 -libpng-1.2.45 +libpng-1.2.46 -- 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/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Thu, 19 May 2011 13:36:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=311255 Log: - initial import, will add all libs later Changed paths: A php/php-src/branches/PHP_5_3/win32/build/libs_version.txt A php/php-src/branches/PHP_5_4/win32/build/libs_version.txt A php/php-src/trunk/win32/build/libs_version.txt Added: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt (rev 0) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-05-19 13:36:29 UTC (rev 311255) @@ -0,0 +1 @@ +libcurl-7.21.6 Added: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt (rev 0) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-05-19 13:36:29 UTC (rev 311255) @@ -0,0 +1 @@ +libcurl-7.21.6 Added: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt (rev 0) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-05-19 13:36:29 UTC (rev 311255) @@ -0,0 +1 @@ +libcurl-7.21.6 -- 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
pajoye Mon, 28 Mar 2011 10:55:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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/ Makefile config.w32
moriyoshiWed, 02 Mar 2011 18:35:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=308863
Log:
- Merge from trunk.
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -93,7 +93,7 @@
@cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
clean-sapi:
@@ -107,7 +107,7 @@
@echo Cleaning distribution build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -119,7 +119,7 @@
@echo Cleaning standard build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll
$(BUILD_DIR)\php*.exe > NUL
test:
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-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -266,7 +266,7 @@
var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
-ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_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] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Mon, 07 Feb 2011 10:17:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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
pajoye Thu, 13 Jan 2011 19:44:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307446
Log:
-disable the analyzer for the snapshot in 5.3 too
Changed paths:
U php/php-src/branches/PHP_5_3/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-13 19:16:38 UTC
(rev 307445)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-01-13 19:44:00 UTC
(rev 307446)
@@ -414,6 +414,6 @@
}
ARG_ENABLE("static-analyze", "Enable the VC compiler static analyze", "no");
-if (PHP_STATIC_ANALYZE == "yes") {
+if (PHP_STATIC_ANALYZE == "yes" && PHP_SNAPSHOT_BUILD == "no") {
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
pajoye Sun, 09 Jan 2011 21:41:54 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307312
Log:
- new sec flags should not be on by default for 5.3, yet
Changed paths:
U php/php-src/branches/PHP_5_3/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 21:38:46 UTC
(rev 307311)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-01-09 21:41:54 UTC
(rev 307312)
@@ -408,7 +408,7 @@
FSO.CreateFolder("tmp");
}
-ARG_ENABLE("security-flags", "Enable the compiler security flags", "yes");
+ARG_ENABLE("security-flags", "Enable the compiler security flags", "no");
if (PHP_SECURITY_FLAGS == "yes") {
ADD_FLAG("LDFLAGS", "/NXCOMPAT /DYNAMICBASE ");
}
--
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
pajoye Sun, 09 Jan 2011 21:38:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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/ confutils.js
pajoye Sun, 09 Jan 2011 15:19:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307305
Log:
- debug code--
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
14:04:18 UTC (rev 307304)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
15:19:03 UTC (rev 307305)
@@ -860,8 +860,7 @@
if (use_env == null) {
use_env = true;
}
-MESSAGE("**" + path_to_check);
-MESSAGE("**" + flag_name);
+
// if true, add the dir part of the header_name to the include path
if (add_dir_part == null) {
add_dir_part = false;
--
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/confutils.js trunk/win32/build/confutils.js
pajoye Sun, 09 Jan 2011 14:01:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307302
Log:
- let try to fix pecl header install so we can do the same than unix, install
them in ext/ instead of pecl
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
12:08:05 UTC (rev 307301)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-09
14:01:21 UTC (rev 307302)
@@ -860,7 +860,8 @@
if (use_env == null) {
use_env = true;
}
-
+MESSAGE("**" + path_to_check);
+MESSAGE("**" + flag_name);
// if true, add the dir part of the header_name to the include path
if (add_dir_part == null) {
add_dir_part = false;
@@ -1981,6 +1982,7 @@
dir = dir.replace(new RegExp("/", "g"), "\\");
for (i in headers_list) {
+ found = false;
src = headers_list[i];
src = src.replace(new RegExp("/", "g"), "\\");
isdir = FSO.FolderExists(dir + src);
@@ -1991,11 +1993,31 @@
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
ADD_FLAG("INSTALL_HEADERS_DIR", dir + src);
+ found = true;
} else if (isfile) {
dirname = FSO.GetParentFolderName(dir + src);
headers_install[headers_install.length] = [dir + src,
'file', dirname];
ADD_FLAG("INSTALL_HEADERS", dir + src);
+ found = true;
} else {
+ path = configure_module_dirname + "\\"+ src;
+ isdir = FSO.FolderExists(path);
+ isfile = FSO.FileExists(path);
+ if (isdir) {
+ if (src.length > 0 && src.substr(src.length -
1) != '/' && src.substr(src.length - 1) != '\\') {
+ src += '\\';
+ }
+ headers_install[headers_install.length] =
[path, 'dir',''];
+ ADD_FLAG("INSTALL_HEADERS_DIR", path);
+ } else if (isfile) {
+ dirname = FSO.GetParentFolderName(path);
+ headers_install[headers_install.length] =
[path, 'file', dir];
+ ADD_FLAG("INSTALL_HEADERS", dir + src);
+ found = true;
+ }
+ }
+
+ if (found == false) {
STDOUT.WriteLine(headers_list);
ERROR("Cannot find header " + dir + src);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-09 12:08:05 UTC (rev
307301)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-09 14:01:21 UTC (rev
307302)
@@ -1981,6 +1981,7 @@
dir = dir.replace(new RegExp("/", "g"), "\\");
for (i in headers_list) {
+ found = false;
src = headers_list[i];
src = src.replace(new RegExp("/", "g"), "\\");
isdir = FSO.FolderExists(dir + src);
@@ -1991,11 +1992,31 @@
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
ADD_FLAG("INSTALL_HEADERS_DIR", dir + src);
+ found = true;
} else if (isfile) {
dirname = FSO.GetParentFolderName(dir + src);
headers_install[headers_install.length] = [dir + src,
'file', dirname];
ADD_FLAG("INSTALL_HEADERS", dir + src);
+ found = true;
} else {
+ path = configure_module_dirname + "\\"+ src;
+ isdir = FSO.FolderExists(path);
+ isfile = FSO.FileExists(path);
+ if (isdir) {
+ if (src.length > 0 && src.substr(src.length -
1) != '/' && src.substr(src.length - 1) != '\\') {
+ src += '\\';
+ }
+ headers_install[headers_install.length] =
[path, 'dir',''];
+ ADD_FLAG("INSTALL_HEADERS_DIR", path);
+ } else if (isfile) {
+ dirname = FSO.GetParentFolderName(path);
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/config.w32.h.in trunk/win32/build/confutils.js
pajoye Fri, 07 Jan 2011 15:51:36 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307227
Log:
- define the php*.lib/dll names
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/config.w32.h.in
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-07
14:58:23 UTC (rev 307226)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-07
15:51:36 UTC (rev 307227)
@@ -1702,16 +1702,10 @@
/* Generate flags file */
/* spit out variable definitions */
CJ = FSO.CreateTextFile(dest + "/config.phpize.js");
-/*
- function escape(in) {
- val = t.replace(new RegExp('(")', "g"), '\\$1');
- }
-*/
- //if (typeof t == "string") {
-
- CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
- CJ.WriteLine("var PHP_LIB =" + '"' + get_define('PHPLIB') + '"');
+ CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
+ CJ.WriteLine("var PHP_DLL_LIB =" + '"' + get_define('PHPLIB') + '"');
+ CJ.WriteLine("var PHP_DLL =" + '"' + get_define('PHPDLL') + '"');
CJ.WriteBlankLines(1);
CJ.Close();
}
Modified: php/php-src/trunk/win32/build/config.w32.h.in
===
--- php/php-src/trunk/win32/build/config.w32.h.in 2011-01-07 14:58:23 UTC
(rev 307226)
+++ php/php-src/trunk/win32/build/config.w32.h.in 2011-01-07 15:51:36 UTC
(rev 307227)
@@ -6,7 +6,7 @@
/* Define the minimum supported version */
#undef _WIN32_WINNT
#undef NTDDI_VERSION
-#define _WIN32_WINNT 0x500
+#define _WIN32_WINNT 0x502
#define NTDDI_VERSION _WIN32_WIN2K
/* Default PHP / PEAR directories */
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-07 14:58:23 UTC (rev
307226)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-07 15:51:36 UTC (rev
307227)
@@ -1702,16 +1702,10 @@
/* Generate flags file */
/* spit out variable definitions */
CJ = FSO.CreateTextFile(dest + "/config.phpize.js");
-/*
- function escape(in) {
- val = t.replace(new RegExp('(")', "g"), '\\$1');
- }
-*/
- //if (typeof t == "string") {
-
- CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
- CJ.WriteLine("var PHP_LIB =" + '"' + get_define('PHPLIB') + '"');
+ CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
+ CJ.WriteLine("var PHP_DLL_LIB =" + '"' + get_define('PHPLIB') + '"');
+ CJ.WriteLine("var PHP_DLL =" + '"' + get_define('PHPDLL') + '"');
CJ.WriteBlankLines(1);
CJ.Close();
}
--
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/confutils.js trunk/win32/build/confutils.js
pajoye Wed, 05 Jan 2011 00:59:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307100
Log:
- revert rev. 307044
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-05
00:35:39 UTC (rev 307099)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-05
00:59:31 UTC (rev 307100)
@@ -648,9 +648,6 @@
// Expand path to include general dirs
path_to_check += ";" + php_usual_lib_suspects;
- // For static libs
- eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
-
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK
== "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec");
@@ -666,14 +663,6 @@
name = name.replace(rExp,"_debug.lib");
libnames.unshift(name);
}
- } else if (!static_lib) {
- var length = libnames.length;
- for (var i = 0; i < length; i++) {
- var name = new String(libnames[i]);
- rExp = /_a.lib$/i;
- name = name.replace(rExp,".lib");
- libnames.unshift(name);
- }
}
var i, j, k, libname;
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:35:39 UTC (rev
307099)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-05 00:59:31 UTC (rev
307100)
@@ -648,9 +648,6 @@
// Expand path to include general dirs
path_to_check += ";" + php_usual_lib_suspects;
- // For static libs
- eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
-
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK
== "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec");
@@ -666,14 +663,6 @@
name = name.replace(rExp,"_debug.lib");
libnames.unshift(name);
}
- } else if (!static_lib) {
- var length = libnames.length;
- for (var i = 0; i < length; i++) {
- var name = new String(libnames[i]);
- rExp = /_a.lib$/i;
- name = name.replace(rExp,".lib");
- libnames.unshift(name);
- }
}
var i, j, k, libname;
--
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/confutils.js trunk/win32/build/confutils.js
kalleMon, 03 Jan 2011 23:08:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307044
Log:
Fixed linking of extensions that would use a static .lib file (libname_a.lib
rather than libname.lib)
# This fixes `configure --with-mcrypt=shared' to properly find and
# link against libmcrypt.lib rather than libmcrypt_a.lib
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-03
23:08:22 UTC (rev 307043)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-03
23:08:47 UTC (rev 307044)
@@ -648,6 +648,9 @@
// Expand path to include general dirs
path_to_check += ";" + php_usual_lib_suspects;
+ // For static libs
+ eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
+
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK
== "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec");
@@ -663,6 +666,14 @@
name = name.replace(rExp,"_debug.lib");
libnames.unshift(name);
}
+ } else if (!static_lib) {
+ var length = libnames.length;
+ for (var i = 0; i < length; i++) {
+ var name = new String(libnames[i]);
+ rExp = /_a.lib$/i;
+ name = name.replace(rExp,".lib");
+ libnames.unshift(name);
+ }
}
var i, j, k, libname;
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-03 23:08:22 UTC (rev
307043)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-03 23:08:47 UTC (rev
307044)
@@ -648,6 +648,9 @@
// Expand path to include general dirs
path_to_check += ";" + php_usual_lib_suspects;
+ // For static libs
+ eval('var static_lib = !PHP_' + common_name.toUpperCase() + '_SHARED;');
+
// It is common practice to put libs under one of these dir names
var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK
== "yes"?"Release_Dbg":"Release"), "lib", "libs", "libexec");
@@ -663,6 +666,14 @@
name = name.replace(rExp,"_debug.lib");
libnames.unshift(name);
}
+ } else if (!static_lib) {
+ var length = libnames.length;
+ for (var i = 0; i < length; i++) {
+ var name = new String(libnames[i]);
+ rExp = /_a.lib$/i;
+ name = name.replace(rExp,".lib");
+ libnames.unshift(name);
+ }
}
var i, j, k, libname;
--
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.phpize.in
pajoye Mon, 03 Jan 2011 01:22:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307010
Log:
- prevent php(version)lib.(dll|lib) to be overriden
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
2011-01-03 01:22:00 UTC (rev 307009)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
2011-01-03 01:22:07 UTC (rev 307010)
@@ -203,22 +203,35 @@
// 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", "php" + PHP_VERSION + "ts_debug.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+ }
} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
- DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+ }
} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
- DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+ }
} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
- DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+ }
}
+if (MODE_PHPIZE) {
+ DEFINE("PHPDLL", PHP_DLL);
+ DEFINE("PHPLIB", PHP_DLL_LIB);
+}
+
// Find the php_build dir - it contains headers and libraries
// that we need
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');
--
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/phpize.js.in trunk/win32/build/phpize.js.in
pajoye Mon, 03 Jan 2011 01:08:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307008
Log:
- we need the core config.w32 only once
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
U php/php-src/trunk/win32/build/phpize.js.in
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-03
01:07:28 UTC (rev 307007)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-03
01:08:21 UTC (rev 307008)
@@ -222,8 +222,7 @@
C.WriteBlankLines(1);
}
-// Pull in code from sapi and extensions
-
+// Pull in code for the base detection
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
@@ -249,8 +248,6 @@
C.WriteLine("conf_process_args();");
C.WriteBlankLines(1);
-C.Write(file_get_contents(PHP_DIR + "/script/config.w32.phpize.in"));
-
// Comment out the calls from their original positions
modules = modules.replace(re, "/* $1 */");
C.Write(modules);
Modified: php/php-src/trunk/win32/build/phpize.js.in
===
--- php/php-src/trunk/win32/build/phpize.js.in 2011-01-03 01:07:28 UTC (rev
307007)
+++ php/php-src/trunk/win32/build/phpize.js.in 2011-01-03 01:08:21 UTC (rev
307008)
@@ -222,7 +222,7 @@
C.WriteBlankLines(1);
}
-// Pull in code from sapi and extensions
+// Pull in code for the base detection
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
@@ -248,8 +248,6 @@
C.WriteLine("conf_process_args();");
C.WriteBlankLines(1);
-C.Write(file_get_contents(PHP_DIR + "/script/config.w32.phpize.in"));
-
// Comment out the calls from their original positions
modules = modules.replace(re, "/* $1 */");
C.Write(modules);
--
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/confutils.js trunk/win32/build/confutils.js
pajoye Sun, 02 Jan 2011 18:29:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307000
Log:
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:14:50 UTC (rev 306999)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:29:56 UTC (rev 307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
"\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase()
+ "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:14:50 UTC (rev
306999)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:29:56 UTC (rev
307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
"\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase()
+ "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}
--
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/ Makefile confutils.js
pajoye Sun, 02 Jan 2011 18:14:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306999
Log:
- typo, and remove undesired committed part
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:13:20 UTC
(rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:14:50 UTC
(rev 306999)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:13:20 UTC (rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:14:50 UTC (rev 306999)
@@ -1129,11 +1129,6 @@
var dep_present = false;
var dep_shared = false;
- if (MODE_PHPIZE) {
- ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
- eval(ext_deps_js);
- }
-
try {
dep_present = eval("PHP_" + DEP);
--
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/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile
pajoye Sun, 02 Jan 2011 18:13:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306998
Log:
- typo
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/Makefile
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:03:00 UTC
(rev 306997)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:13:20 UTC
(rev 306998)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
+ copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:03:00 UTC (rev 306997)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:13:20 UTC (rev 306998)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2011-01-02 18:03:00 UTC (rev
306997)
+++ php/php-src/trunk/win32/build/Makefile 2011-01-02 18:13:20 UTC (rev
306998)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
+ copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
--
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/Makefile branches/PHP_5_3/win32/build/confutils.js branches/PHP_5_3/win32/build/phpize.js.in trunk/win32/build/Makefile trunk/win32/build/conf
pajoye Sun, 02 Jan 2011 18:03:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306997
Log:
- generate a list of ext and how they are built, should be updated by phpize'd
make (un)install as well, later
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
U php/php-src/trunk/win32/build/Makefile
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 17:22:06 UTC
(rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:03:00 UTC
(rev 306997)
@@ -182,6 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
17:22:06 UTC (rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:03:00 UTC (rev 306997)
@@ -1666,6 +1666,7 @@
}
var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
+ var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
prefix = get_define("PHP_PREFIX");
prefix = prefix.replace(new RegExp("/", "g"), "\\");
prefix = prefix.replace(new RegExp("", "g"), "");
@@ -1675,11 +1676,22 @@
MF.WriteLine("var PHP_VERSION=" + PHP_VERSION);
MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
+ MF.WriteBlankLines(1);
+ MF.WriteLine("/* Genereted extensions list with mode (static/shared)
*/");
+
+ var count = extensions_enabled.length;
+ for (i in extensions_enabled) {
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ DEPS.WriteLine(out);
+ MF.WriteLine(out);
+ }
+
MF.WriteBlankLines(2);
MF.WriteLine("/* Genereted win32/build/phpize.js.in */");
MF.WriteBlankLines(1);
MF.Write(file_get_contents("win32/build/phpize.js.in"));
MF.Close();
+ DEPS.Close();
/* Generate flags file */
/* spit out variable definitions */
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-02
17:22:06 UTC (rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-02
18:03:00 UTC (rev 306997)
@@ -223,6 +223,7 @@
}
// Pull in code from sapi and extensions
+
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2011-01-02 17:22:06 UTC (rev
306996)
+++ php/php-src/trunk/win32/build/Makefile 2011-01-02 18:03:00 UTC (rev
306997)
@@ -182,6 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 17:22:06 UTC (rev
306996)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:03:00 UTC (rev
306997)
@@ -1666,6 +1666,7 @@
}
var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
+ var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
prefix = get_define("PHP_PREFIX");
prefix = prefix.replace(new RegExp("/", "g"), "\\");
prefix = prefix.replace(new RegExp("", "g"), "");
@@ -1675,11 +1676,22 @@
MF.WriteLine("var PHP_VERSION=" + PHP_VERSION);
MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
MF.WriteLine("var PH
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ phpize.js.in
pajoye Sat, 01 Jan 2011 20:00:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306958
Log:
- fix ADD_EXTENSION_DEP detection
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-01
20:00:10 UTC (rev 306957)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-01
20:00:21 UTC (rev 306958)
@@ -59,6 +59,7 @@
{
var re_dep_line = new
RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm");
var calls = contents.match(re_dep_line);
+ var deps = new Array();
if (calls != null) {
for (i = 0; i < calls.length; i++) {
// now we need the extension name out of this thing
@@ -68,6 +69,7 @@
}
}
}
+ return deps;
}
function find_config_w32(dirname)
@@ -86,9 +88,8 @@
var dir_line = "configure_module_dirname =
condense_path(FSO.GetParentFolderName('"
+ c.replace(new
RegExp('(["])', "g"), '\\$1') + "'));\r\n";
var contents = file_get_contents(c);
- var deps = new Array();
- get_module_dep(contents);
+ deps = get_module_dep(contents);
item = new Module_Item(n, c, dir_line, deps, contents);
MODULES.Add(n, item);
@@ -107,9 +108,8 @@
var dir_line = "configure_module_dirname =
condense_path(FSO.GetParentFolderName('"
+ c.replace(new
RegExp('(["])', "g"), '\\$1') + "'));\r\n";
var contents = file_get_contents(c);
- var deps = new Array();
- get_module_dep(contents);
+ deps = get_module_dep(contents);
item = new Module_Item(n, c, dir_line, deps, contents);
MODULES.Add(n, item);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile confutils.js
Hi Pierre 2010/12/15 Pierre Joye : > Log: > - fix build with out of src obj dir > > # | Copyright (c) 1997-2008 The PHP Group | > # +--+ > # | This source file is subject to version 3.01 of the PHP license, | > -# | that is bundled with this package in the file LICENSE, and is | > +# | that is bundled with this package in the file LICENSE, and is |3 This looks like a typo that shouldn't have been committed Kalle Sommer Nielsen ka...@php.net -- 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/mkdist.php trunk/win32/build/mkdist.php
pajoye Wed, 15 Dec 2010 02:01:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=306376 Log: - we don't bundled fbclient, system version is used Changed paths: U php/php-src/branches/PHP_5_3/win32/build/mkdist.php U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2010-12-15 00:39:07 UTC (rev 306375) +++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2010-12-15 02:01:21 UTC (rev 306376) @@ -56,6 +56,9 @@ /* sybase */ 'libcs.dll', 'libct.dll', + /* firebird */ + 'fbclient.dll', + /* visual C++; mscvrt.dll is present on everyones system, * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2010-12-15 00:39:07 UTC (rev 306375) +++ php/php-src/trunk/win32/build/mkdist.php2010-12-15 02:01:21 UTC (rev 306376) @@ -56,6 +56,9 @@ /* sybase */ 'libcs.dll', 'libct.dll', + /* firebird */ + 'fbclient.dll', + /* visual C++; mscvrt.dll is present on everyones system, * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ -- 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/ Makefile
pajoye Wed, 15 Dec 2010 00:39:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=306375 Log: - typo Changed paths: U php/php-src/branches/PHP_5_3/win32/build/Makefile Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile === --- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-15 00:09:59 UTC (rev 306374) +++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-15 00:39:07 UTC (rev 306375) @@ -4,7 +4,7 @@ # | Copyright (c) 1997-2008 The PHP Group| # +--+ # | This source file is subject to version 3.01 of the PHP license, | -# | that is bundled with this package in the file LICENSE, and is|3 +# | that is bundled with this package in the file LICENSE, and is| # | available through the world-wide-web at the following url: | # | http://www.php.net/license/3_01.txt | # | If you did not receive a copy of the PHP license and are unable to | -- 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/ Makefile
pajoye Tue, 14 Dec 2010 23:21:01 + Revision: http://svn.php.net/viewvc?view=revision&revision=306372 Log: - devel must be done before dist Changed paths: U php/php-src/branches/PHP_5_3/win32/build/Makefile Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile === --- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 23:09:31 UTC (rev 306371) +++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 23:21:01 UTC (rev 306372) @@ -156,7 +156,7 @@ cd ..\.. dist: all build-dist -snap: build-snap build-dist +snap: build-snap build-devel build-dist $(BUILD_DIR)\deplister.exe:win32\build\deplister.c $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib -- 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/ Makefile confutils.js
pajoye Tue, 14 Dec 2010 23:09:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306371
Log:
- fix build with out of src obj dir
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 21:59:23 UTC
(rev 306370)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 23:09:31 UTC
(rev 306371)
@@ -4,7 +4,7 @@
# | Copyright (c) 1997-2008 The PHP Group|
# +--+
# | This source file is subject to version 3.01 of the PHP license, |
-# | that is bundled with this package in the file LICENSE, and is|
+# | that is bundled with this package in the file LICENSE, and is|3
# | available through the world-wide-web at the following url: |
# | http://www.php.net/license/3_01.txt |
# | If you did not receive a copy of the PHP license and are unable to |
@@ -92,8 +92,9 @@
@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
@cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
- @cd ../..
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
+ @cd $(PHP_SRC_DIR)
+
clean-sapi:
@echo Cleaning SAPI
@@ -106,7 +107,7 @@
@echo Cleaning distribution build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
- @cd ..\..
+ @cd $(PHP_SRC_DIR)
-...@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -118,7 +119,7 @@
@echo Cleaning standard build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
- @cd ..\..
+ @cd $(PHP_SRC_DIR)
-...@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll
$(BUILD_DIR)\php*.exe > NUL
test:
@@ -131,7 +132,7 @@
-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
-for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
-build-dist: $(BUILD_DIR)\deplister.exe build-devel build-lib
+build-dist: $(BUILD_DIR)\deplister.exe
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14
21:59:23 UTC (rev 306370)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14
23:09:31 UTC (rev 306371)
@@ -27,6 +27,7 @@
var SYSTEM_DRIVE = WshShell.Environment("Process").Item("SystemDrive");
var PROGRAM_FILES = WshShell.Environment("Process").Item("ProgramFiles");
var DSP_FLAGS = new Array();
+var PHP_SRC_DIR=FSO.GetParentFolderName(WScript.ScriptFullName);
/* Store the enabled extensions (summary + QA check) */
var extensions_enabled = new Array();
@@ -1553,12 +1554,14 @@
continue;
}
last = bd;
+
build_dir = get_define('BUILD_DIR');
build_dir = build_dir.replace(new RegExp("", "g"), "");
if (build_dir.substr(build_dir.Length - 2, 2) != '') {
build_dir += '';
}
ADD_FLAG("BUILD_DIRS_SUB", bd.replace(new RegExp(build_dir),
''));
+
if (!FSO.FolderExists(bd)) {
FSO.CreateFolder(bd);
}
@@ -1704,7 +1707,7 @@
/* spit out variable definitions */
var keys = (new VBArray(configure_subst.Keys())).toArray();
var i;
-
+ MF.WriteLine("PHP_SRC_DIR =" + PHP_SRC_DIR);
for (i in keys) {
// The trailing space is needed to prevent the trailing
backslash
// that is part of the build dir flags (CFLAGS_BD_XXX) from
being
--
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/ Makefile confutils.js
pajoye Tue, 14 Dec 2010 18:49:15 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306369
Log:
- we just reached the tiny cmd lenght limit, let reduce the size of dirs
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 17:01:54 UTC
(rev 306368)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 18:49:15 UTC
(rev 306369)
@@ -90,7 +90,9 @@
$(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV):
@echo Recreating build dirs
@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
+ @cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
+ @cd ../..
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
clean-sapi:
@@ -102,7 +104,9 @@
clean: clean-sapi
@echo Cleaning distribution build dirs
+ @cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
+ @cd ..\..
-...@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -112,7 +116,9 @@
clean-all:
@echo Cleaning standard build dirs
+ @cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
+ @cd ..\..
-...@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll
$(BUILD_DIR)\php*.exe > NUL
test:
@@ -125,7 +131,7 @@
-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
-for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
-build-dist: $(BUILD_DIR)\deplister.exe
+build-dist: $(BUILD_DIR)\deplister.exe build-devel build-lib
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
@@ -149,7 +155,7 @@
cd ..\..
dist: all build-dist
-snap: build-devel build-lib build-snap build-dist
+snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe:win32\build\deplister.c
$(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
@@ -187,3 +193,4 @@
@echo Registering event source with syslog (requires admin rights)
@echo It's okay for this step to fail:
-$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX)
win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
+
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14
17:01:54 UTC (rev 306368)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14
18:49:15 UTC (rev 306369)
@@ -1553,7 +1553,12 @@
continue;
}
last = bd;
- ADD_FLAG("BUILD_DIRS_SUB", bd.replace(new
RegExp('^'+dir+''), '$(BUILD_DIR)\\'));
+ build_dir = get_define('BUILD_DIR');
+ build_dir = build_dir.replace(new RegExp("", "g"), "");
+ if (build_dir.substr(build_dir.Length - 2, 2) != '') {
+ build_dir += '';
+ }
+ ADD_FLAG("BUILD_DIRS_SUB", bd.replace(new RegExp(build_dir),
''));
if (!FSO.FolderExists(bd)) {
FSO.CreateFolder(bd);
}
--
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/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile trunk/win32/build/confutils.js
pajoye Tue, 14 Dec 2010 02:55:26 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306356
Log:
- add nmake install-sdk (create the devel package) and related sub rules
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/Makefile
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 01:48:31 UTC (rev 306355)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 02:55:26 UTC (rev 306356)
@@ -25,10 +25,12 @@
PHP_BUILD=$(PHP_BUILD)
MCFILE=$(BUILD_DIR)\wsyslog.rc
+BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)
+BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME)
all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS)
-build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)
+build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV)
!if $(RE2C) == ""
generated_files: build_dirs Zend\zend_ini_parser.c \
@@ -85,10 +87,11 @@
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
-$(BUILD_DIR) $(BUILD_DIRS_SUB):
+$(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV):
@echo Recreating build dirs
@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
+ @if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
clean-sapi:
@echo Cleaning SAPI
@@ -140,10 +143,13 @@
cd ..\..
cd $(BUILD_DIR)
-$(ZIP) -9 -q php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb
+ cd
+ cd
+ -$(ZIP) -9 -q -r php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip $(BUILD_DIR_DEV_NAME)
cd ..\..
dist: all build-dist
-snap: build-snap build-dist
+snap: build-devel build-lib build-snap build-dist
$(BUILD_DIR)\deplister.exe: win32\build\deplister.c
$(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
@@ -152,24 +158,27 @@
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
# need to redirect, since INSTALL is a file in the root...
-install: really-install install-devel install-lib
+install: really-install install-sdk
-install-lib:
- @if not exist $(PHP_PREFIX)\lib mkdir $(PHP_PREFIX)\lib >nul
- @copy $(BUILD_DIR)\$(PHPLIB) $(PHP_PREFIX)\lib /y >nul
+build-lib:
+ @if not exist $(BUILD_DIR_DEV)\lib mkdir $(BUILD_DIR_DEV)\lib >nul
+ @copy $(BUILD_DIR)\$(PHPLIB) $(BUILD_DIR_DEV)\lib /y >nul
-install-devel: install-headers
- @if not exist $(PHP_PREFIX)\script mkdir $(PHP_PREFIX)\script >nul
- @if not exist $(PHP_PREFIX)\build mkdir $(PHP_PREFIX)\build >nul
- @copy win32\build\confutils.js $(PHP_PREFIX)\script\ /y >nul
- @copy win32\build\configure.tail $(PHP_PREFIX)\script\ /y >nul
- @copy win32\build\config.w32.phpize.in $(PHP_PREFIX)\script\ /y >nul
- @copy win32\build\Makefile.phpize $(PHP_PREFIX)\script\ /y >nul
- @copy win32\build\phpize.bat $(PHP_PREFIX)\ /y >nul
- @copy win32\build\template.rc $(PHP_PREFIX)\build\ /y >nul
- @copy $(BUILD_DIR)\devel\config.phpize.js $(PHP_PREFIX)\script\ /y >nul
- @copy $(BUILD_DIR)\devel\phpize.js $(PHP_PREFIX)\script\ /y >nul
+build-devel: build-headers build-lib
+ @if not exist $(BUILD_DIR_DEV)\script mkdir $(BUILD_DIR_DEV)\script >nul
+ @if not exist $(BUILD_DIR_DEV)\build mkdir $(BUILD_DIR_DEV)\build >nul
+ @copy win32\build\confutils.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy win32\build\configure.tail $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy win32\build\config.w32.phpize.in $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy win32\build\Makefile.phpize $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy win32\build\phpize.bat $(BUILD_DIR_DEV)\ /y >nul
+ @copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
+ @copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+install-sdk: build-devel
+ @xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
+
really-install:
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
@echo Installing files under $(PHP_PREFIX)
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14 01:48:31 UTC (rev 306355)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14 02:55:26 UTC (rev 306356)
@@ -1720,17 +1720,17 @@
MF.Write(TF.ReadAll());
- MF.WriteLine("install-headers:");
- MF.WriteLine(" @if not exist $(PHP_PREFIX)\\include mkdir $(PHP_PREFIX)\\incl
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ confutils.js
pajoye Mon, 13 Dec 2010 20:57:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306349
Log:
- MFH trailing slashes detection
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:56:44 UTC (rev 306348)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:57:06 UTC (rev 306349)
@@ -1955,7 +1955,7 @@
{
headers_list = headers_list.split(new RegExp("\\s+"));
headers_list.sort();
- if (dir.length > 0 && dir.substr(dir.length - 1) != '/') {
+ if (dir.length > 0 && dir.substr(dir.length - 1) != '/' &&
dir.substr(dir.length - 1) != '\\') {
dir += '/';
}
dir = dir.replace(new RegExp("/", "g"), "\\");
@@ -1966,7 +1966,7 @@
isdir = FSO.FolderExists(dir + src);
isfile = FSO.FileExists(dir + src);
if (isdir) {
- if (src.length > 0 && src.substr(src.length - 1) !=
'/') {
+ if (src.length > 0 && src.substr(src.length - 1) != '/'
&& src.substr(src.length - 1) != '\\') {
src += '\\';
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
--
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
pajoye Thu, 02 Dec 2010 23:23:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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 branches/PHP_5_3/win32/php5dll.dsp branches/PHP_5_3/win32/php5dllts.dsp branches/PHP_5_3/win32/wfile.c branches/PHP_5_3/win32/wfile
pajoye Sat, 11 Sep 2010 19:07:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=303280
Log:
- remove dummy wrapper for readfile
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/php5dll.dsp
U php/php-src/branches/PHP_5_3/win32/php5dllts.dsp
D php/php-src/branches/PHP_5_3/win32/wfile.c
D php/php-src/branches/PHP_5_3/win32/wfile.h
U php/php-src/trunk/win32/build/config.w32
U php/php-src/trunk/win32/php5dll.dsp
U php/php-src/trunk/win32/php5dllts.dsp
D php/php-src/trunk/win32/wfile.c
D php/php-src/trunk/win32/wfile.h
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-09-11 18:22:17 UTC
(rev 303279)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-09-11 19:07:43 UTC
(rev 303280)
@@ -349,7 +349,7 @@
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
ADD_SOURCES("win32", "glob.c readdir.c \
- registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c
globals.c");
+ registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
STDOUT.WriteBlankLines(1);
Modified: php/php-src/branches/PHP_5_3/win32/php5dll.dsp
===
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/win32/php5dllts.dsp
===
(Binary files differ)
Deleted: php/php-src/branches/PHP_5_3/win32/wfile.c
===
--- php/php-src/branches/PHP_5_3/win32/wfile.c 2010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/branches/PHP_5_3/win32/wfile.c 2010-09-11 19:07:43 UTC (rev
303280)
@@ -1,17 +0,0 @@
-
-/* Function borrowed from the Downhill Project */
-#include "wfile.h"
-#include "direct.h"
-
-int readlink(char *file_Name, char *buf_Mem, int buf_Size)
-{
- /* See if the file exists */
- if (access(file_Name, WFILE_EXISTS) == -1) {
- errno = ENOENT;
- } else {
- errno = EINVAL;
- }
-
- /* Either way, it's not a link */
- return -1;
-}
Deleted: php/php-src/branches/PHP_5_3/win32/wfile.h
===
--- php/php-src/branches/PHP_5_3/win32/wfile.h 2010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/branches/PHP_5_3/win32/wfile.h 2010-09-11 19:07:43 UTC (rev
303280)
@@ -1,16 +0,0 @@
-#include
-#include
-#include
-#include
-
-#define access _access
-#define WFILE_EXISTS 0
-#ifndef ENOENT
-#define ENOENT 136
-#endif
-#ifndef EINVAL
-#define EINVAL 131
-#endif
-
-int readlink(char *, char *, int);
-int checkroot(char *path);
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/trunk/win32/build/config.w322010-09-11 19:07:43 UTC (rev
303280)
@@ -354,7 +354,7 @@
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
ADD_SOURCES("win32", "glob.c readdir.c \
- registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c
globals.c");
+ registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
STDOUT.WriteBlankLines(1);
Modified: php/php-src/trunk/win32/php5dll.dsp
===
(Binary files differ)
Modified: php/php-src/trunk/win32/php5dllts.dsp
===
(Binary files differ)
Deleted: php/php-src/trunk/win32/wfile.c
===
--- php/php-src/trunk/win32/wfile.c 2010-09-11 18:22:17 UTC (rev 303279)
+++ php/php-src/trunk/win32/wfile.c 2010-09-11 19:07:43 UTC (rev 303280)
@@ -1,17 +0,0 @@
-
-/* Function borrowed from the Downhill Project */
-#include "wfile.h"
-#include "direct.h"
-
-int readlink(char *file_Name, char *buf_Mem, int buf_Size)
-{
- /* See if the file exists */
- if (access(file_Name, WFILE_EXISTS) == -1) {
- errno = ENOENT;
- } else {
- errno = EINVAL;
- }
-
- /* Either way, it's not a link */
- return -1;
-}
Deleted: php/php-src/trunk/win32/wfile.h
===
--- php/php-src/trunk/win32/wfile.h 2010-09-11 18:22:17 UTC (rev 303279)
+++ php/php-src/trunk/win32/wfile.h 2010-09-11 19:07:43 UTC (rev 303280)
@@ -1,16 +0,0 @@
-#include
-#include
-#include
-#include
-
-#define access _access
-#define WFILE_EXISTS 0
-#ifndef ENOENT
-#define ENOENT 136
-#endif
-#ifndef EINVAL
-#define EINVAL 131
-#endif
-
-int readlink(char *, cha
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/Makefile trunk/win32/build/config.w32
pajoye Sun, 15 Aug 2010 13:54:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302269
Log:
- #52607, fix ENV conflit with win SDK 7.1
Bug: http://bugs.php.net/52607 (Assigned) PHP won't compile with VS2010
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/trunk/win32/build/Makefile
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-08-15 13:47:22 UTC
(rev 302268)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 13:54:03 UTC
(rev 302269)
@@ -24,7 +24,7 @@
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler
compatibility ID");
// do we use x64 or 80x86 version of compiler?
-X64 = probe_binary(PHP_CL, 64);
+X64 = probe_binary(PHP_CL, 64, null, 'PHP_CL');
if (X64) {
STDOUT.WriteLine(" Detected 64-bit compiler");
} else {
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2010-08-15 13:47:22 UTC (rev
302268)
+++ php/php-src/trunk/win32/build/Makefile 2010-08-15 13:54:03 UTC (rev
302269)
@@ -17,7 +17,7 @@
# $Id$
# This is the makefile template for the win32 build
-CC="$(CL)"
+CC="$(PHP_CL)"
LD="$(LINK)"
MC="$(MC)"
MT="$(MT)"
@@ -146,7 +146,7 @@
snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe:win32\build\deplister.c
- $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
+ $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php
"$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322010-08-15 13:47:22 UTC (rev
302268)
+++ php/php-src/trunk/win32/build/config.w322010-08-15 13:54:03 UTC (rev
302269)
@@ -4,8 +4,8 @@
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-CL = PATH_PROG('cl');
-if (!CL) {
+PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
+if (!PHP_CL) {
ERROR("MS C++ compiler is required");
}
@@ -17,7 +17,7 @@
// 1500 is vs.net 2008
// 1600 is vs.net 2010
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
if (VCVERS < 1500) {
@@ -29,7 +29,7 @@
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler
compatibility ID");
// do we use x64 or 80x86 version of compiler?
-X64 = probe_binary(CL, 64);
+X64 = probe_binary(PHP_CL, 64, null, 'PHP_CL');
if (X64) {
STDOUT.WriteLine(" Detected 64-bit compiler");
} else {
--
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/ template.rc
pajoye Sun, 15 Aug 2010 13:40:29 + Revision: http://svn.php.net/viewvc?view=revision&revision=302265 Log: - year++ Changed paths: U php/php-src/branches/PHP_5_3/win32/build/template.rc Modified: php/php-src/branches/PHP_5_3/win32/build/template.rc === --- php/php-src/branches/PHP_5_3/win32/build/template.rc2010-08-15 13:13:31 UTC (rev 302264) +++ php/php-src/branches/PHP_5_3/win32/build/template.rc2010-08-15 13:40:29 UTC (rev 302265) @@ -65,7 +65,7 @@ #endif VALUE "FileVersion", EXT_VERSION VALUE "InternalName", INTERNAL_NAME -VALUE "LegalCopyright", "Copyright � 1997-2009 The PHP Group" +VALUE "LegalCopyright", "Copyright � 1997-2010 The PHP Group" VALUE "LegalTrademarks", "PHP" VALUE "OriginalFilename", FILE_NAME VALUE "ProductName", "PHP" -- 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/ Makefile config.w32
pajoye Sun, 15 Aug 2010 03:38:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=302247
Log:
- #52607, fix ENV conflit with win SDK 7.1
Bug: http://bugs.php.net/52607 (Feedback) PHP won't compile with VS2010
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 01:58:36 UTC
(rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 03:38:08 UTC
(rev 302247)
@@ -17,7 +17,7 @@
# $Id$
# This is the makefile template for the win32 build
-CC="$(CL)"
+CC="$(PHP_CL)"
LD="$(LINK)"
MC="$(MC)"
MT="$(MT)"
@@ -146,7 +146,7 @@
snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe:win32\build\deplister.c
- $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
+ $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\
/FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php
"$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 01:58:36 UTC
(rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 03:38:08 UTC
(rev 302247)
@@ -4,8 +4,8 @@
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
-CL = PATH_PROG('cl');
-if (!CL) {
+PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
+if (!PHP_CL) {
ERROR("MS C++ compiler is required");
}
@@ -17,14 +17,14 @@
// 1500 is vs.net 2008
// 1600 is vs.net 2010
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler
compatibility ID");
// do we use x64 or 80x86 version of compiler?
-X64 = probe_binary(CL, 64);
+X64 = probe_binary(PHP_CL, 64);
if (X64) {
STDOUT.WriteLine(" Detected 64-bit compiler");
} else {
--
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.h.in trunk/win32/build/config.w32.h.in
pajoye Thu, 10 Dec 2009 14:08:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=291951 Log: - #50334, add define on win as well Bug: http://bugs.php.net/50334 (Closed) crypt ignores sha512 prefix Changed paths: U php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in U php/php-src/trunk/win32/build/config.w32.h.in Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in === --- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2009-12-10 13:16:23 UTC (rev 291950) +++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in2009-12-10 14:08:19 UTC (rev 291951) @@ -28,6 +28,8 @@ #define PHP_EXT_DES_CRYPT 1 #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 1 +#define PHP_SHA512_CRYPT 1 +#define PHP_SHA256_CRYPT 1 /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 Modified: php/php-src/trunk/win32/build/config.w32.h.in === --- php/php-src/trunk/win32/build/config.w32.h.in 2009-12-10 13:16:23 UTC (rev 291950) +++ php/php-src/trunk/win32/build/config.w32.h.in 2009-12-10 14:08:19 UTC (rev 291951) @@ -28,6 +28,8 @@ #define PHP_EXT_DES_CRYPT 1 #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 1 +#define PHP_SHA512_CRYPT 1 +#define PHP_SHA256_CRYPT 1 /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 -- 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 confutils.js
pajoye Mon, 30 Nov 2009 09:52:33 +
Revision: http://svn.php.net/viewvc?view=revision&revision=291481
Log:
- MFH: vs2010 detection support, restore /W3
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-11-30 09:22:41 UTC
(rev 291480)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-11-30 09:52:33 UTC
(rev 291481)
@@ -15,6 +15,7 @@
// 1310 is vs.net 2003
// 1400 is vs.net 2005
// 1500 is vs.net 2008
+// 1600 is vs.net 2010
// Which version of the compiler do we have?
VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-11-30
09:22:41 UTC (rev 291480)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-11-30
09:52:33 UTC (rev 291481)
@@ -41,6 +41,7 @@
VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
+VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -48,6 +49,7 @@
VC_VERSIONS_SHORT[1310] = 'VC7.1';
VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
+VC_VERSIONS_SHORT[1600] = 'VC10';
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] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32
kalleFri, 30 Oct 2009 14:20:15 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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/mkdist.php PHP_5_3_1/NEWS PHP_5_3_1/win32/build/mkdist.php
pajoye Sat, 24 Oct 2009 19:52:23 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289905
Log:
- #49986, fix ICU DLLs path
Bug: http://bugs.php.net/49986 (Assigned) intl extension missing/DLLs for intl
extension missing
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-24 10:10:38 UTC
(rev 289904)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-24 19:52:23 UTC
(rev 289905)
@@ -315,7 +315,7 @@
deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll
*/
-$ICU_DLLS = $php_build_dir . '/icu*.dll';
+$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-24 10:10:38 UTC (rev 289904)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-24 19:52:23 UTC (rev 289905)
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.1 RC3
+- #49986 (Missing ICU DLLs on windows package). (Pierre)
20 Oct 2009, PHP 5.3.1 RC2
- Upgraded bundled sqlite to version 3.6.19. (Scott)
Modified: php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-24
10:10:38 UTC (rev 289904)
+++ php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-24
19:52:23 UTC (rev 289905)
@@ -315,7 +315,7 @@
deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll
*/
-$ICU_DLLS = $php_build_dir . '/icu*.dll';
+$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
--
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/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:58:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=289768 Log: - we don't distribute the crt9 dll, don't try to add it Changed paths: U php/php-src/branches/PHP_5_3/win32/build/mkdist.php U php/php-src/trunk/win32/build/mkdist.php Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php === --- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; Modified: php/php-src/trunk/win32/build/mkdist.php === --- php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:40:02 UTC (rev 289767) +++ php/php-src/trunk/win32/build/mkdist.php2009-10-19 19:58:45 UTC (rev 289768) @@ -60,6 +60,7 @@ * but the debug version (msvcrtd.dll) and those from visual studio.net * (msvcrt7x.dll) are not */ 'msvcrt.dll', + 'msvcr90.dll', 'wldap32.dll' ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; -- 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/Makefile branches/PHP_5_3/win32/build/config.w32 branches/PHP_5_3/win32/build/mkdist.php trunk/win32/build/mkdist.php
pajoye Mon, 19 Oct 2009 19:02:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289763
Log:
- add custom DLL to the package and fix the path to the deps bin (needs
absolute path in some cases)
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
U php/php-src/trunk/win32/build/mkdist.php
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)"
"$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHP_BUILD)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
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-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -251,6 +251,7 @@
}
}
}
+ PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
}
DEFINE("PHP_BUILD", PHP_PHP_BUILD);
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 18:49:22 UTC
(rev 289762)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-10-19 19:02:12 UTC
(rev 289763)
@@ -2,11 +2,12 @@
/* piece together a windows binary distro */
$build_dir = $argv[1];
-$phpdll = $argv[2];
-$sapi_targets = explode(" ", $argv[3]);
-$ext_targets = explode(" ", $argv[4]);
-$pecl_targets = explode(" ", $argv[5]);
-$snapshot_template = $argv[6];
+$php_build_dir = $argv[2];
+$phpdll = $argv[3];
+$sapi_targets = explode(" ", $argv[4]);
+$ext_targets = explode(" ", $argv[5]);
+$pecl_targets = explode(" ", $argv[6]);
+$snapshot_template = $argv[7];
$is_debug = preg_match("/^debug/i", $build_dir);
@@ -295,7 +296,7 @@
/* try template dir */
$tdll = $snapshot_template . "/dlls/" . basename($dll);
if (!file_exists($tdll)) {
- $tdll = '../deps/bin/' . basename($dll);
+ $tdll = $php_build_dir . '/bin/' . basename($dll);
if (!file_exists($tdll)) {
echo "WARNING: distro depends on $dll, but
could not find it on your system\n";
continue;
@@ -309,11 +310,23 @@
/* TODO:
add sanity check and test if all required DLLs are present, per version
This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD).
+Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
+deps. For example, libenchant.dll loads libenchant_myspell.dll or
+libenchant_ispell.dll
*/
-$ICU_DLLS = '../deps/bin/' . 'icu*.dll';
+$ICU_DLLS = $php_build_dir . '/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
+$ENCHANT_DLLS = array(
+ 'glib-2.dll',
+ 'gmodule-2.dll',
+ 'libenchant_myspell.dll',
+ 'libenchant_ispell.dll',
+);
+foreach ($ENCHANT_DLLS as $filename) {
+ copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" .
basename($filename));
+}
/* and those for pecl */
foreach ($pecl_dll_deps as $dll) {
@@ -332,6 +345,7 @@
}
copy($dll, "$pecl_dir/" . basename($dll));
}
+
function copy_dir($source, $dest)
{
if (!is_dir($dest)) {
@@ -365,7 +379,9 @@
}
if ($directory == 'tests') {
- mkdir($dest . '/tests', 0775, true);
+ if (!is_
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Wed, 30 Sep 2009 11:53:29 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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
pajoye Mon, 24 Aug 2009 14:18:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=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
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ confutils.js
derick Fri, 24 Jul 2009 16:30:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=284709
Log:
- Added - to the list of "unsafe" characters so that the pecl dir can have the
- character in the name.
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-07-24
16:21:40 UTC (rev 284708)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-07-24
16:30:48 UTC (rev 284709)
@@ -1286,12 +1286,12 @@
* as either a child or a sibling */
if (obj_dir == null) {
var build_dir = dir.replace(new RegExp("^.."), "");
- var mangle_dir = build_dir.replace(new RegExp("[/.]", "g"),
"_");
+ var mangle_dir = build_dir.replace(new RegExp("[/.-]",
"g"), "_");
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
}
else {
var build_dir = obj_dir.replace(new RegExp("^.."), "");
- var mangle_dir = build_dir.replace(new RegExp("[/.]", "g"),
"_");
+ var mangle_dir = build_dir.replace(new RegExp("[/.-]",
"g"), "_");
var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
}
--
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/
pajoye Wed, 15 Jul 2009 17:08:50 +
URL: http://svn.php.net/viewvc?view=revision&revision=284136
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/buildconf.js
Log:
- cvs > svn
Modified: php/php-src/branches/PHP_5_3/win32/build/buildconf.js
===
--- php/php-src/branches/PHP_5_3/win32/build/buildconf.js 2009-07-15 17:08:26 UTC (rev 284135)
+++ php/php-src/branches/PHP_5_3/win32/build/buildconf.js 2009-07-15 17:08:50 UTC (rev 284136)
@@ -1,273 +1,273 @@
-/*
- +--+
- | PHP Version 5|
- +--+
- | Copyright (c) 1997-2008 The PHP Group|
- +--+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is|
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@php.net so we can mail you a copy immediately. |
- +--+
- | Author: Wez Furlong|
- +--+
-*/
-
-/* $Id: buildconf.js,v 1.13.2.2.2.1.2.5 2009-01-02 12:18:21 kalle Exp $ */
-// This generates a configure script for win32 build
-
-WScript.StdOut.WriteLine("Rebuilding configure.js");
-var FSO = WScript.CreateObject("Scripting.FileSystemObject");
-var C = FSO.CreateTextFile("configure.js", true);
-var B = FSO.CreateTextFile("configure.bat", true);
-var DSP = false;
-
-var modules = "";
-var MODULES = WScript.CreateObject("Scripting.Dictionary");
-var module_dirs = new Array();
-
-function file_get_contents(filename)
-{
- var F = FSO.OpenTextFile(filename, 1);
- var t = F.ReadAll();
- F.Close();
- return t;
-}
-
-function Module_Item(module_name, config_path, dir_line, deps, content)
-{
- this.module_name = module_name;
- this.config_path = config_path;
- this.dir_line = dir_line;
- this.deps = deps;
- this.content = content;
-}
-
-function find_config_w32(dirname)
-{
- if (!FSO.FolderExists(dirname)) {
- return;
- }
-
- var f = FSO.GetFolder(dirname);
- var fc = new Enumerator(f.SubFolders);
- var c, i, ok, n;
- var item = null;
- var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm");
-
- for (; !fc.atEnd(); fc.moveNext())
- {
- ok = true;
- /* check if we already picked up a module with the same dirname;
- * if we have, don't include it here */
- n = FSO.GetFileName(fc.item());
-
- if (n == 'CVS' || n == 'tests')
- continue;
-
- // WScript.StdOut.WriteLine("checking " + dirname + "/" + n);
- if (MODULES.Exists(n)) {
- WScript.StdOut.WriteLine("Skipping " + dirname + "/" + n + " -- already have a module with that name");
- continue;
- }
-
- c = FSO.BuildPath(fc.item(), "config.w32");
- if (FSO.FileExists(c)) {
-// WScript.StdOut.WriteLine(c);
-
- var dir_line = "configure_module_dirname = condense_path(FSO.GetParentFolderName('"
- + c.replace(new RegExp('(["])', "g"), '\\$1') + "'));\r\n";
- var contents = file_get_contents(c);
- var deps = new Array();
-
- // parse out any deps from the file
- var calls = contents.match(re_dep_line);
- if (calls != null) {
-for (i = 0; i < calls.length; i++) {
- // now we need the extension name out of this thing
- if (calls[i].match(re_dep_line)) {
-// WScript.StdOut.WriteLine("n depends on " + RegExp.$1);
- deps[deps.length] = RegExp.$1;
-
- }
-}
- }
-
- item = new Module_Item(n, c, dir_line, deps, contents);
- MODULES.Add(n, item);
- }
- }
-}
-
-// Emit core modules array. This is used by a snapshot
-// build to override a default "yes" value so that external
-// modules don't break the build by becoming statically compiled
-function emit_core_module_list()
-{
- var module_names = (new VBArray(MODULES.Keys())).toArray();
- var i, mod_name, j;
- var item;
- var output = "";
-
- C.WriteLine("core_module_list = new Array(");
-
- // first, look for modules with empty deps; emit those first
- for (i in module_names) {
- mod_name = module_names[i];
- C.WriteLine("\"" + mod_name.replace(/_/g, "-") + "\",");
- }
-
- C.WriteLine("false // dummy");
-
- C.WriteLine(");");
-}
-
-
-function emit_module(item)
-{
- return item.dir_line + item.content;
-}
-
-function emit_dep_modules(module_names)
-{
- var i, mod_name, j;
- var output = "";
- var item = null;
-
- for (i in module_names) {
- mod_name = module_
[PHP-CVS] svn: php/php-src/branches/PHP_5_3/win32/build/
pajoye Mon, 13 Jul 2009 22:02:28 + ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284029 Changed paths: _U php/php-src/branches/PHP_5_3/win32/build/buildconf.js _U php/php-src/branches/PHP_5_3/win32/build/confutils.js _U php/php-src/branches/PHP_5_3/win32/build/projectgen.js _U php/php-src/branches/PHP_5_3/win32/build/svnclean.js Log: - remove app/js mime Property changes on: php/php-src/branches/PHP_5_3/win32/build/buildconf.js ___ Deleted: svn:mime-type - application/javascript Property changes on: php/php-src/branches/PHP_5_3/win32/build/confutils.js ___ Deleted: svn:mime-type - application/javascript Property changes on: php/php-src/branches/PHP_5_3/win32/build/projectgen.js ___ Deleted: svn:mime-type - application/javascript Property changes on: php/php-src/branches/PHP_5_3/win32/build/svnclean.js ___ Deleted: svn:mime-type - application/javascript -- 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/
pajoye Mon, 13 Jul 2009 16:10:59 + ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284018 Changed paths: A php/php-src/branches/PHP_5_3/win32/build/svnclean.js Log: - rename to svn Copied: php/php-src/branches/PHP_5_3/win32/build/svnclean.js (from rev 284012, php/php-src/branches/PHP_5_3/win32/build/cvsclean.js) === (Binary files differ) -- 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/
pajoye Mon, 13 Jul 2009 16:02:34 +
ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=284012
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
U php/php-src/branches/PHP_5_3/win32/build/mkdist.php
Log:
- cvs to svn changes
Modified: php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
===
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/win32/build/mkdist.php
===
--- php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-07-13 16:01:40 UTC
(rev 284011)
+++ php/php-src/branches/PHP_5_3/win32/build/mkdist.php 2009-07-13 16:02:34 UTC
(rev 284012)
@@ -251,7 +251,7 @@
}
/* include a snapshot identifier */
-$branch = "HEAD"; // TODO - determine this from CVS/Entries
+$branch = "HEAD"; // TODO - determine this from SVN branche name
$fp = fopen("$dist_dir/snapshot.txt", "w");
$now = date("r");
$version = phpversion();
@@ -342,7 +342,7 @@
$d = opendir($source);
while (($f = readdir($d)) !== false) {
- if ($f == '.' || $f == '..' || $f == 'CVS' || $f ==
'.cvsignore') {
+ if ($f == '.' || $f == '..' || $f == '.svn') {
continue;
}
$fs = $source . '/' . $f;
@@ -380,7 +380,7 @@
while (FALSE !== ($file = readdir($directory_list))) {
$full_path = $directory . '/' . $file;
- if($file != '.' && $file != '..' && $file != 'CVS' &&
is_dir($full_path)) {
+ if($file != '.' && $file != '..' && $file != '.svn' &&
is_dir($full_path)) {
if ($file == 'tests') {
if (!is_dir($dest . '/' . $full_path)) {
mkdir($dest . '/' . $full_path , 0775,
true);
--
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/
pajoye Mon, 13 Jul 2009 00:26:52 + ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283993 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/buildconf.js Log: - remove ZendEngine* detection, we always have Zend now (svn) Modified: php/php-src/branches/PHP_5_3/win32/build/buildconf.js === (Binary files differ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
