Changeset 171297 in webkit

Timestamp:

Jul 21, 2014 2:04:59 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Simplify make-dist command line arguments
​https://bugs.webkit.org/show_bug.cgi?id=134832

Reviewed by Martin Robinson.

.:

• Source/PlatformGTK.cmake: Use --version instead of

--tarball-root when running make-dist.py.

Tools:
Remove --tarball-root and -o command line options and add
--version, since the version can be used to build both, the
tarball root and the output filename. When the version it's not
provided, the pkg-config file is used to get the version. Also
change the default value of build-dir to the current directory,
since it's very common to call make-dist.py from the build dir.

• gtk/make-dist.py:

(get_tarball_root_and_output_filename_from_arguments):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/PlatformGTK.cmake (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/make-dist.py (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2014-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Simplify make-dist command line arguments
+        https://bugs.webkit.org/show_bug.cgi?id=134832
+
+        Reviewed by Martin Robinson.
+
+        * Source/PlatformGTK.cmake: Use --version instead of
+        --tarball-root when running make-dist.py.
+
 2014-07-18  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/PlatformGTK.cmake

@@ -58 +58 @@
                 --source-dir=${CMAKE_SOURCE_DIR}
                 --build-dir=${CMAKE_BINARY_DIR}
-                --tarball-root=/webkitgtk-${PROJECT_VERSION}
-                -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+                --version=${PROJECT_VERSION}
                 ${TOOLS_DIR}/gtk/manifest.txt
     )
@@ -82 +81 @@
                 --source-dir=${CMAKE_SOURCE_DIR}
                 --build-dir=${CMAKE_BINARY_DIR}
-                --tarball-root=/webkitgtk-${PROJECT_VERSION}
-                -o ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+                --version=/webkitgtk-${PROJECT_VERSION}
                 ${TOOLS_DIR}/gtk/manifest.txt
         COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar

trunk/Tools/ChangeLog

@@ +1 @@
+2014-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Simplify make-dist command line arguments
+        https://bugs.webkit.org/show_bug.cgi?id=134832
+
+        Reviewed by Martin Robinson.
+
+        Remove --tarball-root and -o command line options and add
+        --version, since the version can be used to build both, the
+        tarball root and the output filename. When the version it's not
+        provided, the pkg-config file is used to get the version. Also
+        change the default value of build-dir to the current directory,
+        since it's very common to call make-dist.py from the build dir.
+
+        * gtk/make-dist.py:
+        (get_tarball_root_and_output_filename_from_arguments):
+
 2014-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/gtk/make-dist.py

@@ -265 +265 @@
             setattr(namespace, self.dest, os.path.abspath(values))
 
+    def ensure_version_if_possible(arguments):
+        if arguments.version is not None:
+            return
+
+        pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-3.0.pc")
+        if os.path.isfile(pkgconfig_file):
+            p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
+            version = p.communicate()[0]
+            if version:
+                arguments.version = version.rstrip('\n')
+
+
+    def get_tarball_root_and_output_filename_from_arguments(arguments):
+        tarball_root = "webkitgtk"
+        if arguments.version is not None:
+            tarball_root += '-' + arguments.version
+
+        output_filename = os.path.join(arguments.build_dir, tarball_root + ".tar")
+        return tarball_root, output_filename
+
     parser = argparse.ArgumentParser(description='Build a distribution bundle.')
     parser.add_argument('-c', '--check', action='store_true',
@@ -271 +291 @@
                         help='The top-level directory of the source distribution. ' + \
                               'Directory for relative paths. Defaults to current directory.')
-    parser.add_argument('--tarball-root', type=str, default='/',
-                        help='The top-level path of the tarball. By default files are added to the root of the tarball.')
-    parser.add_argument('-b', '--build-dir', type=str, action=FilePathAction, default=None,
+    parser.add_argument('--version', type=str, default=None,
+                        help='The version of the tarball to generate')
+    parser.add_argument('-b', '--build-dir', type=str, action=FilePathAction, default=os.getcwd(),
                         help='The top-level path of directory of the build root. ' + \
-                              'By default there is no build root.')
-    parser.add_argument('-o', type=str, action=FilePathAction, default='out.tar', dest="output_filename",
-                        help='The tarfile to produce. By default this is "out.tar"')
+                              'By default is the current directory.')
     parser.add_argument('manifest_filename', metavar="manifest", type=str, action=FilePathAction, help='The path to the manifest file.')
 
@@ -287 +305 @@
     os.chdir(arguments.source_dir)
 
-    manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, arguments.tarball_root)
-    manifest.create_tarfile(arguments.output_filename)
+    ensure_version_if_possible(arguments)
+    tarball_root, output_filename = get_tarball_root_and_output_filename_from_arguments(arguments)
+
+    manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, tarball_root)
+    manifest.create_tarfile(output_filename)
 
     if arguments.check:
-        Distcheck(arguments.source_dir, arguments.build_dir).check(arguments.output_filename)
+        Distcheck(arguments.source_dir, arguments.build_dir).check(output_filename)