Modified: trunk/Tools/ChangeLog (166775 => 166776)
--- trunk/Tools/ChangeLog 2014-04-04 07:54:40 UTC (rev 166775)
+++ trunk/Tools/ChangeLog 2014-04-04 08:11:34 UTC (rev 166776)
@@ -1,3 +1,20 @@
+2014-04-04 Andres Gomez <[email protected]>
+
+ [Win] Update obsolete packages in cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=126264
+
+ Reviewed by Brent Fulgham.
+
+ Removed "apache" and "minires" as the first has been replaced by
+ "lighttpd" and the second is now integrated into
+ "cygwin". Replaced the transitional and now obsolete "gcc" package
+ with "gcc-g++" and ensure that "python" stays at version "2.6.8"
+ since the newer version available is "2.7.3" which breaks the
+ build due to some funniness with environment variable handling.
+
+ * CygwinDownloader/cygwin-downloader.py:
+ * CygwinDownloader/cygwin-downloader.zip:
+
2014-04-03 Joseph Pecoraro <[email protected]>
check-webkit-style: Improve warnings on Objective-C @property syntax
Modified: trunk/Tools/CygwinDownloader/cygwin-downloader.py (166775 => 166776)
--- trunk/Tools/CygwinDownloader/cygwin-downloader.py 2014-04-04 07:54:40 UTC (rev 166775)
+++ trunk/Tools/CygwinDownloader/cygwin-downloader.py 2014-04-04 08:11:34 UTC (rev 166776)
@@ -44,20 +44,18 @@
def download_package(package, message):
download_url_to_file(package_mirror_url + package["path"], package["path"], message)
-required_packages = frozenset(["apache",
- "bc",
+required_packages = frozenset(["bc",
"bison",
"curl",
"diffutils",
"e2fsprogs",
"emacs",
"flex",
- "gcc",
+ "gcc-g++",
"gperf",
"keychain",
"lighttpd",
"make",
- "minires",
"nano",
"openssh",
"patch",
@@ -72,6 +70,8 @@
"vim",
"zip"])
+required_packages_versions = {"python": "2.6.8-2"}
+
#
# Main
#
@@ -90,7 +90,9 @@
for line in downloaded_packages_file.readlines():
if line[0] == "@":
current_package = line[2:-1]
- packages[current_package] = {"name": current_package, "needs_download": False, "requires": [], "path": ""}
+ packages[current_package] = {"name": current_package, "needs_download": False, "requires": [], "path": "", "version": "", "found_version": False}
+ if current_package in required_packages_versions:
+ packages[current_package]["version"] = required_packages_versions[current_package]
elif line[:10] == "category: ":
if current_package in required_packages:
line = "category: Base\n"
@@ -99,7 +101,13 @@
elif line[:10] == "requires: ":
packages[current_package]["requires"] = line[10:].split()
packages[current_package]["requires"].sort()
- elif line[:9] == "install: " and not len(packages[current_package]["path"]):
+ elif line[:9] == "version: " and not packages[current_package]["found_version"]:
+ if not len(packages[current_package]["version"]):
+ packages[current_package]["version"] = line[9:-1]
+ packages[current_package]["found_version"] = True
+ else:
+ packages[current_package]["found_version"] = (packages[current_package]["version"] == line[9:-1])
+ elif line[:9] == "install: " and packages[current_package]["found_version"] and not len(packages[current_package]["path"]):
end_of_path = line.find(" ", 9)
if end_of_path != -1:
packages[current_package]["path"] = line[9:end_of_path]
