[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/confutils.js branches/PHP_5_3/win32/build/phpize.js.in trunk/win32/build/Makefile trunk/win32/build/conf
pajoye Sun, 02 Jan 2011 18:03:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306997
Log:
- generate a list of ext and how they are built, should be updated by phpize'd
make (un)install as well, later
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
U php/php-src/trunk/win32/build/Makefile
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 17:22:06 UTC
(rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:03:00 UTC
(rev 306997)
@@ -182,6 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
17:22:06 UTC (rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:03:00 UTC (rev 306997)
@@ -1666,6 +1666,7 @@
}
var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
+ var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
prefix = get_define("PHP_PREFIX");
prefix = prefix.replace(new RegExp("/", "g"), "\\");
prefix = prefix.replace(new RegExp("", "g"), "");
@@ -1675,11 +1676,22 @@
MF.WriteLine("var PHP_VERSION=" + PHP_VERSION);
MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
+ MF.WriteBlankLines(1);
+ MF.WriteLine("/* Genereted extensions list with mode (static/shared)
*/");
+
+ var count = extensions_enabled.length;
+ for (i in extensions_enabled) {
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ DEPS.WriteLine(out);
+ MF.WriteLine(out);
+ }
+
MF.WriteBlankLines(2);
MF.WriteLine("/* Genereted win32/build/phpize.js.in */");
MF.WriteBlankLines(1);
MF.Write(file_get_contents("win32/build/phpize.js.in"));
MF.Close();
+ DEPS.Close();
/* Generate flags file */
/* spit out variable definitions */
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-02
17:22:06 UTC (rev 306996)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-02
18:03:00 UTC (rev 306997)
@@ -223,6 +223,7 @@
}
// Pull in code from sapi and extensions
+
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2011-01-02 17:22:06 UTC (rev
306996)
+++ php/php-src/trunk/win32/build/Makefile 2011-01-02 18:03:00 UTC (rev
306997)
@@ -182,6 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 17:22:06 UTC (rev
306996)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:03:00 UTC (rev
306997)
@@ -1666,6 +1666,7 @@
}
var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
+ var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
prefix = get_define("PHP_PREFIX");
prefix = prefix.replace(new RegExp("/", "g"), "\\");
prefix = prefix.replace(new RegExp("", "g"), "");
@@ -1675,11 +1676,22 @@
MF.WriteLine("var PHP_VERSION=" + PHP_VERSION);
MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
MF.WriteLine("var PH
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile
pajoye Sun, 02 Jan 2011 18:13:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306998
Log:
- typo
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/Makefile
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:03:00 UTC
(rev 306997)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:13:20 UTC
(rev 306998)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
+ copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:03:00 UTC (rev 306997)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:13:20 UTC (rev 306998)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2011-01-02 18:03:00 UTC (rev
306997)
+++ php/php-src/trunk/win32/build/Makefile 2011-01-02 18:13:20 UTC (rev
306998)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- @copy $(BUILD_DIR)\devel\ext_dep.js $(BUILD_DIR_DEV)\script\ /y >nul
+ copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile confutils.js
pajoye Sun, 02 Jan 2011 18:14:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=306999
Log:
- typo, and remove undesired committed part
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:13:20 UTC
(rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-01-02 18:14:50 UTC
(rev 306999)
@@ -182,7 +182,7 @@
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y
>nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:13:20 UTC (rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:14:50 UTC (rev 306999)
@@ -1129,11 +1129,6 @@
var dep_present = false;
var dep_shared = false;
- if (MODE_PHPIZE) {
- ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
- eval(ext_deps_js);
- }
-
try {
dep_present = eval("PHP_" + DEP);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/confutils.js
pajoye Sun, 02 Jan 2011 18:29:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307000
Log:
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:14:50 UTC (rev 306999)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2011-01-02
18:29:56 UTC (rev 307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
"\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase()
+ "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:14:50 UTC (rev
306999)
+++ php/php-src/trunk/win32/build/confutils.js 2011-01-02 18:29:56 UTC (rev
307000)
@@ -1129,6 +1129,11 @@
var dep_present = false;
var dep_shared = false;
+ if (MODE_PHPIZE) {
+ ext_deps_js = file_get_contents(PHP_DIR +
"\\script\\ext_deps.js");
+ eval(ext_deps_js);
+ }
+
try {
dep_present = eval("PHP_" + DEP);
@@ -1681,7 +1686,8 @@
var count = extensions_enabled.length;
for (i in extensions_enabled) {
- out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'True' : 'False');
+ out = "PHP_" + extensions_enabled[i][0].toUpperCase() +
"_SHARED=" + (extensions_enabled[i][1] == 'shared' ? 'true' : 'false') + ";";
+ DEPS.WriteLine("PHP_" + extensions_enabled[i][0].toUpperCase()
+ "=true;");
DEPS.WriteLine(out);
MF.WriteLine(out);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile
pajoye Mon, 03 Jan 2011 01:07:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=307007 Log: - silent copy Changed paths: U php/php-src/trunk/win32/build/Makefile Modified: php/php-src/trunk/win32/build/Makefile === --- php/php-src/trunk/win32/build/Makefile 2011-01-02 23:38:36 UTC (rev 307006) +++ php/php-src/trunk/win32/build/Makefile 2011-01-03 01:07:28 UTC (rev 307007) @@ -182,7 +182,7 @@ @copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul @copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y >nul @copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul - copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul + @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul install-sdk: build-devel @xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/phpize.js.in trunk/win32/build/phpize.js.in
pajoye Mon, 03 Jan 2011 01:08:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307008
Log:
- we need the core config.w32 only once
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
U php/php-src/trunk/win32/build/phpize.js.in
Modified: php/php-src/branches/PHP_5_3/win32/build/phpize.js.in
===
--- php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-03
01:07:28 UTC (rev 307007)
+++ php/php-src/branches/PHP_5_3/win32/build/phpize.js.in 2011-01-03
01:08:21 UTC (rev 307008)
@@ -222,8 +222,7 @@
C.WriteBlankLines(1);
}
-// Pull in code from sapi and extensions
-
+// Pull in code for the base detection
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
@@ -249,8 +248,6 @@
C.WriteLine("conf_process_args();");
C.WriteBlankLines(1);
-C.Write(file_get_contents(PHP_DIR + "/script/config.w32.phpize.in"));
-
// Comment out the calls from their original positions
modules = modules.replace(re, "/* $1 */");
C.Write(modules);
Modified: php/php-src/trunk/win32/build/phpize.js.in
===
--- php/php-src/trunk/win32/build/phpize.js.in 2011-01-03 01:07:28 UTC (rev
307007)
+++ php/php-src/trunk/win32/build/phpize.js.in 2011-01-03 01:08:21 UTC (rev
307008)
@@ -222,7 +222,7 @@
C.WriteBlankLines(1);
}
-// Pull in code from sapi and extensions
+// Pull in code for the base detection
modules = file_get_contents(PHP_DIR + "/script/config.w32.phpize.in");
C.WriteLine("ARG_ENABLE('debug', 'Compile with debugging symbols', \"no\");");
@@ -248,8 +248,6 @@
C.WriteLine("conf_process_args();");
C.WriteBlankLines(1);
-C.Write(file_get_contents(PHP_DIR + "/script/config.w32.phpize.in"));
-
// Comment out the calls from their original positions
modules = modules.replace(re, "/* $1 */");
C.Write(modules);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ config.w32.phpize.in
pajoye Mon, 03 Jan 2011 01:22:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307009
Log:
- missing file
Changed paths:
A php/php-src/trunk/win32/build/config.w32.phpize.in
Added: php/php-src/trunk/win32/build/config.w32.phpize.in
===
--- php/php-src/trunk/win32/build/config.w32.phpize.in (rev 0)
+++ php/php-src/trunk/win32/build/config.w32.phpize.in 2011-01-03 01:22:00 UTC (rev 307009)
@@ -0,0 +1,358 @@
+// vim:ft=javascript
+// $Id: config.w32 306241 2010-12-11 22:18:10Z pajoye $
+// "Master" config file; think of it as a configure.in
+// equivalent.
+
+var PHP_CYGWIN="notset";
+PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
+if (!PHP_CL) {
+ ERROR("MS C++ compiler is required");
+}
+/* For the record here: */
+// 1200 is VC6
+// 1300 is vs.net 2002
+// 1310 is vs.net 2003
+// 1400 is vs.net 2005
+// 1500 is vs.net 2008
+// 1600 is vs.net 2010
+// Which version of the compiler do we have?
+VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
+
+if (VCVERS < 1500) {
+ ERROR("Unsupported MS C++ Compiler, VC9 (2008) minimum is required");
+}
+
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
+DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
+AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID");
+
+// do we use x64 or 80x86 version of compiler?
+X64 = probe_binary(PHP_CL, 64, null, 'PHP_CL');
+if (X64) {
+ STDOUT.WriteLine(" Detected 64-bit compiler");
+} else {
+ STDOUT.WriteLine(" Detected 32-bit compiler");
+}
+AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture");
+DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86');
+
+// 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');
+if (!PATH_PROG('bison')) {
+ ERROR('bison is required')
+}
+
+// There's a minimum requirement for re2c..
+MINRE2C = "0.13.4";
+
+RE2C = PATH_PROG('re2c');
+if (RE2C) {
+ var intvers, intmin;
+ var pattern = /\./g;
+
+ RE2CVERS = probe_binary(RE2C, "version");
+ STDOUT.WriteLine(' Detected re2c version ' + RE2CVERS);
+
+ intvers = RE2CVERS.replace(pattern, '') - 0;
+ intmin = MINRE2C.replace(pattern, '') - 0;
+
+ if (intvers < intmin) {
+ STDOUT.WriteLine('WARNING: The minimum RE2C version requirement is ' + MINRE2C);
+ STDOUT.WriteLine('Parsers will not be generated. Upgrade your copy at http://sf.net/projects/re2c');
+ DEFINE('RE2C', '');
+ } else {
+ DEFINE('RE2C_FLAGS', '');
+ }
+} else {
+ STDOUT.WriteLine('Parsers will not be regenerated');
+}
+PATH_PROG('zip');
+PATH_PROG('lemon');
+
+// avoid picking up midnight commander from cygwin
+PATH_PROG('mc', WshShell.Environment("Process").Item("PATH"));
+
+// Try locating manifest tool
+if (VCVERS > 1200) {
+ 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) {
+ PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
+ if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
+ ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' does not exist');
+ }
+ PHP_OBJECT_OUT_DIR += '\\';
+} else if (X64) {
+ if (!FSO.FolderExists("x64")) {
+ FSO.CreateFolder("x64");
+ }
+ PHP_OBJECT_OUT_DIR = 'x64\\';
+}
+
+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.");
+}
+
+DEFINE('PHP_PREFIX', PHP_PREFIX);
+
+DEFINE("BASE_INCLUDES", "/I " + PHP_DIR + "/include /I " + PHP_DIR + "/include/main /I " + PHP_DIR + "/include/Zend /I " + PHP_DIR + "/include/TSRM /I " + PHP_DIR + "/include/ext ");
+
+// CFLAGS for building the PHP dll
+DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
+/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500");
+
+DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
+
+// General CFLAGS for building objects
+DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
+/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 ");
+
+if (VCVERS < 1400) {
+ // Enable automatic precompiled headers
+ ADD_FLAG('CFLAGS', ' /YX ');
+
+ if (PHP_DEBUG == "yes") {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
+}
+
+if (VCVERS >= 1400) {
+ // fun stu
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ config.w32.phpize.in
pajoye Mon, 03 Jan 2011 01:22:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307010
Log:
- prevent php(version)lib.(dll|lib) to be overriden
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
2011-01-03 01:22:00 UTC (rev 307009)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32.phpize.in
2011-01-03 01:22:07 UTC (rev 307010)
@@ -203,22 +203,35 @@
// set up the build dir and DLL name
if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
- DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+ }
} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
- DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+ }
} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
- DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+ }
} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
- DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
- DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+ if (!MODE_PHPIZE) {
+ DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
+ DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+ }
}
+if (MODE_PHPIZE) {
+ DEFINE("PHPDLL", PHP_DLL);
+ DEFINE("PHPLIB", PHP_DLL_LIB);
+}
+
// Find the php_build dir - it contains headers and libraries
// that we need
ARG_WITH('php-build', 'Path to where you extracted the development libraries
(http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of
this source dir (..\\deps) if not specified', 'no');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/intl/collator/collator_class.c branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c branches/PHP_5_3/ext/intl/formatter/forma
stas Mon, 03 Jan 2011 03:58:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307012
Log:
Imlement clone for formatters that support it
# also some test fixes, more to follow
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c
U php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c
U php/php-src/branches/PHP_5_3/ext/intl/formatter/formatter_class.c
U php/php-src/branches/PHP_5_3/ext/intl/msgformat/msgformat_class.c
U
php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.c
A php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_clone.phpt
U
php/php-src/branches/PHP_5_3/ext/intl/tests/dateformat_get_set_pattern.phpt
A php/php-src/branches/PHP_5_3/ext/intl/tests/formatter_clone.phpt
U
php/php-src/branches/PHP_5_3/ext/intl/tests/formatter_get_set_attribute.phpt
A php/php-src/branches/PHP_5_3/ext/intl/tests/msgfmt_clone.phpt
U php/php-src/branches/PHP_5_3/ext/intl/tests/msgfmt_get_set_pattern.phpt
U php/php-src/trunk/ext/intl/collator/collator_class.c
U php/php-src/trunk/ext/intl/dateformat/dateformat_class.c
U php/php-src/trunk/ext/intl/formatter/formatter_class.c
U php/php-src/trunk/ext/intl/msgformat/msgformat_class.c
U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.c
A php/php-src/trunk/ext/intl/tests/dateformat_clone.phpt
U php/php-src/trunk/ext/intl/tests/dateformat_get_set_pattern.phpt
A php/php-src/trunk/ext/intl/tests/formatter_clone.phpt
U php/php-src/trunk/ext/intl/tests/formatter_get_set_attribute.phpt
A php/php-src/trunk/ext/intl/tests/msgfmt_clone.phpt
U php/php-src/trunk/ext/intl/tests/msgfmt_get_set_pattern.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-01-03 03:26:06 UTC (rev 307011)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-01-03 03:58:57 UTC (rev 307012)
@@ -38,6 +38,8 @@
(Felipe)
. Fixed bug #53612 (Segmentation fault when using cloned several intl
objects). (Gustavo)
+ . Implemented clone functionality for number, date & message formatters.
+(Stas).
- MySQL Improved extension:
. Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA
Modified: php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c 2011-01-03 03:26:06 UTC (rev 307011)
+++ php/php-src/branches/PHP_5_3/ext/intl/collator/collator_class.c 2011-01-03 03:58:57 UTC (rev 307012)
@@ -145,7 +145,9 @@
memcpy(&Collator_handlers, zend_get_std_object_handlers(),
sizeof Collator_handlers);
- Collator_handlers.clone_obj = NULL;
+ /* Collator has no usable clone semantics - ucol_cloneBinary/ucol_openBinary require binary buffer
+ for which we don't have the place to keep */
+ Collator_handlers.clone_obj = NULL;
/* Declare 'Collator' class properties. */
if( !Collator_ce_ptr )
Modified: php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c 2011-01-03 03:26:06 UTC (rev 307011)
+++ php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_class.c 2011-01-03 03:58:57 UTC (rev 307012)
@@ -80,6 +80,30 @@
}
/* }}} */
+/* {{{ IntlDateFormatter_object_clone */
+zend_object_value IntlDateFormatter_object_clone(zval *object TSRMLS_DC)
+{
+ zend_object_value new_obj_val;
+ zend_object_handle handle = Z_OBJ_HANDLE_P(object);
+ IntlDateFormatter_object *dfo, *new_dfo;
+
+ DATE_FORMAT_METHOD_FETCH_OBJECT;
+ new_obj_val = IntlDateFormatter_ce_ptr->create_object(IntlDateFormatter_ce_ptr TSRMLS_CC);
+ new_dfo = (IntlDateFormatter_object *)zend_object_store_get_object_by_handle(new_obj_val.handle TSRMLS_CC);
+ /* clone standard parts */
+ zend_objects_clone_members(&new_dfo->zo, new_obj_val, &dfo->zo, handle TSRMLS_CC);
+ /* clone formatter object */
+ DATE_FORMAT_OBJECT(new_dfo) = udat_clone(DATE_FORMAT_OBJECT(dfo), &INTL_DATA_ERROR_CODE(new_dfo));
+ if(U_FAILURE(INTL_DATA_ERROR_CODE(new_dfo))) {
+ /* set up error in case error handler is interested */
+ intl_error_set( NULL, INTL_DATA_ERROR_CODE(new_dfo), "Failed to clone IntlDateFormatter object", 0 TSRMLS_CC );
+ IntlDateFormatter_object_dtor(new_dfo, new_obj_val.handle TSRMLS_CC); /* free new object */
+ zend_error(E_ERROR, "Failed to clone IntlDateFormatter object");
+ }
+ return new_obj_val;
+}
+/* }}} */
+
/*
* 'IntlDateFormatter' class registration structures & functions
*/
@@ -164,7 +188,7 @@
memcpy(&IntlDateFormatter_handlers, zend_get_std_object_handlers(),
sizeof IntlDateFormatter_handlers);
- IntlDateFormat
