tweak snap build

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 16061724d4a004e63dfe182e401f894626f2f716..507f2cdea7c02a844af8c91164d07c756bc13473 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -82,8 +82,8 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0 run-t
 
 build-snap:
        @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
-       for %T in ($(SAPI_TARGETS)) do $(MAKE) /nologo "%T"
-       for %T in ($(EXT_TARGETS)) do $(MAKE) /nologo "%T"
+       for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
+       for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
 
 build-dist: $(BUILD_DIR)\deplister.exe
        -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 64952591d6fef8891a53ab0944913dd3270bed31..7e8e28e2e79a553e70f33b85412b57032aea49a3 100644 (file)
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -13,10 +13,8 @@ echo "Making dist for $build_dir\n";
 
 $dist_dir = $build_dir . "/php-" . phpversion();
 @mkdir($dist_dir);
-@mkdir("$dist_dir/sapi");
 @mkdir("$dist_dir/ext");
 @mkdir("$dist_dir/dev");
-@mkdir("$dist_dir/dlls");
 @mkdir("$dist_dir/extras");
 
 /* figure out additional DLL's that are required */
@@ -117,7 +115,7 @@ function copy_file_list($source_dir, $dest_dir, $list)
 function copy_text_file($source, $dest)
 {
        $text = file_get_contents($source);
-       $text = str_replace("\n", "\r\n", $text);
+       $text = preg_replace("/[^\r]\n$/", "\r\n", $text);
        $fp = fopen($dest, "w");
        fwrite($fp, $text);
        fclose($fp);
@@ -136,7 +134,7 @@ if ($is_debug) {
        copy("$build_dir/$phppdb", "$dist_dir/dev/$phppdb");
 }
 /* copy the sapi */
-copy_file_list($build_dir, "$dist_dir/sapi", $sapi_targets);
+copy_file_list($build_dir, "$dist_dir", $sapi_targets);
 
 /* copy the extensions */
 copy_file_list($build_dir, "$dist_dir/ext", $ext_targets);
@@ -210,7 +208,7 @@ foreach ($extra_dll_deps as $dll) {
                }
                $dll = $tdll;
        }
-       copy($dll, "$dist_dir/dlls/" . basename($dll));
+       copy($dll, "$dist_dir/" . basename($dll));
 }
 
 function copy_dir($source, $dest)