diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 01:37:23 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 01:37:23 +0000 |
| commit | 1f5e20c33ef5c2e83779566fb4699929b91c98a5 (patch) | |
| tree | 9e88e22fd90fc73b6abcbda761b7bc5033b0fef7 /win32 | |
| parent | a1c1dd6ba15806ebcd60557c3d8ded71492a3e39 (diff) | |
| download | php-git-1f5e20c33ef5c2e83779566fb4699929b91c98a5.tar.gz | |
MFH:
* 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 6a795f9b64..c92028dd85 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -381,7 +381,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 { |