Allow arbitrary files to be added to distro with ADD_DIST_FILE(filename)

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 77ea3c3a0227ddf60db01cbd20d62a64ff5e5089..20d81693efee05924c5c07045e74e123638d62a3 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -109,7 +109,7 @@ build-dist: $(BUILD_DIR)\deplister.exe
        -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 ..\..

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 8733a48c62ecaaf10c12a7ac587880a776fb4efa..2ef0aae8201d18d34c7ba514408c9d59475988c1 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.54 2005-02-13 21:38:39 wez Exp $
+// $Id: confutils.js,v 1.55 2005-02-26 01:07:48 edink Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -917,6 +917,15 @@ function SAPI(sapiname, file_list, makefiletarget, cflags)
        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;