[Win] Update obsolete packages in cygwin
authoragomez@igalia.com <agomez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Apr 2014 08:11:34 +0000 (08:11 +0000)
committeragomez@igalia.com <agomez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Apr 2014 08:11:34 +0000 (08:11 +0000)
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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@166776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/CygwinDownloader/cygwin-downloader.py
Tools/CygwinDownloader/cygwin-downloader.zip

index 3f81b45..0b64d97 100644 (file)
@@ -1,3 +1,20 @@
+2014-04-04  Andres Gomez  <agomez@igalia.com>
+
+        [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  <pecoraro@apple.com>
 
         check-webkit-style: Improve warnings on Objective-C @property syntax
index 82309b1..cea89f5 100644 (file)
@@ -44,20 +44,18 @@ package_mirror_url = mirror_servers[random.choice(range(len(mirror_servers)))]
 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 @@ required_packages = frozenset(["apache",
                                "vim",
                                "zip"])
 
+required_packages_versions = {"python": "2.6.8-2"}
+
 #
 # Main
 #
@@ -90,7 +90,9 @@ current_package = ''
 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 @@ for line in downloaded_packages_file.readlines():
         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]
index 4c00c56..f8eab4f 100644 (file)
Binary files a/Tools/CygwinDownloader/cygwin-downloader.zip and b/Tools/CygwinDownloader/cygwin-downloader.zip differ