kalle           Tue Jun 23 01:37:05 2009 UTC

  Modified files:              
    /php-src/win32/build        Makefile mkdist.php 
  Log:
  * 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.55&r2=1.56&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.55 php-src/win32/build/Makefile:1.56
--- php-src/win32/build/Makefile:1.55   Thu Jun 11 14:43:03 2009
+++ php-src/win32/build/Makefile        Tue Jun 23 01:37:05 2009
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <w...@thebrainroom.com>                           |
 #  +----------------------------------------------------------------------+
 #
-# $Id: Makefile,v 1.55 2009/06/11 14:43:03 cellog Exp $
+# $Id: Makefile,v 1.56 2009/06/23 01:37:05 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.25&r2=1.26&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.25 php-src/win32/build/mkdist.php:1.26
--- php-src/win32/build/mkdist.php:1.25 Thu Jun 11 14:43:03 2009
+++ php-src/win32/build/mkdist.php      Tue Jun 23 01:37:05 2009
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.25 2009/06/11 14:43:03 cellog Exp $
+<?php # $Id: mkdist.php,v 1.26 2009/06/23 01:37:05 kalle Exp $
 /* piece together a windows binary distro */
 
 $build_dir = $argv[1];
@@ -382,7 +382,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

Reply via email to