tweak snap build

This commit is contained in:
Wez Furlong 2004-01-07 23:11:54 +00:00
parent 86f7fad719
commit f5e4590fd5
2 changed files with 5 additions and 7 deletions

View file

@ -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)

View file

@ -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)