summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Add script to generate tarballs for releases.Zeno Albisser2014-01-131-0/+65
| | | | | | Change-Id: I14dbc2d4770cb0efe9a227e4f113e83c50e00283 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Minor correction of log message in qtwebengine_utils.py.Zeno Albisser2014-01-131-1/+1
| | | | | Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Handle exception thrown by subprocess.check_output.Michael BrĂ¼ning2014-01-131-2/+5
| | | | | | | | | The || true syntax does not work on Windows. Also, normalize the paths to the underlying OS style. Change-Id: Ie13d2646fe239fccb9ab7b558a6c8d56b779b206 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Little cleanup in take_snapshot.py scriptPierre Rossi2014-01-101-6/+0
| | | | | | | Removing some duplicate lines Change-Id: I92059eb42cedf5f912a595bbab4a73a1011d6dae Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add placeholders for missing repack_locales switchesAndras Becsi2014-01-101-0/+4
| | | | | | | | | | | | | On some embedded setups and Windows unittest targets bring in new locale repack actions which use the -g and -b switches of repack_locals.py with @pymod_do_main. Since we did not implement these options the script execution failed. Add placeholders for these options. Change-Id: Ie11928b025448bc059fb1e3f2e695fb7698a7937 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Improve init-repository.py to fetch up-to-date dependency listAndras Becsi2013-12-203-83/+303
| | | | | | | | | | | | | | | | | | | | | This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: I333ada4250999b442cd244821818bace9e6136f4 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update take_snapshot.pyAndras Becsi2013-12-172-16/+73
| | | | | | | | | Add additional conditions to the blacklist function so that we include files needed for Boot2Qt-Android but exclude other files not needed for the build. Change-Id: I7cda448a943dc776ad6d29c872048cf256da599e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Improve init-repository.py to fetch up-to-date dependency list"Jocelyn Turcotte2013-12-163-303/+83
| | | | | | | | | Let's make sure that the submodule integration succeeds first. This reverts commit 584a8c3c637997fbb6772ab75aea1bd587b82a37. Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove --android and download the android and mac files by defaultAndras Becsi2013-12-131-1/+1
| | | | | | | Later we can add 'win' here as well. Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Improve init-repository.py to fetch up-to-date dependency listAndras Becsi2013-12-133-83/+303
| | | | | | | | | | | | | | | | | | | | | This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: Ibbf565f876af79dc008bcd161fddcbdd8bc73977 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix wrong cwd in getChromiumSrcDir().Zoltan Arvai2013-12-101-0/+4
| | | | | | | | | | | | | | | Working directory can be wrong when calling getChromiumSrcDir. On Windows cwd is inside Chrome source directory when it called from repack_locales.py that causes git config to return empty value. This causes the function to fall back to snapshot directory even if upstream is used. Changing cwd to qtwebengine_root, running git config and restoring original cwd resolves the problem. Change-Id: I1bef84ce791f63d3c9e7d6c9506e99c0c53cfc3e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Unify the inclusion of *_extra.gypi files from src/coreAndras Becsi2013-12-031-5/+6
| | | | | | | | This makes it possible to use drop-in files for platform specific options needed for example for Boot2Qt. Change-Id: If9db228ac4be414bfea6f4eafe5199ffee495a48 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Python correctnessPierre Rossi2013-12-031-2/+2
| | | | | | | sys.path.insert(0,... can be harmful, let's not take that chance Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the process we install to libexecPierre Rossi2013-12-031-14/+0
| | | | | | | | | Via QLibraryInfo. Also pick the name from qmake, and drop the hardcoded value. Add better error reporting when this fails. Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get localized strings in the render processPierre Rossi2013-12-033-12/+271
| | | | | | | | Building on top of the repacking of .pak files, we now ship the whole array of repacked locales and pick the appropriate one at runtime. Change-Id: I0096e3eac6a1fc83885fd11e0fa55a746f8e45d8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Ship repacked .pak filesPierre Rossi2013-12-033-123/+2
| | | | | | | | | | | | | We used to wrap various .pak files in qrc files, but it turns out to be very memory inefficient compared to chromium's approach of mmaping those files. Drop the pak->qrc logic and instead add some pure gyp targets to repack the resources. We then install those with qmake and look them up with QLibraryInfo. Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Gratuitous .prf cleanupPierre Rossi2013-11-291-1/+1
| | | | | Change-Id: I6b4d1ec92b3adc2145a1f2aeec7038eac079d4e8 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use $$clean_pathPierre Rossi2013-11-291-2/+1
| | | | | | | Seems more robust than a regexp, and the right thing to use in this case. Change-Id: I1ca320606c50fb3d5f593025e23b3e08ae77a124 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add cygwin support to init-repository.Zoltan Arvai2013-11-291-1/+1
| | | | | | | | | Git submodule works only with cygwin on Windows. MSys Git has problems with long paths. So matchesOS needs to identify cygwin environment as Windows to get the right submodules. Change-Id: Ie7acfaa4d1ef3d891710a39651049c4e5a9f3570 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-286-23/+24
| | | | | | | | | | | | | | | | | | | NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Moving sources to src part 1: Move files.Jocelyn Turcotte2013-11-2810-0/+657
| | | | | | | | | | | | | | | | | | | | | | | | | | | This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since <ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>. - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* rename export_from_git.py to take_snapshot.pyZeno Albisser2013-11-011-0/+0
| | | | | Change-Id: I08edcd97e9e2c38d9984b8ed2fbc9b64c88f8dd5 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Change export_from_git.py to take foll snapshots from upstream.Zeno Albisser2013-11-011-91/+105
| | | | | | | | | | | | | | | | | | | The updating procedure for chromium is now as follows: - update 3rdparty_upstream to the requested state for the snapshot - initialize 3rdparty submodule by executing git submodule init -- 3rdparty git submodule update -- 3rdparty - execute the export_from_git.py script from the QtWebEngine top level directory. - do a "git commit -a" in 3rdparty/ and write an appropriate commit message mentioning the exact state from where the snapshot was taken from. - do a "git show" to double check the changes for the snapshot look reasonable. - push the changes to the 3rdparty repository. Change-Id: I7806d284c9a146f857600cfef0face8331af646a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Early return if no submodules were found using DEPS filesAndras Becsi2013-10-291-1/+4
| | | | | | | | While we're at it, also remove a stray currentDir variable in readSubmodules. Change-Id: Ia814906597f436513c4e57ed487ba478154eee4f Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Implement subprocessCall and subprocessCheckOutput.Zeno Albisser2013-10-291-13/+21
| | | | | | | | | These functions are shims for subprocess.call and subprocess.check_output and allow to display the command being executed on screen as well. Change-Id: I9507b8b4f0c006572211620c935e673f848dbbbc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Implement parsing of Chromium .DEPS files.Zeno Albisser2013-10-291-9/+88
| | | | | | | | | | | | | | | | This is necessary to be able to checkout a chromium release branch. Chromium release branches do not make use of git submodule. Instead the dependencies or submodules are specified in a .DEPS.git file. Given some python scopes and callbacks for resolving variables, such a file can be invoked like a python script. The dependencies will then be exported into the provided scopes and we can use that information to initialize git submodules. Change-Id: Ibab09b1077720b73f89efff16d38b308f31cf2ab Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Remove debug output left in tools/git_submodule.py by accidentAndras Becsi2013-10-011-2/+0
| | | | | Change-Id: I7dd9f77c131afdaaae476a8574bae114540f1ee6 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add --android argument to the init-repository.py scriptAndras Becsi2013-10-011-0/+7
| | | | | | | | | This option initializes the upstream chromium repository and additionally to the submodules needed for the matching OS it also clones submodules needed for Android. Change-Id: I1df84973aabc10f5c839bc4e3db7c6024f2c5145 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update init-repository.py to allow using upstream chromium repository.Zeno Albisser2013-08-191-32/+34
| | | | | | | | | | | | | | | | | | | | The regular workflow now is just to clone the qtwebengine repository and then execute the following commands. git submodule init && git submodule update --recursive && qmake && make This will also clone a submodule called 3rdparty which contains the chromium and ninja sources without pulling in further submodules and without a complete history. Developers that do want to have a complete chromium checkout instead should not use the above command sequence. Instead they should just clone qtwebengine, execute the init-repository.py script, run qmake and make. The init-repository.py script will then checkout the complete chromium sources into a subdirectory called 3rdparty_upstream. The location of these sources will be picked up by qmake automatically. Change-Id: I0fa4f1d554bdca2e852b6a97aa2e5462d90d8664 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add export_from_git.py to take snapshots from chromium and ninja.Zeno Albisser2013-08-162-0/+333
Split out the Submodule class and related functions from init-repository.py into a separate python module git_submodule.py. This is necessary in order to reuse the code for the export script. The export_from_git.py script can be used to export files from a git repository into an arbitrary directory. It spiders submodules and applies some pattern matching to remove unwanted files. This script can be used to create flattened chromium snapshots to be used in our CI system. Change-Id: Iade8126fae6c28b5347c9d6e08941e28d3e0e7be Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>