[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):

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

diff --git a/ChangeLog b/ChangeLog
index 289009f719c04fdff1a625d2b4134ff358c6aa7f..e05b64b7773023ec5c1d2058e6202e3017ab9685 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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>
 
         Add a manual test for r135044

diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
index 759a2c9c2459846744f0a26ba7c928f610c4f20d..dd020e8e97b0257d30c053d4e965e492f720bfeb 100644 (file)
--- a/Source/PlatformGTK.cmake
+++ b/Source/PlatformGTK.cmake
@@ -57,8 +57,7 @@ if (ENABLE_WEBKIT2)
         COMMAND ${TOOLS_DIR}/gtk/make-dist.py
                 --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
     )
 
@@ -81,8 +80,7 @@ if (ENABLE_WEBKIT2)
                 --check
                 --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
     )

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4d718e55336695431b0b87e0f5ca7d15898f4493..1cacbcd8d2cb6a74f5957928c9f77d1b6dae77e1 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+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>
 
         [GTK] Reduce the size of the tarball generated by distcheck

diff --git a/Tools/gtk/make-dist.py b/Tools/gtk/make-dist.py
index 020edcb3a3c735da41cf381274eba1425024226e..9c457cb442a2f7631a2b85fdee38f3acb48ae447 100755 (executable)
--- a/Tools/gtk/make-dist.py
+++ b/Tools/gtk/make-dist.py
@@ -264,19 +264,37 @@ if __name__ == "__main__":
         def __call__(self, parser, namespace, values, option_string=None):
             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',
                         help='Check the tarball')
     parser.add_argument('-s', '--source-dir', type=str, action=FilePathAction, default=os.getcwd(),
                         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.')
 
     arguments = parser.parse_args()
@@ -286,8 +304,11 @@ if __name__ == "__main__":
     # to be the source directory.
     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)