edink Fri Feb 25 20:10:50 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/win32/build Makefile confutils.js
Log:
MFH: Allow arbitrary files to be added to distro with ADD_DIST_FILE(filename)
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.3&r2=1.23.2.4&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.23.2.3
php-src/win32/build/Makefile:1.23.2.4
--- php-src/win32/build/Makefile:1.23.2.3 Fri Feb 25 18:00:17 2005
+++ php-src/win32/build/Makefile Fri Feb 25 20:10:50 2005
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.23.2.3 2005/02/25 23:00:17 edink Exp $
+# $Id: Makefile,v 1.23.2.4 2005/02/26 01:10:50 edink Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -98,7 +98,7 @@
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
- $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
"$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)"
"$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42.2.2&r2=1.42.2.3&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.42.2.2
php-src/win32/build/confutils.js:1.42.2.3
--- php-src/win32/build/confutils.js:1.42.2.2 Sun Feb 13 16:40:28 2005
+++ php-src/win32/build/confutils.js Fri Feb 25 20:10:50 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.42.2.2 2005/02/13 21:40:28 wez Exp $
+// $Id: confutils.js,v 1.42.2.3 2005/02/26 01:10:50 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -917,6 +917,15 @@
MFO.WriteBlankLines(1);
}
+function ADD_DIST_FILE(filename)
+{
+ if (configure_module_dirname.match("pecl")) {
+ ADD_FLAG("PECL_EXTRA_DIST_FILES", filename);
+ } else {
+ ADD_FLAG("PHP_EXTRA_DIST_FILES", filename);
+ }
+}
+
function file_get_contents(filename)
{
var f, c;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
