Dartium 37 to bleeding edge

Dartium 37 to bleeding edge

Pending windows-full bot...

R=whesse@google.com

Committed: https://code.google.com/p/dart/source/detail?r=38778

[ricow1, 2014-07-30 12:03:12]

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
File dartium.deps/DEPS.chromium (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS.chromium:52: "v8_branch": "trunk",
I think this deps file is wrong, and the reason I think so is because of the
line above. Did we take the chromium deps file a branch point instead of the
last released versions DEPS file (as discussed in mail thread before I went on
vacation)

[ricow1, 2014-07-30 12:04:32]

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
File dartium.deps/DEPS (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS:12: "dartium_chromium_branch":
"/chrome/branches/dart/dartium/src",
this seems strange

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS:16: "dartium_webkit_branch": "/blink/branches/dart/dartium",
this also seems strange

[Bill Hesse, 2014-07-30 12:38:31]

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
File dartium.deps/DEPS (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS:12: "dartium_chromium_branch":
"/chrome/branches/dart/dartium/src",
On 2014/07/30 12:04:32, ricow1 wrote:
> this seems strange

dartium_chromium_revision is the rev of the dartium branch we want to build.
chromium_base_revision is the rev of the chromium branch the dartium branch is
cloned from.

We need to change it to a list of hashes, as in multivm.deps/DEPS.

[vsm, 2014-07-30 12:41:15]

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
File dartium.deps/DEPS (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS:12: "dartium_chromium_branch":
"/chrome/branches/dart/dartium/src",
On 2014/07/30 12:04:32, ricow1 wrote:
> this seems strange

Yes, we're moving to a new scheme.  We'll have the following branches for chrome
and blink:

- dartium : This is essentially our bleeding edge, tracking chrome trunk and
blink multivm.  For now, we'll only roll it to beta branch points (from the
upstream trunk).

- 2062 : This is the Chrome 37 branch.  We'll create this from chrome and blink
before 1.6 goes stable.  All beta patches will be applied here.

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
File dartium.deps/DEPS.chromium (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS.chromium:52: "v8_branch": "trunk",
This should match Chrome trunk at the branch point for 2062 (i.e., the base of
2062).

On 2014/07/30 12:03:12, ricow1 wrote:
> I think this deps file is wrong, and the reason I think so is because of the
> line above. Did we take the chromium deps file a branch point instead of the
> last released versions DEPS file (as discussed in mail thread before I went on
> vacation)

[vsm, 2014-07-30 12:47:26]

On 2014/07/30 12:38:31, Bill Hesse wrote:
> https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
> File dartium.deps/DEPS (right):
> 
>
https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
> dartium.deps/DEPS:12: "dartium_chromium_branch":
> "/chrome/branches/dart/dartium/src",
> On 2014/07/30 12:04:32, ricow1 wrote:
> > this seems strange
> 
> dartium_chromium_revision is the rev of the dartium branch we want to build.
> chromium_base_revision is the rev of the chromium branch the dartium branch is
> cloned from.
> 
> We need to change it to a list of hashes, as in multivm.deps/DEPS.

Is this the right one (the updated version on the right)?  I.e., corresponding
to chromium_base_revision 278856.

https://code.google.com/p/dart/source/diff?spec=svn37941&r=37941&format=side&...

[Bill Hesse, 2014-07-30 12:52:30]

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
File dartium.deps/DEPS (right):

https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
dartium.deps/DEPS:14: "chromium_base_revision": "278856",
This should be changed to

  # Git hash for archived builds closest to r278856
  "chromium_base_revision":
      '{"Windows": "37fde6a752162681ce6b62f1a96683483f2df596", ' +
      ' "Darwin": "db25a7e9bf34e638a1cbb4c8974ca566c22eb62c", ' +
      ' "Linux": "abe29e2ae1ad6d9bd8a7bfa23b3316a203d39ef2"}',

because the snapshots are now saved under names using their git hash, not their
svn revision number, and our code has been modified to use hashes.

[vsm, 2014-07-30 13:00:37]

On 2014/07/30 12:52:30, Bill Hesse wrote:
> https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS
> File dartium.deps/DEPS (right):
> 
>
https://chromiumcodereview.appspot.com/429073003/diff/20001/dartium.deps/DEPS...
> dartium.deps/DEPS:14: "chromium_base_revision": "278856",
> This should be changed to
> 
>   # Git hash for archived builds closest to r278856
>   "chromium_base_revision":
>       '{"Windows": "37fde6a752162681ce6b62f1a96683483f2df596", ' +
>       ' "Darwin": "db25a7e9bf34e638a1cbb4c8974ca566c22eb62c", ' +
>       ' "Linux": "abe29e2ae1ad6d9bd8a7bfa23b3316a203d39ef2"}',
> 
> because the snapshots are now saved under names using their git hash, not
their
> svn revision number, and our code has been modified to use hashes.

PTAL

[Bill Hesse, 2014-07-30 13:07:51]

Looks good to me, especially the chromium_base hashes.  LGTM.

[kustermann, 2014-07-30 13:29:46]

DBC

https://chromiumcodereview.appspot.com/429073003/diff/40001/dartium.deps/DEPS
File dartium.deps/DEPS (left):

https://chromiumcodereview.appspot.com/429073003/diff/40001/dartium.deps/DEPS...
dartium.deps/DEPS:20: "fake_async_rev": "@38614",
see comment below

https://chromiumcodereview.appspot.com/429073003/diff/40001/dartium.deps/DEPS...
dartium.deps/DEPS:55: "/third_party/fake_async" + Var("fake_async_rev"),
I think you should not remove this one. It was recently added. nweiz wanted this
because she uses it for some pkg testing ...

[vsm, 2014-07-30 13:36:49]

https://chromiumcodereview.appspot.com/429073003/diff/40001/dartium.deps/DEPS
File dartium.deps/DEPS (left):

https://chromiumcodereview.appspot.com/429073003/diff/40001/dartium.deps/DEPS...
dartium.deps/DEPS:55: "/third_party/fake_async" + Var("fake_async_rev"),
Done.  Thanks for the catch.

On 2014/07/30 13:29:46, kustermann wrote:
> I think you should not remove this one. It was recently added. nweiz wanted
this
> because she uses it for some pkg testing ...

[vsm, 2014-07-31 14:25:52]

Committed patchset #5 manually as r38778 (presubmit successful).