Bug 134832 – [GTK] Simplify make-dist command line arguments

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Carlos Garcia Campos]

It's a bit unconvenient to use, specially when launched manually

[Carlos Garcia Campos]

Created attachment 234762 [details]
Patch

Now I can do:

Release$ ../../Tools/gtk/make-dist.py -s ../../ ../../Tools/gtk/manifest.txt

instead of:

Release$ ../../Tools/gtk/make-dist.py -c -s ../../ --build-dir=./ --tarball-root=/webkitgtk-2.5.1 -o webkitgtk-2.5.1.tar ../../Tools/gtk/manifest.txt

[Martin Robinson]

Comment on attachment 234762 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review

> Tools/gtk/make-dist.py:294
> +        tarball_root = "webkitgtk"

You don't need the leading slash?

[Carlos Garcia Campos]

(In reply to comment #2)
> (From update of attachment 234762 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review
> 
> > Tools/gtk/make-dist.py:294
> > +        tarball_root = "webkitgtk"
> 
> You don't need the leading slash?

No, that's already normalized in the Manifest constructor

[Martin Robinson]

Comment on attachment 234762 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review

Looks good, but consider moving the code that calculate the current version.

> Tools/gtk/make-dist.py:303
> +            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:
> +                    tarball_root += '-' + version.rstrip('\n')

Would it make sense to move to this after argument parsing so that other parts of the code can use arguments.version safely in the future?

[Carlos Garcia Campos]

Committed r171297: <http://trac.webkit.org/changeset/171297>