summaryrefslogtreecommitdiffstats
path: root/tools/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Update the QtWebEngineCore library to run on top of Chromium 37Jocelyn Turcotte2014-08-141-2/+2
| | | | | | | | | | | | | | | Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the scripts for the snapshot of 37Jocelyn Turcotte2014-08-143-61/+72
| | | | | | | | | | | | | | | - The svn repo string would be something like: ...branches/2062/path_suffix and I want only the branch number in this case. Updated git_submodule.py to support that case and use regexp instead to keep thing a bit simpler. - .isolate are gyp files, moved the exception at the top - Changed some inclusions/exclusions - tools/ is now all excluded by default with exception instead of all included. We don't need most of it. Change-Id: I6d0666d9af7fc6a0f3c4fe866adf2744f13f7c35 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use VisitedLinks component.Pierre Rossi2014-08-081-0/+2
| | | | | | | | | This allows to resolve visited links in the render process. The newly introduced API at the Core layer should allow exposing this functionality to our widgets and Qt quick API layers. Change-Id: I256376afcfe79014dc274e2dddbac1986a884a93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Expose better error information in loadRequest.Pierre Rossi2014-08-041-0/+2
| | | | | | | | | | | | Use the chromium localized error strings for that purpose, otherwise the error description is always empty. While we're at it, let's tap into the chromium error pages, which should hopefully make sense for most errors, and add some static asserts to check that the qt quick enum and the core one are in sync. Change-Id: Icf8fa7c3bf4a674c60a10950422135fb6930447a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* init-repository: pass regexp in raw string to git log --grepAndras Becsi2014-07-181-2/+2
| | | | | | | | | | This prevents python from escaping the special characters that resulted in git not finding the proper shasum for the git-svn-id regular expression line. Change-Id: Ic5449db6319b638cf692d2b4427ce5de7cbac66e Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
* init-repository: fix checkout of pure git repositoriesAndras Becsi2014-07-161-7/+8
| | | | | | | | | | Since some projects are maintained in git repositories only even the 'svn' DEPS file has some git shasums instead of svn revisions. Check the current shasum and tag outside of the ref block so we actually end up checking out the parsed shasum for non-git-svn repositories. Change-Id: Iabc4a5b15e50a0f0df84179a65929352ee2addb7 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Use the version tag when checking out chromiumAndras Becsi2014-07-151-17/+23
| | | | | | | | | | Instead of grepping for the VERSION file update in the git log check out the sha1 that has been tagged with the requested version. Also harden the regexp we use to translate svn revisions to git sha1's and further clean up the findShaAndCheckout function. Change-Id: Iaeb7ebee558b7ebadaf3428e06626736601198cf Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* tools: add reset option to patch_upstream.pyAndras Becsi2014-07-033-1/+41
| | | | | | | | This patch makes it possible to reset the upstream chromium repository to its baseline state. Change-Id: Idff94a0f873e994716f77c83f4c5b79bcd48aec5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* tools: add check_patches.py script for checking patch annotationsAndras Becsi2014-07-031-0/+108
| | | | | | | | | | | | | | | | This script should be ran whenever adding new patches to our chromium snapshot and makes sure we keep the upstream build functional. Having clean patches is beneficial to keep it possible to upstream patches to the Chromium project, and to keep an overview of our changes. An annotation is not needed if the patch is adding files to the chromium snapshot that were removed by take_snapshot.py, thus are already present in the upstream repository. In these cases the non-annotated patch will be ignored by the scripts. Change-Id: I46605c559825d9da2653036e9a12a2a5730330a0 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* tools: move upstream repo utility functions to version_resolver.pyAndras Becsi2014-07-032-50/+61
| | | | | | | This makes it possible to use them in other scripts as well. Change-Id: I8aa76c1a9be91c56fd232a592ac41de5079eb3c7 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix patch_upstream script on WindowsZoltan Arvai2014-06-171-2/+9
| | | | | | | | | | | Preventing failure while applying patches on submodules that are skipped on Windows. Non Windows related submodules are not checked out from upstream repository. This behavior is a workaround for git issues. Change-Id: If34d9d2916829f87c7397a07803f79c156c05c57 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove separately maintained patches from repositoryAndras Becsi2014-06-051-53/+0
| | | | | | | | | | | | | | We maintain them on top of the Chromium snapshot. A new script tools/scripts/patch_upstream.py replaced patches/patch-chromium.sh with the recent snapshot update. The patches that we have on top of the baseline version are prepared from the chromium snapshot and applied on the upstream chromium checkout. A consequence of this is that init-repository.py -u from now on requires a snapshot checkout as well. Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update ninja and bump Chromium version to 33.0.1750.170Andras Becsi2014-06-052-1/+127
| | | | | | | | | | | | | | | | | | | This patch also changes the way we handle our patches. We'll always take a new snapshot without patching Chromium and rebase our patches on top of the snapshot. This removes the need for separate patch files for the ustream repository since we can use the patches of the snapshot and apply them on the upstream checkout if we want to use an upstream build. This makes it easier for us to have branches for the release and maintain and minimize the number of patches we need on top of upstream Chromium. For now a snapshot checkout is needed to be able to prepare the patches for an upstream build but in future we cold improve this to fetch the patches from the remote snapshot repository if needed. Change-Id: I6280ffbe2d50d25d252734bc76d19bfaaa081637 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add update_change_ids.py to update Change-Ids of a set of patchesAndras Becsi2014-06-041-0/+86
| | | | | | | | This will be useful when updating the snapshot and rebasing patches. These patches need updated IDs to keep the gerrit database happy. Change-Id: I62e9fc11a902f57497a2693cc59b873f13cfce12 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove Cygwin from blacklist in snapshot creationZoltan Arvai2014-05-211-1/+0
| | | | | | | | | | Cygwin is still required for build on Windows. It was accidentally blacklisted. Utils in cygwin used by third_party/WebKit build and gyp uses cygwin for wrapping linux style commands on Windows. Change-Id: Ifac069c67ebd1bef2f41618e7688d3b64028517b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the Chromium upstream initialization on Windows.Adam Kallai2014-05-121-2/+6
| | | | | | | | | The Windows git version is not able to check out some extra_os dependencies but since they are not relevant on Windows we can just skip them. Change-Id: I552e0c3a3bf2f26a8e44901ee700d6e19c138b45 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Un-blacklist files needed for WebRTC from chromePierre Rossi2014-04-221-0/+3
| | | | | | | We want to include those in the snapshot in the future. Change-Id: Iee49f64781dba9fb6b7a16eebdf6b2013d410feb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Windows support to snapshot creationZoltan Arvai2014-03-282-8/+36
| | | | | | | | | Extend extra_os with Windows in git_submodule script. Update blacklist in take_snapshot script. This also updates take_snapshot.py for branch 1750. Change-Id: Ie8a1e58534e9f5c2635ed4103d0ae62f804dd5d0 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update patches to stable branch 1750Andras Becsi2014-03-282-6/+16
| | | | | | Change-Id: I85149bf4405420813d07bee5259f11a192e86a73 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
* Improve sanity checking of the parsed DEPS submodulesAndras Becsi2014-03-202-35/+41
| | | | | | | | | | | | | This is in preparation of updating to the new stable branch 1750 (Chromium version 33.0.1750.x) Move the sanityCheckModules function to version_resolver.py and check if the parsed svn refs exist in the remote git repository. If they do not exist fall back to the git shasum we parsed from the .DEPS.git file. This patch also removes the unused parseFile function. Change-Id: Ie0c11fdd9326ee87e9dcc670c0a7c26f9a498fd5 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Make it easier to update patches and apply them manuallyJocelyn Turcotte2014-02-031-0/+53
| | | | | | | | | | | | | | Clean the way that we maintain patches by keeping them ordered by their number and let the shell order them when giving the list to git am. Provide a update-patches.sh that maintains the proper command lines to use and run a cleaning script on the resulting patch to avoid the SHA1 to be added to the file as it changes every time the patch is applied. Change-Id: Ia93cf4b35f5f847a8723a31fc476443864242737 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix package builds against release builds of QtSimon Hausmann2014-01-271-4/+25
| | | | | | | | | | | | | The Qt build system assumes that when building a module against a release build of Qt, syncqt was already run at package creation time. So we have to run syncqt when creating source packages. This patch changes the syntax to separate the file name base from the package version to use. Change-Id: I4ffb4a7d9d8e8e0a1d681dfb9d337b8ab9f76d9a Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Small fixes to the packaging scriptSimon Hausmann2014-01-271-2/+9
| | | | | | | | | | * Add a .tag file to the archive that contains the sha1 the package was created from. This is useful for diagnostics. * Use bash and enforce error handling (it's easy to accidentally include bashisms) Change-Id: I217942da2e985772567da91a7635e5e81533ca95 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* 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>
* 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>
* 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>
* 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-281-4/+4
| | | | | | | | | | | | | | | | | | | 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-282-0/+444
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 09:27:40 +0000