diff options
| author | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 05:19:36 +0000 |
|---|---|---|
| committer | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 05:19:36 +0000 |
| commit | 8bd577eceea8b2861f2b9219fd448f8dae45301b (patch) | |
| tree | 28e64071470678296cd848026f8fd62aac753a0e /ppapi | |
| parent | 1fda25c276fb77bcf7cb471683a2eebb9c9f7850 (diff) | |
| download | chromium_src-8bd577eceea8b2861f2b9219fd448f8dae45301b.zip chromium_src-8bd577eceea8b2861f2b9219fd448f8dae45301b.tar.gz chromium_src-8bd577eceea8b2861f2b9219fd448f8dae45301b.tar.bz2 | |
Don't copy old timestamps when setting up pnacl files.
Otherwise, ninja will think that "output" files are
outdated compared to the "inputs" and need to be re-built.
Just use the latest timestamp.
BUG=242307
TEST= rm -rf out/Release/pnacl && ninja -C out/Release chrome -d explain && ninja -C out/Release chrome -d explain
ninja: Entering directory `out/Release'
ninja explain: output pnacl/pnacl_public_pnacl_json doesn't exist
ninja explain: pnacl/pnacl_public_pnacl_json is dirty
...
[8/8] LINK chrome
ninja: Entering directory `out/Release'
ninja: no work to do.
Review URL: https://chromiumcodereview.appspot.com/15271013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rwxr-xr-x | ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py index ee65a17..18a5ba0 100755 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py @@ -361,7 +361,7 @@ def GeneratePrivateKey(options): [], False) CRXGen.RunCRXGen(options.chrome_path, ext_dir) - shutil.copy2(J(tempdir, 'dummy_extension.pem'), + shutil.copy(J(tempdir, 'dummy_extension.pem'), PnaclDirs.OutputDir()) shutil.rmtree(tempdir) logging.info('\n<<< Fresh key is now in %s/dummy_extension.pem >>>\n' % @@ -392,7 +392,7 @@ def BuildArchCRXForComponentUpdater(version_quad, arch, lib_overrides, if arch in lib_overrides: for override in lib_overrides[arch]: logging.info('Copying override %s to %s' % (override, target_dir)) - shutil.copy2(override, target_dir) + shutil.copy(override, target_dir) # Skip the CRX generation if we are only building the unpacked version # for commandline testing. @@ -507,7 +507,7 @@ def CopyFlattenDirsAndPrefix(src_dir, arch, dest_dir): assert (f == os.path.basename(f)) full_name = J(root, f) target_name = UseWhitelistedChars(f, arch) - shutil.copy2(full_name, J(dest_dir, target_name)) + shutil.copy(full_name, J(dest_dir, target_name)) def BuildArchForInstaller(version_quad, arch, lib_overrides, options): @@ -532,7 +532,7 @@ def BuildArchForInstaller(version_quad, arch, lib_overrides, options): for override in lib_overrides[arch]: override_base = os.path.basename(override) target_name = UseWhitelistedChars(override_base, arch) - shutil.copy2(override, J(target_dir, target_name)) + shutil.copy(override, J(target_dir, target_name)) def BuildInstallerStyle(version_quad, lib_overrides, options): |