Using chrome's VERSION file for branches, or the svn rev for trunk

Using chrome's VERSION file for branches, or the svn rev for trunk
to decide where to archive to.

BUG=None
TEST=None
R=noelallen@google.com
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=112652

[noelallen_use_chromium, 2011-12-01 01:42:40]

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
File native_client_sdk/src/build_tools/build_utils.py (right):

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:25: print SRC_DIR
debugging info?

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:40: with
open(os.path.join(SRC_DIR, 'chrome', 'VERSION'), 'r') as fh:
Does this hide the e exception so that you get a random MAJOR, MINOR, BUILD,
PATCH possibly?  Although most likely undefined.

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:49: PLATFORM_VERSION =
ChromeVersion()
This might effect the "pepper_XX" string used in the manifest.

[bradn, 2011-12-01 01:52:02]

Ok, PTAL

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
File native_client_sdk/src/build_tools/build_utils.py (right):

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:25: print SRC_DIR
On 2011/12/01 01:42:40, noelallen wrote:
> debugging info?

Done.

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:40: with
open(os.path.join(SRC_DIR, 'chrome', 'VERSION'), 'r') as fh:
On 2011/12/01 01:42:40, noelallen wrote:
> Does this hide the e exception so that you get a random MAJOR, MINOR, BUILD,
> PATCH possibly?  Although most likely undefined.

Done.

http://codereview.chromium.org/8758013/diff/1/native_client_sdk/src/build_too...
native_client_sdk/src/build_tools/build_utils.py:49: PLATFORM_VERSION =
ChromeVersion()
On 2011/12/01 01:42:40, noelallen wrote:
> This might effect the "pepper_XX" string used in the manifest.

Done.

[noelallen_use_chromium, 2011-12-01 20:04:57]

LGTM

[Matt Ball, 2011-12-02 17:31:31]

Looks like this change is causing build bot failures because targets like
sel_ldr depend on the newly deleted DEPS file.  One way to resolve this failure
would be to make these targets depend on Chromium's DEPS file instead.

E.g., in build_tools/build.scons, line 282:


nacl_tools_cmd = env.Command(
  all_tools,
  ['make_nacl_tools.py',
   os.path.join(env['ROOT_DIR'], '..', '..', 'DEPS')],
  build_nacl_tools)


(or the moral equivalent of finding a directory two levels higher)

[bradn, 2011-12-02 17:37:12]

Yeah, just fixed that.
Committed without actually looking at the tryjob I'd run.... :-(

-BradN


On Fri, Dec 2, 2011 at 9:31 AM, <mball@google.com> wrote:

> Looks like this change is causing build bot failures because targets like
> sel_ldr depend on the newly deleted DEPS file.  One way to resolve this
> failure
> would be to make these targets depend on Chromium's DEPS file instead.
>
> E.g., in build_tools/build.scons, line 282:
>
>
> nacl_tools_cmd = env.Command(
>  all_tools,
>  ['make_nacl_tools.py',
>   os.path.join(env['ROOT_DIR'], '..', '..', 'DEPS')],
>  build_nacl_tools)
>
>
> (or the moral equivalent of finding a directory two levels higher)
>
>
http://codereview.chromium.**org/8758013/<http://codereview.chromium.org/8758...
>

[Matt Ball, 2011-12-02 19:03:32]

Somehow, this change also affected the extra_sdk_update_header target by
removing most of the ppapi header files from the SDK.  I'm looking more into
this now...