svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile
| From: | Pierre Joye | Date: | Sun, 02 Jan 2011 18:13:20 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64240@lists.php.net to get a copy of this message | ||
pajoye Sun, 02 Jan 2011 18:13:20 +0000
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