Change-Id: Ibaa2802b872fb75cdeff093d4ac7d5d60a206fe3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

This creates a requirement to have pscp / PuTTY installed when
wanting to initialize the upstream repositories on Windows.

Change-Id: I404de5d45c70fd950a284a86403ca47c64826392
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

This prevents accidentally pushing automatically staged upstream
submodules which are meant to be local-only.

Change-Id: I565fe8f3e0157a6623338ba7a236941184a98b8e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

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>

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>

This flag makes it possible to initialize an upstream repository
without applying the QtWebEngine patches, which will be the used
to take a new snapshot, on top of which we will rebase our patches.

Change-Id: I89a6a135bb457edfc31c24a052f1732fb70299dc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

The argument should not be added to the mutually exclusive group
but to the parser itself to make it usable with upstream checkouts
as well.

Change-Id: If2361c7beb0463a471cea9ce01e18a51abeed4ee
Reviewed-by: Jeff Rogers <jrogers@blackberry.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

For developers behind a firewall blocking ssh, the init-repository
script will hang. Add a "--no-gerrit" argument that will skip adding
the gerrit remote and commit hook.

Change-Id: I130a5897f33925876922bbfea4976f24c484ef31
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>

Change-Id: I48dda5ffd6f9a77a0e73bb9c6a62bfe8ebea5733
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

Change-Id: I8df487f3abcdaae9303c8353b6a9f26c88bc6840
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

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>

Let's make sure that the submodule integration succeeds first.

This reverts commit 584a8c3c

.

Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

Later we can add 'win' here as well.

Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

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>

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>

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>

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>

This fixes the ssh error where scp tried to connect to the default
port 22 which timed out.

Change-Id: I7914fafbc3f82eb2c68d52dffb6579d98bcfedd1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

This patch adds --upstream (-u) and --snapshot (-s) flags to the
init-repository script which make it possible to choose the
Chromium sources to use when building QtWebEngine. The default
is to use the upstream submodules.
This option is persisted with git config and used throughout the
build system.
This patch also keeps support for the CHROMIUM_SRC_DIR env
variable which can be used to specify external Chromium
sources which are assumed to be set up for the build and
thus left untouched by the script.

Change-Id: Ic83984199770076f90867f1b22a63b220bfe7359
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

This is needed to prevent .gitmodules changes
from showing up when using the upstream repositories.
It will also prevent changes in submodules from showing
up and being added to a commit by accident.

Change-Id: Ia74f59ebce6d458b39c6ca2472aa6e623cd280fd
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

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>

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>

With this patch init-repository.py will also abort uncommited
git am/merge/rebase sessions and it will do a git reset --hard
on every submodule.

We are no longer executing a 'git submodule update --recursive'
in the patch-chromium.sh script, since init-repository.py
takes care of checking out the proper revisions.

Change-Id: I6cc50944d888ffce5e3d282500dffe3daffecdf4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

On Mac we also want to clone submodules which
have an os tag 'mac'.

Change-Id: Ibed75378767e3489a7b496c77a563464e10ea0a8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

The script now also installs a gerrit git remote
and the Change-Id git hook.
Further it also resets the chromium repository
and applies the patches on top.

Change-Id: Ic0cb0195678e457a9316454d75132798bc5b9de2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

Chromium is not using a regular git submodule based
repository layout. Therefore some special tweaking is
necessary.
This script will take care of setting the correct
submodule paths and references after cloning the
qtwebengine repository.
Further it also downloads and builds the ninja build tool.

Change-Id: I999ef33cbdbe3bfaff88253bb543ba77f5b68fd7
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>