wez Wed Jan 7 18:12:04 2004 EDT
Modified files:
/php-src/win32/build Makefile mkdist.php
Log:
tweak snap build
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.12 php-src/win32/build/Makefile:1.13
--- php-src/win32/build/Makefile:1.12 Tue Dec 23 10:33:13 2003
+++ php-src/win32/build/Makefile Wed Jan 7 18:11:54 2004
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.12 2003/12/23 15:33:13 wez Exp $
+# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -82,8 +82,8 @@
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)
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.5 php-src/win32/build/mkdist.php:1.6
--- php-src/win32/build/mkdist.php:1.5 Tue Dec 23 10:33:13 2003
+++ php-src/win32/build/mkdist.php Wed Jan 7 18:11:54 2004
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.5 2003/12/23 15:33:13 wez Exp $
+<?php # $Id: mkdist.php,v 1.6 2004/01/07 23:11:54 wez Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -13,10 +13,8 @@
$dist_dir = $build_dir . "/php-" . phpversion();
@mkdir($dist_dir);
[EMAIL PROTECTED]("$dist_dir/sapi");
@mkdir("$dist_dir/ext");
@mkdir("$dist_dir/dev");
[EMAIL PROTECTED]("$dist_dir/dlls");
@mkdir("$dist_dir/extras");
/* figure out additional DLL's that are required */
@@ -117,7 +115,7 @@
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 @@
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 @@
}
$dll = $tdll;
}
- copy($dll, "$dist_dir/dlls/" . basename($dll));
+ copy($dll, "$dist_dir/" . basename($dll));
}
function copy_dir($source, $dest)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
