Commit e26b857b authored by noelallen@google.com's avatar noelallen@google.com

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
parent 8cf51277
...@@ -558,6 +558,7 @@ def main(args): ...@@ -558,6 +558,7 @@ def main(args):
parser.error('Incompatible arguments with archive.') parser.error('Incompatible arguments with archive.')
pepper_ver = str(int(build_utils.ChromeMajorVersion())) pepper_ver = str(int(build_utils.ChromeMajorVersion()))
pepper_old = str(int(build_utils.ChromeMajorVersion()) - 1)
clnumber = lastchange.FetchVersionInfo(None).revision clnumber = lastchange.FetchVersionInfo(None).revision
if options.release: if options.release:
pepper_ver = options.release pepper_ver = options.release
...@@ -568,9 +569,11 @@ def main(args): ...@@ -568,9 +569,11 @@ def main(args):
buildbot_common.Run(['gclient', 'runhooks'], buildbot_common.Run(['gclient', 'runhooks'],
cwd=SRC_DIR, shell=(platform=='win')) cwd=SRC_DIR, shell=(platform=='win'))
buildbot_common.BuildStep('Clean Pepper Dirs')
pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver) 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: if not skip_untar:
buildbot_common.BuildStep('Clean Pepper Dir')
buildbot_common.RemoveDir(pepperdir) buildbot_common.RemoveDir(pepperdir)
buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain')) buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain'))
buildbot_common.MakeDir(os.path.join(pepperdir, 'tools')) buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
...@@ -599,6 +602,13 @@ def main(args): ...@@ -599,6 +602,13 @@ def main(args):
buildbot_common.BuildStep('Add MAKE') buildbot_common.BuildStep('Add MAKE')
http_download.HttpDownload(GSTORE + MAKE, http_download.HttpDownload(GSTORE + MAKE,
os.path.join(pepperdir, 'tools' ,'make.exe')) 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: if not skip_examples:
CopyExamples(pepperdir, toolchains) CopyExamples(pepperdir, toolchains)
......
@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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment