pajoye Mon, 19 Oct 2009 19:05:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289764
Log:
- Merge: add custom DLL to the package and fix the path to the deps bin (needs
absolute path in some cases)
Changed paths:
_U php/php-src/branches/PHP_5_3_1/
_U php/php-src/branches/PHP_5_3_1/ext/mysql/
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
_U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
U php/php-src/branches/PHP_5_3_1/win32/build/Makefile
U php/php-src/branches/PHP_5_3_1/win32/build/config.w32
U php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
Property changes on: php/php-src/branches/PHP_5_3_1
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752
/php/php-src/trunk/ext/mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763
/php/php-src/trunk/ext/mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752
/php/php-src/trunk/ext/mysqli:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763
/php/php-src/trunk/ext/mysqli:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752
/php/php-src/trunk/ext/mysqlnd:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763
/php/php-src/trunk/ext/mysqlnd:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752
/php/php-src/trunk/ext/pdo_mysql:284726
+
/php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763
/php/php-src/trunk/ext/pdo_mysql:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
Modified: php/php-src/branches/PHP_5_3_1/win32/build/Makefile
===================================================================
--- php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:02:12 UTC
(rev 289763)
+++ php/php-src/branches/PHP_5_3_1/win32/build/Makefile 2009-10-19 19:05:58 UTC
(rev 289764)
@@ -128,7 +128,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)"
"$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n -dphar.readonly=0
win32/build/mkdist.php "$(BUILD_DIR)" "$(PHP_BUILD)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS)
$(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
Modified: php/php-src/branches/PHP_5_3_1/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3_1/win32/build/config.w32 2009-10-19
19:02:12 UTC (rev 289763)
+++ php/php-src/branches/PHP_5_3_1/win32/build/config.w32 2009-10-19
19:05:58 UTC (rev 289764)
@@ -251,6 +251,7 @@
}
}
}
+ PHP_PHP_BUILD = FSO.GetAbsolutePathName(PHP_PHP_BUILD);
}
DEFINE("PHP_BUILD", PHP_PHP_BUILD);
Modified: php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php
===================================================================
--- php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19
19:02:12 UTC (rev 289763)
+++ php/php-src/branches/PHP_5_3_1/win32/build/mkdist.php 2009-10-19
19:05:58 UTC (rev 289764)
@@ -2,11 +2,12 @@
/* piece together a windows binary distro */
$build_dir = $argv[1];
-$phpdll = $argv[2];
-$sapi_targets = explode(" ", $argv[3]);
-$ext_targets = explode(" ", $argv[4]);
-$pecl_targets = explode(" ", $argv[5]);
-$snapshot_template = $argv[6];
+$php_build_dir = $argv[2];
+$phpdll = $argv[3];
+$sapi_targets = explode(" ", $argv[4]);
+$ext_targets = explode(" ", $argv[5]);
+$pecl_targets = explode(" ", $argv[6]);
+$snapshot_template = $argv[7];
$is_debug = preg_match("/^debug/i", $build_dir);
@@ -295,7 +296,7 @@
/* try template dir */
$tdll = $snapshot_template . "/dlls/" . basename($dll);
if (!file_exists($tdll)) {
- $tdll = '../deps/bin/' . basename($dll);
+ $tdll = $php_build_dir . '/bin/' . basename($dll);
if (!file_exists($tdll)) {
echo "WARNING: distro depends on $dll, but
could not find it on your system\n";
continue;
@@ -309,11 +310,23 @@
/* TODO:
add sanity check and test if all required DLLs are present, per version
This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD).
+Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
+deps. For example, libenchant.dll loads libenchant_myspell.dll or
+libenchant_ispell.dll
*/
-$ICU_DLLS = '../deps/bin/' . 'icu*.dll';
+$ICU_DLLS = $php_build_dir . '/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
+$ENCHANT_DLLS = array(
+ 'glib-2.dll',
+ 'gmodule-2.dll',
+ 'libenchant_myspell.dll',
+ 'libenchant_ispell.dll',
+);
+foreach ($ENCHANT_DLLS as $filename) {
+ copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" .
basename($filename));
+}
/* and those for pecl */
foreach ($pecl_dll_deps as $dll) {
@@ -332,6 +345,7 @@
}
copy($dll, "$pecl_dir/" . basename($dll));
}
+
function copy_dir($source, $dest)
{
if (!is_dir($dest)) {
@@ -365,7 +379,9 @@
}
if ($directory == 'tests') {
- mkdir($dest . '/tests', 0775, true);
+ if (!is_dir($dest . '/tests')) {
+ mkdir($dest . '/tests', 0775, true);
+ }
copy_dir($directory, $dest . '/tests/');
return false;
@@ -439,6 +455,7 @@
foreach ($dirs as $dir) {
copy_test_dir($dir, $test_dir);
}
+
/* change this next line to true to use good-old
* hand-assembled go-pear-bundle from the snapshot template */
$use_pear_template = true;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
