edink Tue Dec 19 10:26:02 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/build Makefile config.w32 confutils.js mkdist.php Log: Enable full build with newer Microsoft compilers http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.1&r2=1.35.2.1.2.2&diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.1 php-src/win32/build/Makefile:1.35.2.1.2.2 --- php-src/win32/build/Makefile:1.35.2.1.2.1 Fri Nov 10 10:30:46 2006 +++ php-src/win32/build/Makefile Tue Dec 19 10:26:01 2006 @@ -14,12 +14,13 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.35.2.1.2.1 2006/11/10 10:30:46 dmitry Exp $ +# $Id: Makefile,v 1.35.2.1.2.2 2006/12/19 10:26:01 edink Exp $ # This is the makefile template for the win32 build CC="$(CL)" LD="$(LINK)" MC="$(MC)" +MT="$(MT)" MCFILE=$(BUILD_DIR)\wsyslog.rc @@ -54,6 +55,9 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc +_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2 + $(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\"" \ @@ -62,6 +66,7 @@ $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE) @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) + [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL) $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.5&r2=1.40.2.8.2.6&diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.40.2.8.2.5 php-src/win32/build/config.w32:1.40.2.8.2.6 --- php-src/win32/build/config.w32:1.40.2.8.2.5 Tue Dec 5 08:07:57 2006 +++ php-src/win32/build/config.w32 Tue Dec 19 10:26:01 2006 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.40.2.8.2.5 2006/12/05 08:07:57 dmitry Exp $ +// $Id: config.w32,v 1.40.2.8.2.6 2006/12/19 10:26:01 edink Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -49,6 +49,9 @@ // avoid picking up midnight commander from cygwin PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); +// Try locating manifest tool +PATH_PROG('mt', 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) { http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.3&r2=1.60.2.1.2.4&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.3 php-src/win32/build/confutils.js:1.60.2.1.2.4 --- php-src/win32/build/confutils.js:1.60.2.1.2.3 Fri Nov 10 10:38:07 2006 +++ php-src/win32/build/confutils.js Tue Dec 19 10:26:01 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.3 2006/11/10 10:38:07 dmitry Exp $ +// $Id: confutils.js,v 1.60.2.1.2.4 2006/12/19 10:26:01 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -877,6 +877,7 @@ var ldflags; var resname; var ld; + var manifest; if (typeof(obj_dir) == "undefined") { sapiname_for_printing = configure_module_dirname; @@ -908,11 +909,13 @@ if (makefiletarget.match(new RegExp("\\.dll$"))) { ldflags = "/dll $(LDFLAGS)"; + manifest = "[EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)"; } else if (makefiletarget.match(new RegExp("\\.lib$"))) { ldflags = "$(LDFLAGS)"; ld = "$(MAKE_LIB)"; } else { ldflags = "$(LDFLAGS)"; + manifest = "[EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE)"; } if (ld) { @@ -922,6 +925,10 @@ MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname + " /link /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + " $(LDFLAGS_" + SAPI + ")"); } + if (manifest) { + MFO.WriteLine("\t" + manifest); + } + DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')'); if (configure_module_dirname.match("pecl")) { @@ -998,7 +1005,7 @@ var objs = null; var EXT = extname.toUpperCase(); var extname_for_printing; - + if (shared == null) { eval("shared = PHP_" + EXT + "_SHARED;"); } @@ -1040,6 +1047,7 @@ MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" + libname + ": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname); MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname + " /link /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ")"); + MFO.WriteLine("[EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)"); MFO.WriteBlankLines(1); if (configure_module_dirname.match("pecl")) { http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13&r2=1.13.4.1&diff_format=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.13 php-src/win32/build/mkdist.php:1.13.4.1 --- php-src/win32/build/mkdist.php:1.13 Sat Mar 26 21:32:20 2005 +++ php-src/win32/build/mkdist.php Tue Dec 19 10:26:01 2006 @@ -1,4 +1,4 @@ -<?php # $Id: mkdist.php,v 1.13 2005/03/26 21:32:20 edink Exp $ +<?php # $Id: mkdist.php,v 1.13.4.1 2006/12/19 10:26:01 edink Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; @@ -401,6 +401,17 @@ } } } + + /* copy c++ runtime */ + $items = glob("$snapshot_template/dlls/*.CRT"); + + foreach ($items as $item) { + $bi = basename($item); + if (is_dir($item)) { + copy_dir($item, "$dist_dir/$bi"); + copy_dir($item, "$dist_dir/ext/$bi"); + } + } } else { echo "WARNING: you don't have a snapshot template\n"; echo " your dist will not be complete\n";
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php