mirror of
https://github.com/dart-lang/sdk
synced 2024-10-14 12:48:10 +00:00
Remove a few uses of bin/pub
Change-Id: Ie21ecb4ddedf8b5f3d10019525fe1b62992812b1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232094 Reviewed-by: William Hesse <whesse@google.com> Commit-Queue: Michael Thomsen <mit@google.com>
This commit is contained in:
parent
6b830c4428
commit
34b3382e21
|
@ -11,7 +11,6 @@ set -e
|
|||
checkout=$(pwd)
|
||||
export PATH=$checkout/out/ReleaseX64/dart-sdk/bin:$PATH
|
||||
dart=$checkout/out/ReleaseX64/dart-sdk/bin/dart
|
||||
pub=$checkout/out/ReleaseX64/dart-sdk/bin/pub
|
||||
sdk=$checkout/out/ReleaseX64/dart-sdk
|
||||
tmpdir=$(mktemp -d)
|
||||
|
||||
|
|
|
@ -35,10 +35,10 @@ def Main():
|
|||
mode = ('Debug' if options.mode == 'debug' else 'Release')
|
||||
|
||||
out_dir = 'xcodebuild' if sys.platform == 'darwin' else 'out'
|
||||
extension = '' if not sys.platform == 'win32' else '.bat'
|
||||
pub = os.path.abspath('%s/%s%s/dart-sdk/bin/pub%s' %
|
||||
(out_dir, mode, arch, extension))
|
||||
print(pub)
|
||||
extension = '' if not sys.platform == 'win32' else '.exe'
|
||||
dart = os.path.abspath('%s/%s%s/dart-sdk/bin/dart%s' %
|
||||
(out_dir, mode, arch, extension))
|
||||
print(dart)
|
||||
|
||||
working_dir = tempfile.mkdtemp()
|
||||
try:
|
||||
|
@ -49,11 +49,15 @@ def Main():
|
|||
with open(working_dir + '/pubspec.yaml', 'w') as pubspec_yaml:
|
||||
pubspec_yaml.write(PUBSPEC)
|
||||
|
||||
exit_code = subprocess.call([pub, 'get'], cwd=working_dir, env=env)
|
||||
exit_code = subprocess.call([dart, 'pub', 'get'],
|
||||
cwd=working_dir,
|
||||
env=env)
|
||||
if exit_code != 0:
|
||||
return exit_code
|
||||
|
||||
exit_code = subprocess.call([pub, 'upgrade'], cwd=working_dir, env=env)
|
||||
exit_code = subprocess.call([dart, 'pub', 'upgrade'],
|
||||
cwd=working_dir,
|
||||
env=env)
|
||||
if exit_code != 0:
|
||||
return exit_code
|
||||
finally:
|
||||
|
|
Loading…
Reference in a new issue