kalle Mon Mar 30 14:32:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build Makefile mkdist.php
Log:
MFH:
* Bypass the date/timezone warning by forcing UTC when running mkdist.php
* Don't run the copy list for PECL if theres no PECL extensions to copy
(fixes a few copy() warnings)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.10&r2=1.35.2.1.2.6.2.11&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.10
php-src/win32/build/Makefile:1.35.2.1.2.6.2.11
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.10 Fri Nov 21 14:18:27 2008
+++ php-src/win32/build/Makefile Mon Mar 30 14:32:52 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <w...@thebrainroom.com> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.10 2008/11/21 14:18:27 pajoye Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.11 2009/03/30 14:32:52 kalle Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -131,7 +131,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 -n 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 win32/build/mkdist.php
"$(BUILD_DIR)" "$(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 ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.8&r2=1.13.4.1.2.9&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.8
php-src/win32/build/mkdist.php:1.13.4.1.2.9
--- php-src/win32/build/mkdist.php:1.13.4.1.2.8 Tue Mar 24 22:15:46 2009
+++ php-src/win32/build/mkdist.php Mon Mar 30 14:32:52 2009
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.13.4.1.2.8 2009/03/24 22:15:46 pajoye Exp $
+<?php # $Id: mkdist.php,v 1.13.4.1.2.9 2009/03/30 14:32:52 kalle Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -214,7 +214,9 @@
copy_file_list($build_dir, "$dist_dir/ext", $ext_targets);
/* pecl sapi and extensions */
-copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+if(sizeof($pecl_targets)) {
+ copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+}
/* populate reading material */
$text_files = array(
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
