Embed the PNACL_VERSION into the pnacl_public_pnacl_json file.

Embed the PNACL_VERSION into the pnacl_public_pnacl_json file.

This allows us to read the version number for about:nacl for ChromeOS.

Normally, for component updater we have access to the
extension's manifest.json and we also encode the version in
the parent directory name. For ChromeOS we aren't using
component updater, so neither of those things is available
to us.  Put the version in a place that is readable.

Also move some files from gyp "sources" to "inputs" so that
touching the file will cause a rebuild.  The "sources"
list only affects what shows up in IDEs, and does not
affect the incremental build.

BUG=221381
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216495

[eliben, 2013-08-06 23:05:26]

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:176:
pnacl_template['pnacl-arch'] = arch
Aren't you changing key names here? Does the reader also change?

[jvoung (off chromium), 2013-08-06 23:31:30]

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:176:
pnacl_template['pnacl-arch'] = arch
On 2013/08/06 23:05:26, eliben wrote:
> Aren't you changing key names here? Does the reader also change?

The keys aren't different from what's in the template right now.  The template
used to have a string %(arch)s under the value-part of the dictionary, for the
'pnacl-arch' key.  So, that part looks different.

Rather than repeat the key here and in the template, I was thinking we would
just remove that row from the template?

[Derek Schuff, 2013-08-07 00:49:44]

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:160:
return '1.0.0.%s' % version
the version on my mac says 0.1.0.n and not 1.0.0.n.

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:148:
'--tool_revisions_path=../../../../../native_client/TOOL_REVISIONS',
will <(DEPTH) not work here also?

[jvoung (off chromium), 2013-08-07 16:39:46]

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:160:
return '1.0.0.%s' % version
On 2013/08/07 00:49:44, Derek Schuff wrote:
> the version on my mac says 0.1.0.n and not 1.0.0.n.

I'll stick with 0.1.0.n for now to not change things too much.  At first I was
thinking of going to 1.0.0.n for n > 11852.

Hmm, it looks like n is only allowed to go up to 64K... will try to do something
so we can go further.

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
(right):

https://codereview.chromium.org/22301014/diff/1/ppapi/native_client/src/untru...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:148:
'--tool_revisions_path=../../../../../native_client/TOOL_REVISIONS',
On 2013/08/07 00:49:44, Derek Schuff wrote:
> will <(DEPTH) not work here also?

works too

[Derek Schuff, 2013-08-07 16:54:42]

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:383:
abi_version_quad = args[0]
if the ABI version here is a quad, how is it formatted compared to the bitcode
files (and translation cache) fields where it is just an int? should probably be
mentioned somewhere

[jvoung (off chromium), 2013-08-07 18:26:08]

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:383:
abi_version_quad = args[0]
On 2013/08/07 16:54:42, Derek Schuff wrote:
> if the ABI version here is a quad, how is it formatted compared to the bitcode
> files (and translation cache) fields where it is just an int? should probably
be
> mentioned somewhere

Ah good point.  We didn't hook up the plugin to actually check this value, so we
never noticed.  Since the abi version has nothing to do with extension
system/CWS manifests, we can do something different.

Should we just make it a simple int for now?  I guess I had imagined this would
only change if we wanted to change the ABI or sandbox model.

[Derek Schuff, 2013-08-07 19:19:18]

lgtm

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:383:
abi_version_quad = args[0]
On 2013/08/07 18:26:08, jvoung (cr) wrote:
> Should we just make it a simple int for now?  I guess I had imagined this
would
> only change if we wanted to change the ABI or sandbox model.

I think an int should be fine.

[commit-bot: I haz the power, 2013-08-07 19:46:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jvoung@chromium.org/22301014/28001

[jvoung (off chromium), 2013-08-07 19:54:51]

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
File
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
(right):

https://codereview.chromium.org/22301014/diff/22001/ppapi/native_client/src/u...
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py:383:
abi_version_quad = args[0]
On 2013/08/07 19:19:18, Derek Schuff wrote:
> On 2013/08/07 18:26:08, jvoung (cr) wrote:
> > Should we just make it a simple int for now?  I guess I had imagined this
> would
> > only change if we wanted to change the ABI or sandbox model.
> 
> I think an int should be fine. 


Hmm actually, maybe the abi version should be filled in by the NaCl side?

[jvoung (off chromium), 2013-08-08 16:52:20]

well, I'll go ahead with this to get the pnacl-version so that I can change
about:nacl and we can decide on which repo abi-version comes from

[commit-bot: I haz the power, 2013-08-08 17:29:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jvoung@chromium.org/22301014/46001

[commit-bot: I haz the power, 2013-08-08 23:54:12]

Change committed as 216495