cvs: php-src(PHP_5_0) /win32/build Makefile buildconf.js config.w32 config.w32.h.in confutils.js mkdist.php template.rc wsyslog.mc
| From: | Wez Furlong | Date: | Fri, 22 Jul 2005 18:09:38 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /win32/build Makefile buildconf.js config.w32 config.w32.h.in confutils.js mkdist.php template.rc wsyslog.mc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33032@lists.php.net to get a copy of this message | ||
wez Fri Jul 22 14:09:38 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/win32/build wsyslog.mc
Modified files:
/php-src/win32/build Makefile buildconf.js config.w32
config.w32.h.in confutils.js mkdist.php
template.rc
Log:
merge build changes from HEAD, so that 5.0 builds on systems with recent cygwin
distros.
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.4&r2=1.23.2.5&ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.23.2.4 php-src/win32/build/Makefile:1.23.2.5 --- php-src/win32/build/Makefile:1.23.2.4 Fri Feb 25 20:10:50 2005 +++ php-src/win32/build/Makefile Fri Jul 22 14:09:32 2005 @@ -14,19 +14,23 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.23.2.4 2005/02/26 01:10:50 edink Exp $ +# $Id: Makefile,v 1.23.2.5 2005/07/22 18:09:32 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" LD="$(LINK)" +MC="$(MC)" -all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) +MCFILE=$(BUILD_DIR)\wsyslog.rc -generated_files: Zend\zend_ini_parser.c \ +all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) + +build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) + +generated_files: build_dirs Zend\zend_ini_parser.c \ Zend\zend_language_parser.c Zend\zend_ini_scanner.c \ Zend\zend_language_scanner.c \ - ext\standard\parsedate.c \ - $(PHPDEF) + $(PHPDEF) $(MCFILE) $(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES) type $(PHP_DLL_DEF_SOURCES) > $(BUILD_DIR)\$(PHPDLL).def @@ -43,18 +47,21 @@ Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l $(FLEX) -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c Zend/zend_language_scanner.l -ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y - $(BISON) --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y - PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res +$(MCFILE): win32\build\wsyslog.mc + $(MC) -h win32\ -r $(BUILD_DIR)\ -x $(BUILD_DIR)\ win32\build\wsyslog.mc + +# $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc + $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \ /d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" \ - win32\build\template.rc + /I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \ + win32\build\template.rc -$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) - $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) +$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE) + @$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL) @@ -86,7 +93,7 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0 run-tests.php $(TESTS) <<NOKEEP -build-snap: +build-snap: generated_files @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)" -for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T" -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T" @@ -118,8 +125,16 @@ msi-installer: dist $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" -install: all +# need to redirect, since INSTALL is a file in the root... +install: really-install + +really-install: @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) + @echo Installing files under $(PHP_PREFIX) @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >nul - + @echo Registering event source with syslog (requires admin rights) + @echo It's okay for this step to fail: + -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL) + + http://cvs.php.net/diff.php/php-src/win32/build/buildconf.js?r1=1.11&r2=1.11.2.1&ty=u Index: php-src/win32/build/buildconf.js diff -u php-src/win32/build/buildconf.js:1.11 php-src/win32/build/buildconf.js:1.11.2.1 --- php-src/win32/build/buildconf.js:1.11 Thu Feb 12 07:30:41 2004 +++ php-src/win32/build/buildconf.js Fri Jul 22 14:09:33 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: buildconf.js,v 1.11 2004/02/12 12:30:41 wez Exp $ */ +/* $Id: buildconf.js,v 1.11.2.1 2005/07/22 18:09:33 wez Exp $ */ // This generates a configure script for win32 build WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -209,7 +209,11 @@ calls = modules.match(re); for (i = 0; i < calls.length; i++) { item = calls[i]; + C.WriteLine("try {"); C.WriteLine(item); + C.WriteLine("} catch (e) {"); + C.WriteLine('\tSTDOUT.WriteLine("problem: " + e);'); + C.WriteLine("}"); } C.WriteBlankLines(1); http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.26.2.8&r2=1.26.2.9&ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.26.2.8 php-src/win32/build/config.w32:1.26.2.9 --- php-src/win32/build/config.w32:1.26.2.8 Fri Feb 25 18:00:17 2005 +++ php-src/win32/build/config.w32 Fri Jul 22 14:09:33 2005 @@ -1,22 +1,42 @@ // vim:ft=javascript -// $Id: config.w32,v 1.26.2.8 2005/02/25 23:00:17 edink Exp $ +// $Id: config.w32,v 1.26.2.9 2005/07/22 18:09:33 wez Exp $ // "Master" config file; think of it as a configure.in // equivalent. ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin'); - PATH_PROG('cl'); -PATH_PROG('link'); + +// cygwin now ships with link.exe. Avoid searching the cygwin path +// for this, as we want the MS linker, not the fileutil +PATH_PROG('link', WshShell.Environment("Process").Item("PATH")); + PATH_PROG('nmake'); + // we don't want to define LIB, as that will override the default library path // that is set in that env var PATH_PROG('lib', null, 'MAKE_LIB'); -PATH_PROG('bison'); -PATH_PROG('flex'); +if (!PATH_PROG('bison')) { + ERROR('bison is required') +} +if (!PATH_PROG('flex')) { + ERROR('flex is required') +} PATH_PROG('re2c'); PATH_PROG('zip'); PATH_PROG('lemon'); +// avoid picking up midnight commander from cygwin +PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); + +// stick objects somewhere outside of the source tree +ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during build', ''); +if (PHP_OBJECT_OUT_DIR.length) { + if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) { + ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' does not exist'); + } + PHP_OBJECT_OUT_DIR += '\\'; +} + ARG_ENABLE('debug', 'Compile with debugging symbols', "no"); ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols (--enable-debug must not be specified)', 'no'); if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") { @@ -87,19 +107,19 @@ // set up the build dir and DLL name if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Debug_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS"); DEFINE("PHPDLL", "php5ts_debug.dll"); DEFINE("PHPLIB", "php5ts_debug.lib"); } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Debug"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug"); DEFINE("PHPDLL", "php5_debug.dll"); DEFINE("PHPLIB", "php5_debug.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Release_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS"); DEFINE("PHPDLL", "php5ts.dll"); DEFINE("PHPLIB", "php5ts.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Release"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release"); DEFINE("PHPDLL", "php5.dll"); DEFINE("PHPLIB", "php5.lib"); } @@ -228,9 +248,11 @@ ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE)); ARG_ENABLE("memory-limit", "Enable memory limit checking code", "no"); - AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == "yes" ? 1 : 0); +ARG_ENABLE("memory-manager", "Enable Zend memory manager", "yes"); +AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == "yes" ? 1 : 0); + ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no"); if (PHP_ZEND_MULTIBYTE == "yes") { STDOUT.WriteLine("Enabling Zend multibyte encoding support"); http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.5 php-src/win32/build/config.w32.h.in:1.5.2.1 --- php-src/win32/build/config.w32.h.in:1.5 Wed Apr 28 20:17:09 2004 +++ php-src/win32/build/config.w32.h.in Fri Jul 22 14:09:33 2005 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.5 2004/04/29 00:17:09 wez Exp $ + $Id: config.w32.h.in,v 1.5.2.1 2005/07/22 18:09:33 wez Exp $ */ /* Default PHP / PEAR directories */ http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42.2.3&r2=1.42.2.4&ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.42.2.3 php-src/win32/build/confutils.js:1.42.2.4 --- php-src/win32/build/confutils.js:1.42.2.3 Fri Feb 25 20:10:50 2005 +++ php-src/win32/build/confutils.js Fri Jul 22 14:09:33 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.42.2.3 2005/02/26 01:10:50 edink Exp $ +// $Id: confutils.js,v 1.42.2.4 2005/07/22 18:09:33 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -350,7 +350,7 @@ 'php-build', 'snapshot-template', 'pcre-regex', 'fastcgi', 'force-cgi-redirect', 'path-info-check', 'zts', 'ipv6', 'memory-limit', - 'zend-multibyte' + 'zend-multibyte', 'fd-setsize', 'memory-manager' ); var force; @@ -815,10 +815,15 @@ sym = header_name.toUpperCase(); sym = sym.replace(new RegExp("[\\\\/\.-]", "g"), "_"); + if (typeof(add_to_flag_only) == "undefined" && + flag_name.match(new RegExp("^CFLAGS_(.*)$"))) { + add_to_flag_only = true; + } + if (typeof(add_to_flag_only) != "undefined") { ADD_FLAG(flag_name, "/DHAVE_" + sym + "=" + have); } else { - AC_DEFINE("HAVE_" + sym, have); + AC_DEFINE("HAVE_" + sym, have, "have the " + header_name + " header file"); } return p; @@ -871,7 +876,7 @@ var SAPI = sapiname.toUpperCase(); var ldflags; var resname; - var ld = "$(LD)"; + var ld = "@$(LD)"; STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname); @@ -1020,7 +1025,7 @@ var libname = dllname.substring(0, dllname.length-4) + ".lib"; var resname = generate_version_info_resource(dllname, configure_module_dirname); - var ld = "$(LD)"; + var ld = "@$(LD)"; MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" + libname + ": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname); MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname); @@ -1140,7 +1145,7 @@ } } else { MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + src); - MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj); + MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj); } } http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.10.2.1&r2=1.10.2.2&ty=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.10.2.1 php-src/win32/build/mkdist.php:1.10.2.2 --- php-src/win32/build/mkdist.php:1.10.2.1 Fri Feb 25 19:38:27 2005 +++ php-src/win32/build/mkdist.php Fri Jul 22 14:09:33 2005 @@ -1,4 +1,4 @@ -<?php # $Id: mkdist.php,v 1.10.2.1 2005/02/26 00:38:27 edink Exp $ +<?php # $Id: mkdist.php,v 1.10.2.2 2005/07/22 18:09:33 wez Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; http://cvs.php.net/diff.php/php-src/win32/build/template.rc?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.5 php-src/win32/build/template.rc:1.5.2.1 --- php-src/win32/build/template.rc:1.5 Thu Jan 8 05:58:27 2004 +++ php-src/win32/build/template.rc Fri Jul 22 14:09:34 2005 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.5 2004/01/08 10:58:27 wez Exp $ + * $Id: template.rc,v 1.5.2.1 2005/07/22 18:09:34 wez Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC @@ -62,3 +62,8 @@ VALUE "Translation", 0x409, 1200 END END + +#ifdef MC_INCLUDE +#include MC_INCLUDE +#endif + http://cvs.php.net/co.php/php-src/win32/build/wsyslog.mc?r=1.1&p=1 Index: php-src/win32/build/wsyslog.mc +++ php-src/win32/build/wsyslog.mc MessageId=1 Severity=Success SymbolicName=PHP_SYSLOG_SUCCESS_TYPE Language=English %1 %2.. MessageId=2 Severity=Informational SymbolicName=PHP_SYSLOG_INFO_TYPE Language=English %1 %2.. MessageId=3 Severity=Warning SymbolicName=PHP_SYSLOG_WARNING_TYPE Language=English %1 %2.. MessageId=4 Severity=Error SymbolicName=PHP_SYSLOG_ERROR_TYPE Language=English %1 %2..
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.4&r2=1.23.2.5&ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.23.2.4 php-src/win32/build/Makefile:1.23.2.5 --- php-src/win32/build/Makefile:1.23.2.4 Fri Feb 25 20:10:50 2005 +++ php-src/win32/build/Makefile Fri Jul 22 14:09:32 2005 @@ -14,19 +14,23 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.23.2.4 2005/02/26 01:10:50 edink Exp $ +# $Id: Makefile,v 1.23.2.5 2005/07/22 18:09:32 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" LD="$(LINK)" +MC="$(MC)" -all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) +MCFILE=$(BUILD_DIR)\wsyslog.rc -generated_files: Zend\zend_ini_parser.c \ +all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) + +build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) + +generated_files: build_dirs Zend\zend_ini_parser.c \ Zend\zend_language_parser.c Zend\zend_ini_scanner.c \ Zend\zend_language_scanner.c \ - ext\standard\parsedate.c \ - $(PHPDEF) + $(PHPDEF) $(MCFILE) $(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES) type $(PHP_DLL_DEF_SOURCES) > $(BUILD_DIR)\$(PHPDLL).def @@ -43,18 +47,21 @@ Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l $(FLEX) -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c Zend/zend_language_scanner.l -ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y - $(BISON) --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y - PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res +$(MCFILE): win32\build\wsyslog.mc + $(MC) -h win32\ -r $(BUILD_DIR)\ -x $(BUILD_DIR)\ win32\build\wsyslog.mc + +# $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc + $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \ /d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" \ - win32\build\template.rc + /I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \ + win32\build\template.rc -$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) - $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) +$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE) + @$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL) @@ -86,7 +93,7 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0 run-tests.php $(TESTS) <<NOKEEP -build-snap: +build-snap: generated_files @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)" -for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T" -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T" @@ -118,8 +125,16 @@ msi-installer: dist $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" -install: all +# need to redirect, since INSTALL is a file in the root... +install: really-install + +really-install: @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) + @echo Installing files under $(PHP_PREFIX) @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >nul - + @echo Registering event source with syslog (requires admin rights) + @echo It's okay for this step to fail: + -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL) + + http://cvs.php.net/diff.php/php-src/win32/build/buildconf.js?r1=1.11&r2=1.11.2.1&ty=u Index: php-src/win32/build/buildconf.js diff -u php-src/win32/build/buildconf.js:1.11 php-src/win32/build/buildconf.js:1.11.2.1 --- php-src/win32/build/buildconf.js:1.11 Thu Feb 12 07:30:41 2004 +++ php-src/win32/build/buildconf.js Fri Jul 22 14:09:33 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: buildconf.js,v 1.11 2004/02/12 12:30:41 wez Exp $ */ +/* $Id: buildconf.js,v 1.11.2.1 2005/07/22 18:09:33 wez Exp $ */ // This generates a configure script for win32 build WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -209,7 +209,11 @@ calls = modules.match(re); for (i = 0; i < calls.length; i++) { item = calls[i]; + C.WriteLine("try {"); C.WriteLine(item); + C.WriteLine("} catch (e) {"); + C.WriteLine('\tSTDOUT.WriteLine("problem: " + e);'); + C.WriteLine("}"); } C.WriteBlankLines(1); http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.26.2.8&r2=1.26.2.9&ty=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.26.2.8 php-src/win32/build/config.w32:1.26.2.9 --- php-src/win32/build/config.w32:1.26.2.8 Fri Feb 25 18:00:17 2005 +++ php-src/win32/build/config.w32 Fri Jul 22 14:09:33 2005 @@ -1,22 +1,42 @@ // vim:ft=javascript -// $Id: config.w32,v 1.26.2.8 2005/02/25 23:00:17 edink Exp $ +// $Id: config.w32,v 1.26.2.9 2005/07/22 18:09:33 wez Exp $ // "Master" config file; think of it as a configure.in // equivalent. ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin'); - PATH_PROG('cl'); -PATH_PROG('link'); + +// cygwin now ships with link.exe. Avoid searching the cygwin path +// for this, as we want the MS linker, not the fileutil +PATH_PROG('link', WshShell.Environment("Process").Item("PATH")); + PATH_PROG('nmake'); + // we don't want to define LIB, as that will override the default library path // that is set in that env var PATH_PROG('lib', null, 'MAKE_LIB'); -PATH_PROG('bison'); -PATH_PROG('flex'); +if (!PATH_PROG('bison')) { + ERROR('bison is required') +} +if (!PATH_PROG('flex')) { + ERROR('flex is required') +} PATH_PROG('re2c'); PATH_PROG('zip'); PATH_PROG('lemon'); +// avoid picking up midnight commander from cygwin +PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); + +// stick objects somewhere outside of the source tree +ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during build', ''); +if (PHP_OBJECT_OUT_DIR.length) { + if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) { + ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' does not exist'); + } + PHP_OBJECT_OUT_DIR += '\\'; +} + ARG_ENABLE('debug', 'Compile with debugging symbols', "no"); ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols (--enable-debug must not be specified)', 'no'); if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") { @@ -87,19 +107,19 @@ // set up the build dir and DLL name if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Debug_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS"); DEFINE("PHPDLL", "php5ts_debug.dll"); DEFINE("PHPLIB", "php5ts_debug.lib"); } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Debug"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug"); DEFINE("PHPDLL", "php5_debug.dll"); DEFINE("PHPLIB", "php5_debug.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Release_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS"); DEFINE("PHPDLL", "php5ts.dll"); DEFINE("PHPLIB", "php5ts.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Release"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release"); DEFINE("PHPDLL", "php5.dll"); DEFINE("PHPLIB", "php5.lib"); } @@ -228,9 +248,11 @@ ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE)); ARG_ENABLE("memory-limit", "Enable memory limit checking code", "no"); - AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == "yes" ? 1 : 0); +ARG_ENABLE("memory-manager", "Enable Zend memory manager", "yes"); +AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == "yes" ? 1 : 0); + ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no"); if (PHP_ZEND_MULTIBYTE == "yes") { STDOUT.WriteLine("Enabling Zend multibyte encoding support"); http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.5 php-src/win32/build/config.w32.h.in:1.5.2.1 --- php-src/win32/build/config.w32.h.in:1.5 Wed Apr 28 20:17:09 2004 +++ php-src/win32/build/config.w32.h.in Fri Jul 22 14:09:33 2005 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.5 2004/04/29 00:17:09 wez Exp $ + $Id: config.w32.h.in,v 1.5.2.1 2005/07/22 18:09:33 wez Exp $ */ /* Default PHP / PEAR directories */ http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42.2.3&r2=1.42.2.4&ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.42.2.3 php-src/win32/build/confutils.js:1.42.2.4 --- php-src/win32/build/confutils.js:1.42.2.3 Fri Feb 25 20:10:50 2005 +++ php-src/win32/build/confutils.js Fri Jul 22 14:09:33 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.42.2.3 2005/02/26 01:10:50 edink Exp $ +// $Id: confutils.js,v 1.42.2.4 2005/07/22 18:09:33 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -350,7 +350,7 @@ 'php-build', 'snapshot-template', 'pcre-regex', 'fastcgi', 'force-cgi-redirect', 'path-info-check', 'zts', 'ipv6', 'memory-limit', - 'zend-multibyte' + 'zend-multibyte', 'fd-setsize', 'memory-manager' ); var force; @@ -815,10 +815,15 @@ sym = header_name.toUpperCase(); sym = sym.replace(new RegExp("[\\\\/\.-]", "g"), "_"); + if (typeof(add_to_flag_only) == "undefined" && + flag_name.match(new RegExp("^CFLAGS_(.*)$"))) { + add_to_flag_only = true; + } + if (typeof(add_to_flag_only) != "undefined") { ADD_FLAG(flag_name, "/DHAVE_" + sym + "=" + have); } else { - AC_DEFINE("HAVE_" + sym, have); + AC_DEFINE("HAVE_" + sym, have, "have the " + header_name + " header file"); } return p; @@ -871,7 +876,7 @@ var SAPI = sapiname.toUpperCase(); var ldflags; var resname; - var ld = "$(LD)"; + var ld = "@$(LD)"; STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname); @@ -1020,7 +1025,7 @@ var libname = dllname.substring(0, dllname.length-4) + ".lib"; var resname = generate_version_info_resource(dllname, configure_module_dirname); - var ld = "$(LD)"; + var ld = "@$(LD)"; MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" + libname + ": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname); MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname); @@ -1140,7 +1145,7 @@ } } else { MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + src); - MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj); + MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj); } } http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.10.2.1&r2=1.10.2.2&ty=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.10.2.1 php-src/win32/build/mkdist.php:1.10.2.2 --- php-src/win32/build/mkdist.php:1.10.2.1 Fri Feb 25 19:38:27 2005 +++ php-src/win32/build/mkdist.php Fri Jul 22 14:09:33 2005 @@ -1,4 +1,4 @@ -<?php # $Id: mkdist.php,v 1.10.2.1 2005/02/26 00:38:27 edink Exp $ +<?php # $Id: mkdist.php,v 1.10.2.2 2005/07/22 18:09:33 wez Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; http://cvs.php.net/diff.php/php-src/win32/build/template.rc?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.5 php-src/win32/build/template.rc:1.5.2.1 --- php-src/win32/build/template.rc:1.5 Thu Jan 8 05:58:27 2004 +++ php-src/win32/build/template.rc Fri Jul 22 14:09:34 2005 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.5 2004/01/08 10:58:27 wez Exp $ + * $Id: template.rc,v 1.5.2.1 2005/07/22 18:09:34 wez Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC @@ -62,3 +62,8 @@ VALUE "Translation", 0x409, 1200 END END + +#ifdef MC_INCLUDE +#include MC_INCLUDE +#endif + http://cvs.php.net/co.php/php-src/win32/build/wsyslog.mc?r=1.1&p=1 Index: php-src/win32/build/wsyslog.mc +++ php-src/win32/build/wsyslog.mc MessageId=1 Severity=Success SymbolicName=PHP_SYSLOG_SUCCESS_TYPE Language=English %1 %2.. MessageId=2 Severity=Informational SymbolicName=PHP_SYSLOG_INFO_TYPE Language=English %1 %2.. MessageId=3 Severity=Warning SymbolicName=PHP_SYSLOG_WARNING_TYPE Language=English %1 %2.. MessageId=4 Severity=Error SymbolicName=PHP_SYSLOG_ERROR_TYPE Language=English %1 %2..