kalle Tue Jun 23 01:37:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build Makefile mkdist.php
Log:
MFH:
* Fix deprecation warning when building deplister
* Fix some mkdir warnings if "nmake build-dist" is executed twice
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.13&r2=1.35.2.1.2.6.2.14&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.13
php-src/win32/build/Makefile:1.35.2.1.2.6.2.14
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.13 Thu Jun 11 14:39:37 2009
+++ php-src/win32/build/Makefile Tue Jun 23 01:37:23 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[email protected]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.13 2009/06/11 14:39:37 cellog Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.14 2009/06/23 01:37:23 kalle Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -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) -o$(BUILD_DIR)\deplister.exe win32\build\deplister.c
imagehlp.lib
+ $(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)"
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.12&r2=1.13.4.1.2.13&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.12
php-src/win32/build/mkdist.php:1.13.4.1.2.13
--- php-src/win32/build/mkdist.php:1.13.4.1.2.12 Thu Jun 11 14:39:37 2009
+++ php-src/win32/build/mkdist.php Tue Jun 23 01:37:23 2009
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.13.4.1.2.12 2009/06/11 14:39:37 cellog Exp $
+<?php # $Id: mkdist.php,v 1.13.4.1.2.13 2009/06/23 01:37:23 kalle Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -381,7 +381,9 @@
$full_path = $directory . '/' . $file;
if($file != '.' && $file != '..' && $file != 'CVS' &&
is_dir($full_path)) {
if ($file == 'tests') {
- mkdir($dest . '/' . $full_path , 0775, true);
+ if (!is_dir($dest . '/' . $full_path)) {
+ mkdir($dest . '/' . $full_path , 0775,
true);
+ }
copy_dir($full_path, $dest . '/' . $full_path .
'/');
continue;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
