Changes between Version 5 and Version 6 of QtWebKitPackaging


Ignore:
Timestamp:
Jun 20, 2011 7:04:54 AM (8 years ago)
Author:
alexis.menard@openbossa.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • QtWebKitPackaging

    v5 v6  
    99The {{{make-package.py}}} tool from http://gitorious.org/qtwebkit/tools is currently used to create source packages. It assumes the availability of the source code in a Git repository.
    1010
    11    1. qmake is run to generate all the automatically generated code in the {{{generated/}}} subdirectories.
     11   1. qmake is run to generate all the automatically generated code in the {{{generated/}}} subdirectories. (make sure your current qmake points to the Qt repository you want to integrate)
    1212   1. Unnecessary files and directories are removed.
    1313   1. The sha1 of the last included commit is stored in {{{.tag}}}, to make it possible to find out from which commit a source package was created from.
     
    1616Calling the tool produces a package from the current git {{{HEAD}}}.
    1717
     18== Integrating Steps ==
     19The {{{integrate-package-into-qt}}} tool from http://gitorious.org/qtwebkit/tools is currently used to import the tarball created to the source tree of Qt.
     20
     21   1. Run the script with the tarball path in parameters.
     22   1. Verify that no extra files are added by mistake (e.g. DerivedSources.pro).
     23   1. Commit and push after checking the changes.
     24
     25Alternatively you can cherry pick particular changes by using {{{webkit-pick-into-qt}}}.
     26
     27