diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | run-tests.php | 2 | ||||
| -rw-r--r-- | win32/build/Makefile | 5 | ||||
| -rw-r--r-- | win32/build/fakemail.c | 40 | ||||
| -rw-r--r-- | win32/build/mkdist.php | 1 |
5 files changed, 2 insertions, 48 deletions
diff --git a/.gitignore b/.gitignore index 39f001a67e..587f4abc42 100644 --- a/.gitignore +++ b/.gitignore @@ -213,8 +213,6 @@ php /main/config.w32.h /win32/build/deplister.exe /win32/build/deplister.obj -/win32/build/fakemail.exe -/win32/build/fakemail.obj /win32/*.aps /win32/*.positions /win32/*.suo diff --git a/run-tests.php b/run-tests.php index 8ea737e1e4..1a1d2e9c53 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2110,7 +2110,7 @@ TEST $file $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); $section_text['INI'] = str_replace('{TMP}', sys_get_temp_dir(), $section_text['INI']); if (PHP_OS_FAMILY === 'Windows') { - $replacement = 'fakemail $1'; + $replacement = '"' . PHP_BINARY . ' -r \"while ($in = fgets(STDIN)) echo $in;\" > $1"'; } else { $replacement = 'tee $1 >/dev/null'; } diff --git a/win32/build/Makefile b/win32/build/Makefile index 6df5b966e3..a6b54c07ff 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -203,7 +203,7 @@ build-snap: set-tmp-env generated_files -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T" -for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T" -build-dist: $(BUILD_DIR)\deplister.exe $(BUILD_DIR)\fakemail.exe +build-dist: $(BUILD_DIR)\deplister.exe -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) -del /f /q $(BUILD_DIR)\$(DIST_ZIP_SNAP) @@ -227,9 +227,6 @@ snap: build-snap build-devel build-dist $(BUILD_DIR)\deplister.exe: win32\build\deplister.c $(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib -$(BUILD_DIR)\fakemail.exe: win32\build\fakemail.c - $(CC) /nologo /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\fakemail.exe win32\build\fakemail.c - install: really-install install-sdk build-lib: build-ext-libs diff --git a/win32/build/fakemail.c b/win32/build/fakemail.c deleted file mode 100644 index 6a24c47b80..0000000000 --- a/win32/build/fakemail.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Christoph M. Becker <cmb@php.net> | - +----------------------------------------------------------------------+ -*/ - -/* This program can be used as sendmail replacement to write the email contents - to a file, which is mainly useful for email related tests on Windows. - Usage: fakemail <path> */ - -#include <stdio.h> - -int main(int argc, char *argv[]) -{ - FILE *out; - char c; - - if (argc != 2) { - return 1; - } - if (!(out = fopen(argv[1], "w"))) { - return 1; - } - while ((c = getchar()) != EOF) { - putc(c, out); - } - fclose(out); - - return 0; -} diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 0995c8f7cf..f4155308af 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -497,7 +497,6 @@ foreach ($dirs as $dir) { copy_test_dir($dir, $test_dir); } copy('run-tests.php', $test_dir . '/run-test.php'); -copy($build_dir . '/fakemail.exe', $test_dir . '/fakemail.exe'); /* change this next line to true to use good-old * hand-assembled go-pear-bundle from the snapshot template */ |