[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Thu Dec 25 00:03:39 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- the config summary is a must, do not allow to disable
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.91r2=1.92diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.91 php-src/win32/build/config.w32:1.92
--- php-src/win32/build/config.w32:1.91 Thu Dec 18 23:20:44 2008
+++ php-src/win32/build/config.w32 Thu Dec 25 00:03:39 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.91 2008/12/18 23:20:44 pajoye Exp $
+// $Id: config.w32,v 1.92 2008/12/25 00:03:39 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -398,8 +398,6 @@
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
-ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
-
if (PHP_DSP != no) {
if (FSO.FolderExists(tmp)) {
FSO.DeleteFolder(tmp);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.81r2=1.82diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.81
php-src/win32/build/confutils.js:1.82
--- php-src/win32/build/confutils.js:1.81 Fri Nov 21 14:03:23 2008
+++ php-src/win32/build/confutils.jsThu Dec 25 00:03:39 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.81 2008/11/21 14:03:23 pajoye Exp $
+// $Id: confutils.js,v 1.82 2008/12/25 00:03:39 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1462,9 +1462,6 @@
function write_summary()
{
var ar = new Array();
- if (PHP_SUMMARY == no) {
- return;
- }
STDOUT.WriteBlankLines(2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Mon Jul 7 13:48:23 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- move common functions to confutil
- MFB: allow to disable the summary (and move test in the function)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.74r2=1.75diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.74 php-src/win32/build/config.w32:1.75
--- php-src/win32/build/config.w32:1.74 Sun Jul 6 09:56:01 2008
+++ php-src/win32/build/config.w32 Mon Jul 7 13:48:23 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.74 2008/07/06 09:56:01 pajoye Exp $
+// $Id: config.w32,v 1.75 2008/07/07 13:48:23 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -8,38 +8,16 @@
if (!CL) {
ERROR(MS C++ compiler is required);
}
-// Which version of the compiler do we have ?
-function probe_binary(EXE, what)
-{
- // tricky escapes to get stderr redirection to work
- var command = 'cmd /c ' + EXE;
- if (what == version) {
- command = command + ' -v';
- }
- var version = execute(command + ' 21');
-
- if (what == 64) {
- if (version.match(/x64/)) {
- return 1;
- }
- } else {
- if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
- return RegExp.$1;
- }
- }
- return 0;
-}
-
-// Which version of the compiler do we have?
-VCVERS = probe_binary(CL);
-VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
-STDOUT.WriteLine(Detected MS compiler version + VCVERS);
// 1200 is VC6
// 1300 is vs.net 2002
// 1310 is vs.net 2003
// 1400 is vs.net 2005
// 1500 is vs.net 2008
+// Which version of the compiler do we have?
+VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine( Detected compiler + VC_VERSIONS[VCVERS]);
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
@@ -402,3 +380,5 @@
}
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
+
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.75r2=1.76diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.75
php-src/win32/build/confutils.js:1.76
--- php-src/win32/build/confutils.js:1.75 Sat Jul 5 19:52:45 2008
+++ php-src/win32/build/confutils.jsMon Jul 7 13:48:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.75 2008/07/05 19:52:45 pajoye Exp $
+// $Id: confutils.js,v 1.76 2008/07/07 13:48:23 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -31,11 +31,11 @@
var sapi_enabled = new Array();
var VC_VERSIONS = new Array();
-VC_VERSIONS[1200] = 'VC6';
-VC_VERSIONS[1300] = 'Visual C++ 2002';
-VC_VERSIONS[1310] = 'Visual C++ 2003';
-VC_VERSIONS[1400] = 'Visual C++ 2005';
-VC_VERSIONS[1500] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
@@ -108,6 +108,27 @@
return ret;
}
+function probe_binary(EXE, what)
+{
+ // tricky escapes to get stderr redirection to work
+ var command = 'cmd /c ' + EXE;
+ if (what == version) {
+ command = command + ' -v';
+ }
+ var version = execute(command + ' 21');
+
+ if (what == 64) {
+ if (version.match(/x64/)) {
+ return 1;
+ }
+ } else {
+ if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+ return RegExp.$1;
+ }
+ }
+ return 0;
+}
+
function condense_path(path)
{
path = FSO.GetAbsolutePathName(path);
@@ -1376,6 +1397,9 @@
function write_summary()
{
var ar = new Array();
+ if (PHP_SUMMARY == no) {
+ return;
+ }
STDOUT.WriteBlankLines(2);
@@ -1426,7 +1450,6 @@
generate_config_h();
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
-
write_summary();
if (PHP_SNAPSHOT_BUILD != no) {
@@ -1732,7 +1755,6 @@
return items;
}
-
// for snapshot builders, this option will attempt to enable everything
// and you can then build everything, ignoring fatal errors within a module
// by running nmake snap
@@ -1743,5 +1765,3 @@
// several objects at once, reducing overhead of starting new
// compiler processes.
ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and
snapshot
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
pajoye Sat Jul 5 19:52:45 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
- improve detection of VC version and summary (2k2 and 2k3 are 1300 and resp.
1310) (Thx Marcus)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.72r2=1.73diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.72 php-src/win32/build/config.w32:1.73
--- php-src/win32/build/config.w32:1.72 Wed Jul 2 20:55:33 2008
+++ php-src/win32/build/config.w32 Sat Jul 5 19:52:44 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.72 2008/07/02 20:55:33 pajoye Exp $
+// $Id: config.w32,v 1.73 2008/07/05 19:52:44 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -31,13 +31,15 @@
}
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 2);
+VCVERS = probe_binary(CL);
+VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
STDOUT.WriteLine(Detected MS compiler version + VCVERS);
-// 12 is VC6
-// 13 is vs.net 2003
-// 14 is vs.net 2005
-// 15 is vs.net 2008
+// 1200 is VC6
+// 1300 is vs.net 2002
+// 1310 is vs.net 2003
+// 1400 is vs.net 2005
+// 1500 is vs.net 2008
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.74r2=1.75diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.74
php-src/win32/build/confutils.js:1.75
--- php-src/win32/build/confutils.js:1.74 Wed Jul 2 20:54:10 2008
+++ php-src/win32/build/confutils.jsSat Jul 5 19:52:45 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.74 2008/07/02 20:54:10 pajoye Exp $
+// $Id: confutils.js,v 1.75 2008/07/05 19:52:45 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -30,15 +30,12 @@
var extensions_enabled = new Array();
var sapi_enabled = new Array();
-// 12 is VC6
-// 13 is vs.net 2003
-// 14 is vs.net 2005
-// 15 is vs.net 2008
var VC_VERSIONS = new Array();
-VC_VERSIONS[12] = 'VC6';
-VC_VERSIONS[13] = 'Visual C++ 2003';
-VC_VERSIONS[14] = 'Visual C++ 2005';
-VC_VERSIONS[15] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'VC6';
+VC_VERSIONS[1300] = 'Visual C++ 2002';
+VC_VERSIONS[1310] = 'Visual C++ 2003';
+VC_VERSIONS[1400] = 'Visual C++ 2005';
+VC_VERSIONS[1500] = 'Visual C++ 2008';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
wez Tue Dec 23 12:20:51 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
A more general check for dirs under Release or Debug.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.21 php-src/win32/build/config.w32:1.22
--- php-src/win32/build/config.w32:1.21 Tue Dec 23 11:01:41 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 12:20:50 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
+// $Id: config.w32,v 1.22 2003/12/23 17:20:50 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -116,12 +116,6 @@
var php_usual_include_suspects =
..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32;
var php_usual_lib_suspects = ..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32;
-if (PHP_DEBUG == yes) {
- php_usual_lib_suspects += ;..\\bindlib_w32\\Debug;
-} else {
- php_usual_lib_suspects += ;..\\bindlib_w32\\Release;
-}
-
// Poke around for some headers
function probe_basic_headers()
{
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.29 php-src/win32/build/confutils.js:1.30
--- php-src/win32/build/confutils.js:1.29 Tue Dec 23 08:10:54 2003
+++ php-src/win32/build/confutils.jsTue Dec 23 12:20:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
+// $Id: confutils.js,v 1.30 2003/12/23 17:20:50 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -463,7 +463,6 @@
} else {
target = _ + target.toUpperCase();
}
-
if (path_to_check == null) {
path_to_check = php_usual_lib_suspects;
@@ -475,11 +474,20 @@
var i;
var libname;
+ var subdir = PHP_DEBUG == yes ? Debug : Release;
+
libnames = libnames.split(';');
for (i = 0; i libnames.length; i++) {
libname = libnames[i];
p = search_paths(libname, path_to_check, LIB);
+ if (!p) {
+ p = search_paths(subdir + \\ + libname, path_to_check,
LIB);
+ if (p) {
+ p += \\ + subdir;
+ }
+ }
+
if (typeof(p) == string) {
ADD_FLAG(LDFLAGS + target, '/libpath:' + p + ' ');
ADD_FLAG(LIBS + target, libname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js template.rc
wez Wed Dec 3 21:12:36 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js template.rc
Log:
fix a couple of buglets and set version number on DLLs to whatever the PHP major
version is.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.8 php-src/win32/build/config.w32:1.9
--- php-src/win32/build/config.w32:1.8 Wed Dec 3 17:59:48 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 21:12:36 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.8 2003/12/03 22:59:48 wez Exp $
+// $Id: config.w32,v 1.9 2003/12/04 02:12:36 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -35,7 +35,7 @@
DEFINE(LDFLAGS, /nologo /libpath:$(PHP_BUILD)\\lib);
// General DLL link flags
-DEFINE(DLL_LDFLAGS, /dll);
+DEFINE(DLL_LDFLAGS, /dll /version: + PHP_VERSION);
// PHP DLL link flags
DEFINE(PHP_LDFLAGS, $(DLL_LDFLAGS));
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.11 php-src/win32/build/confutils.js:1.12
--- php-src/win32/build/confutils.js:1.11 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 21:12:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.11 2003/12/04 01:37:52 wez Exp $
+// $Id: confutils.js,v 1.12 2003/12/04 02:12:36 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -530,7 +530,7 @@
if (shared) {
dllname = php_ + extname + .dll;
- var resname = generate_version_info_resource(makefiletarget, ext/ +
extname);
+ var resname = generate_version_info_resource(dllname, ext/ +
extname);
MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $( + 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);
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.1 php-src/win32/build/template.rc:1.2
--- php-src/win32/build/template.rc:1.1 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/template.rc Wed Dec 3 21:12:36 2003
@@ -1,11 +1,10 @@
/* This is a template RC file.
- * $Id: template.rc,v 1.1 2003/12/04 01:37:52 wez Exp $
+ * $Id: template.rc,v 1.2 2003/12/04 02:12:36 wez Exp $
* Do not edit with MSVC */
#ifdef APSTUDIO_INVOKED
# error dont edit with MSVC
#endif
-#include resource.h
#include winres.h
#include main/php_version.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
