edink Fri Feb 25 18:00:17 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/win32/build Makefile config.w32
Log:
MFH: (--enable-debug-pack)
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.2&r2=1.23.2.3&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.23.2.2
php-src/win32/build/Makefile:1.23.2.3
--- php-src/win32/build/Makefile:1.23.2.2 Thu Feb 24 18:31:37 2005
+++ php-src/win32/build/Makefile Fri Feb 25 18:00:17 2005
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.23.2.2 2005/02/24 23:31:37 edink Exp $
+# $Id: Makefile,v 1.23.2.3 2005/02/25 23:00:17 edink Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -96,6 +96,7 @@
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-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)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -104,6 +105,9 @@
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
+ cd $(BUILD_DIR)
+ -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+ cd ..\..
dist: all build-dist
snap: build-snap build-dist
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.26.2.7&r2=1.26.2.8&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.26.2.7
php-src/win32/build/config.w32:1.26.2.8
--- php-src/win32/build/config.w32:1.26.2.7 Tue Feb 15 09:29:01 2005
+++ php-src/win32/build/config.w32 Fri Feb 25 18:00:17 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.26.2.7 2005/02/15 14:29:01 edink Exp $
+// $Id: config.w32,v 1.26.2.8 2005/02/25 23:00:17 edink Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -18,8 +18,11 @@
PATH_PROG('lemon');
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") {
+ ERROR("Use of both --enable-debug and --enable-debug-pack not
allowed.");
+}
ARG_ENABLE('zts', 'Thread safety', 'yes');
-
// Configures the hard-coded installation dir
ARG_ENABLE('prefix', 'where PHP will be installed', '');
if (PHP_PREFIX == '') {
@@ -63,6 +66,11 @@
// version of the libc
ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:msvcrt");
} else {
+ // Generate external debug files when --enable-debug-pack is specified
+ if (PHP_DEBUG_PACK == "yes") {
+ ADD_FLAG("CFLAGS", "/Zi");
+ ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf");
+ }
// Equivalent to Release_TSInline build -> best optimization
ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \
/D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
