com gtk/php-gtk: Debug support #2: win32/buildconf.js win32/config.w32.in win32/confutils.js

Commit:    e2dc476d7086e37b49b22ee47c5477cc97e76bf9
Author:    Steph Fox <[email protected]>         Mon, 31 Oct 2005 11:44:43 +0000
Parents:   5a73751a6cda87fccac9d869cfb0eb1d58814f15
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=e2dc476d7086e37b49b22ee47c5477cc97e76bf9

Log:
Debug support #2

Bugs:
https://bugs.php.net/2

Changed paths:
  M  win32/buildconf.js
  M  win32/config.w32.in
  M  win32/confutils.js


Diff:
e2dc476d7086e37b49b22ee47c5477cc97e76bf9
diff --git a/win32/buildconf.js b/win32/buildconf.js
index 0b94c01..5912e5a 100644
--- a/win32/buildconf.js
+++ b/win32/buildconf.js
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: buildconf.js,v 1.6 2005-10-06 10:04:35 sfox Exp $ */
+/* $Id: buildconf.js,v 1.7 2005-10-31 11:44:42 sfox Exp $ */
 // This generates a configure script for win32 build
 
 var FSO = WScript.CreateObject("Scripting.FileSystemObject");
@@ -144,6 +144,10 @@ if (FSO.FolderExists('Release')) {
 	FSO.DeleteFolder('Release');
 }
 
+if (FSO.FolderExists('Debug')) {
+	FSO.DeleteFolder('Debug');
+}
+
 if (FSO.FileExists('main\\php_gtk_version.h')) {
 	FSO.DeleteFile('main\\php_gtk_version.h');
 }
diff --git a/win32/config.w32.in b/win32/config.w32.in
index 5fdd39c..e448e1d 100644
--- a/win32/config.w32.in
+++ b/win32/config.w32.in
@@ -42,7 +42,7 @@ if (CL) {
 }
 
 STDOUT.WriteBlankLines(1);
-ARG_IS('all', 'Configure all available extensions', 'no');
+
 ARG_WITH('php-build', 'Path to where you extracted http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source dir (..\\php_build) if not specified', 'no');
 ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
 
@@ -64,6 +64,8 @@ if (PHP_GTK_DEBUG == "yes") {
 	DEFINE("BUILD_DIR", PHP_GTK_OBJECT_OUT_DIR + "Release");
 }
 
+ARG_IS('all', 'Configure all available extensions', 'no');
+
 DEFINE("PHPGTKDLL", "php-gtk2.dll");
 DEFINE("PHPGTKLIB", "php-gtk2.lib");
 get_version_numbers();
@@ -79,8 +81,9 @@ DEFINE("PHP_GTK_LDFLAGS", "$(DLL_LDFLAGS)");
 DEFINE("LIBS", "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib");
 
 if (PHP_GTK_DEBUG == "yes") {
-	DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
+	DEFINE("CFLAGS", "/nologo /LDd /MDd /Gm /ZI /GZ /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=1 /D PHP_WIN32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
 	ADD_FLAG("LDFLAGS", "/debug");
+
 } else {
 	DEFINE("CFLAGS", "/nologo /MT /W3 /GX /O2 /I . /I ..\\ /I ..\\.. /I main /I ..\\main /I ext /I ..\\ext /I ..\\php5\\main /I ..\\php5\\Zend /I ..\\php5\\TSRM /D ZEND_WIN32 /D ZTS=1 /D ZEND_DEBUG=0 /D PHP_WIN32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL");
 }
diff --git a/win32/confutils.js b/win32/confutils.js
index 6645b75..35a9d55 100644
--- a/win32/confutils.js
+++ b/win32/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.16 2005-10-01 16:24:42 sfox Exp $
+// $Id: confutils.js,v 1.17 2005-10-31 11:44:43 sfox Exp $
 
 /* set vars */
 var STDOUT = WScript.StdOut;
@@ -123,7 +123,11 @@ function get_version_numbers() {
 	vfile.WriteLine("#define PHP_GTK_MAJOR_VERSION " + major);
 	vfile.WriteLine("#define PHP_GTK_MINOR_VERSION " + minor);
 	vfile.WriteLine("#define PHP_GTK_RELEASE_VERSION " + release);
-	vfile.WriteLine("#define PHP_GTK_EXTRA_VERSION \"" + extra + "\"");
+	if (PHP_GTK_DEBUG) {
+		vfile.WriteLine("#define PHP_GTK_EXTRA_VERSION \"" + extra + " (DEBUG)\"");
+	} else {
+		vfile.WriteLine("#define PHP_GTK_EXTRA_VERSION \"" + extra + "\"");
+	}
 
 	DEFINE('PHP_GTK_VERSION_STRING', version);
 }
@@ -509,7 +513,7 @@ function CHECK_LIB(libnames, target, path_to_check, common_name) {
 		}
 	}
 
-	STDOUT.WriteLine("	<not found>");
+	ERROR("	" + libname + " not found - aborting configure process");
 
 	return false;
 }