kalle           Wed Apr  1 09:21:31 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/win32/build        mkdist.php 
  Log:
  MFH:
  Fixed a few warnings from copy():
  * If $item is empty then skip to next entry, this fixes the "The first 
argument cannot be a directory" warnings
  * If file does not exist then dont try to copy it
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.9&r2=1.13.4.1.2.10&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.9 
php-src/win32/build/mkdist.php:1.13.4.1.2.10
--- php-src/win32/build/mkdist.php:1.13.4.1.2.9 Mon Mar 30 14:32:52 2009
+++ php-src/win32/build/mkdist.php      Wed Apr  1 09:21:31 2009
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.13.4.1.2.9 2009/03/30 14:32:52 kalle Exp $
+<?php # $Id: mkdist.php,v 1.13.4.1.2.10 2009/04/01 09:21:31 kalle Exp $
 /* piece together a windows binary distro */
 
 $build_dir = $argv[1];
@@ -112,6 +112,13 @@
        global $is_debug, $dist_dir;
 
        foreach ($list as $item) {
+               if (empty($item)) {
+                       continue;
+               } elseif (!is_file($source_dir . DIRECTORY_SEPARATOR . $item)) {
+                       echo "WARNING: $item not found\n";
+                       continue;
+               }
+
                echo "Copying $item from $source_dir to $dest_dir\n";
                copy($source_dir . DIRECTORY_SEPARATOR . $item, $dest_dir . 
DIRECTORY_SEPARATOR . $item);
                if ($is_debug) {



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

Reply via email to