diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-05-28 16:52:15 +0200 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-05-28 16:52:15 +0200 |
commit | 01c525f668ecff08bea21c4ff22745b8f77e8c3a (patch) | |
tree | 07ebb675549d7a8ceb905676e4894151122321ac /win32 | |
parent | d4d61a2bcb9975c8aeddbc6603211064174087a9 (diff) | |
download | php-01c525f668ecff08bea21c4ff22745b8f77e8c3a.tar.gz |
Imported Upstream version 5.4.4~rc1upstream/5.4.4_rc1
Diffstat (limited to 'win32')
-rw-r--r-- | win32/build/confutils.js | 4 | ||||
-rw-r--r-- | win32/build/libs_version.txt | 2 | ||||
-rw-r--r-- | win32/build/mkdist.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8c4054da0..c0a1ce895 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -65,7 +65,7 @@ if (MODE_PHPIZE) { WScript.Quit(10);
}
} else {
- if (!FSO.FileExists("README.SVN-RULES")) {
+ if (!FSO.FileExists("README.GIT-RULES")) {
STDERR.WriteLine("Must be run from the root of the php source");
WScript.Quit(10);
}
@@ -74,7 +74,7 @@ if (MODE_PHPIZE) { var CWD = WshShell.CurrentDirectory;
if (typeof(CWD) == "undefined") {
- CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.SVN-RULES"));
+ CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.GIT-RULES"));
}
/* defaults; we pick up the precise versions from configure.in */
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 37474fd07..39281d738 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -13,4 +13,4 @@ libssh2-1.3.0 libtidy-20090325
libxslt-1.1.23
libxml-2.7.7
-openssl-0.9.8t
+openssl-0.9.8u
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 17f7cd020..5ed9bdc81 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -401,7 +401,7 @@ function copy_test_dir($directory, $dest) while (FALSE !== ($file = readdir($directory_list))) { $full_path = $directory . '/' . $file; if($file != '.' && $file != '..' && $file != '.svn' && is_dir($full_path)) { - if ($file == 'tests') { + if ($file == 'tests' || $file == 'examples') { if (!is_dir($dest . '/' . $full_path)) { mkdir($dest . '/' . $full_path , 0775, true); } |