[Plplot-cvs] SF.net SVN: plplot:[12443] trunk/cmake/build_projects/gtk_transform.py

[<ai...@us...>]

Revision: 12443
          http://sourceforge.net/p/plplot/code/12443
Author:   airwin
Date:     2013-07-31 01:45:12 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Do more complete processing of data in the generated
gtk_packages<version>.xml file, and all special processing of
particular dependencies is now dropped, i.e., gtk-doc is now allowed
to be a valid dependency.

(For more on gtk_packages<version>.xml see README.) The additional
processing includes collecting make arguments data, deciding on
whether non-srcdir-builds are allowed, deciding on whether parallel
builds are allowed, and replacing "${version}" if it occurs in the URL
by the value of the version attribute.  

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_transform.py

Modified: trunk/cmake/build_projects/gtk_transform.py
===================================================================
--- trunk/cmake/build_projects/gtk_transform.py	2013-07-31 01:31:26 UTC (rev 12442)
+++ trunk/cmake/build_projects/gtk_transform.py	2013-07-31 01:45:12 UTC (rev 12443)
@@ -48,14 +48,42 @@
     config_type = package.tag
     if config_type == "autotools":
         config_arguments = package.get("autogenargs")
+
+        make_arguments = package.get("makeargs")
+        if make_arguments == None:
+            make_arguments = ""
+
+        supports_non_srcdir_builds = package.get("supports-non-srcdir-builds")
+        if supports_non_srcdir_builds == "no":
+           supports_non_srcdir_builds = "OFF"
+        else:
+           supports_non_srcdir_builds = "ON" 
+
+        supports_parallel_builds = package.get("supports-parallel-builds")
+        if supports_parallel_builds == "no":
+           supports_parallel_builds = "OFF"
+        else:
+           supports_parallel_builds = "ON" 
     elif config_type == "cmake":
         config_arguments = package.get("cmakeargs")
+        make_arguments = ""
+        # Assume both non-source builds and parallel builds work for
+        # CMake-based build systems.
+        supports_non_srcdir_builds = "ON" 
+        supports_parallel_builds = "ON" 
     elif config_type == "tarball":
         config_arguments = ""
+        make_arguments = ""
+        # Assume both non-source builds and parallel builds work for
+        # the tarball config type.  This may require review.
+        supports_non_srcdir_builds = "ON" 
+        supports_parallel_builds = "ON" 
     else:
         return None
+
     if config_arguments == None:
         config_arguments = ""
+
     # Parse branch or source element of package
     if config_type == "tarball":
         branch = package.findall("source[@hash]")
@@ -98,9 +126,17 @@
         # Make sure there is a trailing "/" on the repo
         index = download_repo.rfind("/")
         if len(download_repo)-1 != index:
-            download_repo = download_rep + "/"
+            download_repo = download_repo + "/"
         download_href = download_repo + download_module
     
+    # Replace ${version} string that is sometimes in download_href
+    index = download_href.find("${version}")
+    if index >=0:
+        version = branch.get("version")
+        if version == None:
+            return None
+        download_href = download_href.replace("${version}", version)
+    
     # Parse various kinds of jhbuild dependencies.
     # Note from 
     # http://stackoverflow.com/questions/9974957/what-is-the-after-element-used-for-in-jhbuild
@@ -141,14 +177,6 @@
         for dep_element in package.findall("after/dep"):
             after[dep_element.get("package")] = None
     
-    # As a temporary? measure drop all references to gtk-doc
-    if dependencies.has_key("gtk-doc"):
-        del dependencies["gtk-doc"]
-    if suggests.has_key("gtk-doc"):
-        del suggests["gtk-doc"]
-    if after.has_key("gtk-doc"):
-        del after["gtk-doc"]
-
     if if_dependencies:
         overall_dependencies = {}
         overall_dependencies.update(dependencies)
@@ -178,7 +206,10 @@
     else:
         sys.stdout.write(id + "\n")
         sys.stdout.write(config_type + "\n")
+        sys.stdout.write(supports_non_srcdir_builds + "\n")
+        sys.stdout.write(supports_parallel_builds + "\n")
         sys.stdout.write(config_arguments + "\n")
+        sys.stdout.write(make_arguments + "\n")
         sys.stdout.write(download_hash_type + "\n")
         sys.stdout.write(download_hash + "\n")
         sys.stdout.write(download_href + "\n")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.