diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-03-30 14:32:52 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-03-30 14:32:52 +0000 |
| commit | 02fe66d1e04a0ef6abcd30033f95aac3c132c6be (patch) | |
| tree | 2c0a41a75f8a5a32668cf27d54afae8cd6e3b09a | |
| parent | f4d5a55a907a1216d9a379a3818006f9219a405d (diff) | |
| download | php-git-02fe66d1e04a0ef6abcd30033f95aac3c132c6be.tar.gz | |
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)
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/mkdist.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index fd8ff43b8a..580c97f5d4 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -131,7 +131,7 @@ build-dist: $(BUILD_DIR)\deplister.exe -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 ..\.. diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 067c25dba7..bb98e20ed0 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -214,7 +214,9 @@ copy_file_list($build_dir, "$dist_dir", $sapi_targets); 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( |