diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 22:07:59 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 22:07:59 +0000 |
| commit | e26b857b08bf3f753651edc8e4eed5b656aacb52 (patch) | |
| tree | 5ed76b8c97aab4ec0a660e2a28ba1935b36feebd | |
| parent | 8cf51277d50fe545918ba3ef3a376f6fadeca83f (diff) | |
| download | chromium_src-e26b857b08bf3f753651edc8e4eed5b656aacb52.zip chromium_src-e26b857b08bf3f753651edc8e4eed5b656aacb52.tar.gz chromium_src-e26b857b08bf3f753651edc8e4eed5b656aacb52.tar.bz2 | |
Missing .exe in windows build.
The scons build is failing to copy the extension when putting exe in the
tools output directory.
Added batch file to simplify tries on Windows.
BUG=125762
Review URL: https://chromiumcodereview.appspot.com/10260032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134798 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 12 | ||||
| -rw-r--r-- | native_client_sdk/src/sdktry.bat | 12 |
2 files changed, 23 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index feec61e..3d673ec 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -558,6 +558,7 @@ def main(args): parser.error('Incompatible arguments with archive.') pepper_ver = str(int(build_utils.ChromeMajorVersion())) + pepper_old = str(int(build_utils.ChromeMajorVersion()) - 1) clnumber = lastchange.FetchVersionInfo(None).revision if options.release: pepper_ver = options.release @@ -568,9 +569,11 @@ def main(args): buildbot_common.Run(['gclient', 'runhooks'], cwd=SRC_DIR, shell=(platform=='win')) + buildbot_common.BuildStep('Clean Pepper Dirs') pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver) + pepperold = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_old) + buildbot_common.RemoveDir(pepperold) if not skip_untar: - buildbot_common.BuildStep('Clean Pepper Dir') buildbot_common.RemoveDir(pepperdir) buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain')) buildbot_common.MakeDir(os.path.join(pepperdir, 'tools')) @@ -599,6 +602,13 @@ def main(args): buildbot_common.BuildStep('Add MAKE') http_download.HttpDownload(GSTORE + MAKE, os.path.join(pepperdir, 'tools' ,'make.exe')) + rename_list = ['ncval_x86_32', 'ncval_x86_64', + 'sel_ldr_x86_32', 'sel_ldr_x86_64'] + tools = os.path.join(pepperdir, 'tools') + for name in rename_list: + src = os.path.join(pepperdir, 'tools', name) + dst = os.path.join(pepperdir, 'tools', name + '.exe') + buildbot_common.Move(src, dst) if not skip_examples: CopyExamples(pepperdir, toolchains) diff --git a/native_client_sdk/src/sdktry.bat b/native_client_sdk/src/sdktry.bat new file mode 100644 index 0000000..d16b1d8 --- /dev/null +++ b/native_client_sdk/src/sdktry.bat @@ -0,0 +1,12 @@ +@echo off + +:: Copyright (c) 2012 The The Chromium Authors. All rights reserved. +:: Use of this source code is governed by a BSD-style license that can be +:: found in the LICENSE file. + +setlocal + +:: TODO(noelallen) Share list with POSIX +gcl try %* -b naclsdkm-mac -b naclsdkm-linux -b naclsdkm-linux ^ +-b naclsdkm-pnacl-linux -b naclsdkm-pnacl-mac -b naclsdkm-windows32 ^ +-b naclsdkm-windows64 -S svn://svn.chromium.org/chrome-try/try-nacl
\ No newline at end of file |