diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 01:37:05 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 01:37:05 +0000 |
| commit | fb88e8e8c35d16b5cac675cee306dbb8d72e77d4 (patch) | |
| tree | ac149e3acd867509f98f25e4b0f3d1c7578896cb /win32 | |
| parent | 2e134996b0660b54abb31af0371fbdee2c3f65cf (diff) | |
| download | php-git-fb88e8e8c35d16b5cac675cee306dbb8d72e77d4.tar.gz | |
* Fix deprecation warning when building deplister
* Fix some mkdir warnings if "nmake build-dist" is executed twice
Diffstat (limited to 'win32')
| -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 69442fe1cb..d13f330668 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -146,7 +146,7 @@ dist: all build-dist 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)" diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index eebb66cf71..5d4f215ce3 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -382,7 +382,9 @@ function copy_test_dir($directory, $dest) $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 { |