diff options
| author | Edin Kadribasic <edink@php.net> | 2005-02-26 01:07:48 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2005-02-26 01:07:48 +0000 |
| commit | b8a6661c81c7730705be8afbc2538c09ad48ea25 (patch) | |
| tree | a9b08d2c07b2ecba6326a97c0424b84a00e3b650 | |
| parent | 74dba529336f254b50b0548163fcced1c4b0d707 (diff) | |
| download | php-git-b8a6661c81c7730705be8afbc2538c09ad48ea25.tar.gz | |
Allow arbitrary files to be added to distro with ADD_DIST_FILE(filename)
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 77ea3c3a02..20d81693ef 100644 --- 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 8733a48c62..2ef0aae820 100644 --- 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; |