Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: tools/observatory_tool.py

Issue 2346483007: Update observatory_tool.py to remove package-root (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/bots/bot.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/observatory_tool.py
diff --git a/tools/observatory_tool.py b/tools/observatory_tool.py
index 3cd09c9914d300c3cd883aad5ab536cb636d46cf..f54c93d124fb21c94f97d69e903bc013cb4772fe 100755
--- a/tools/observatory_tool.py
+++ b/tools/observatory_tool.py
@@ -48,7 +48,6 @@ def CreateTimestampFile(options):
def BuildArguments():
result = argparse.ArgumentParser(usage=usage)
- result.add_argument("--package-root", help="package root", default=None)
result.add_argument("--dart-executable", help="dart executable", default=None)
result.add_argument("--pub-executable", help="pub executable", default=None)
result.add_argument("--directory", help="observatory root", default=None)
@@ -113,9 +112,8 @@ def ProcessOptions(options, args):
pass
options.pub_snapshot = None
- # We need a dart executable and a package root.
- return (options.package_root is not None and
- options.dart_executable is not None)
+ # We need a dart executable.
+ return (options.dart_executable is not None)
def ChangeDirectory(directory):
os.chdir(directory);
@@ -138,7 +136,6 @@ in the tools/observatory_tool.py script.
def PubCommand(dart_executable,
pub_executable,
pub_snapshot,
- pkg_root,
command,
silent):
with open(os.devnull, 'wb') as silent_sink:
@@ -148,7 +145,7 @@ def PubCommand(dart_executable,
executable = [utils.CheckedInSdkExecutable(), pub_snapshot]
else:
DisplayBootstrapWarning()
- executable = [dart_executable, '--package-root=' + pkg_root, PUB_PATH]
+ executable = [dart_executable, PUB_PATH]
# Prevent the bootstrap Dart executable from running in regular
# development flow.
# REMOVE THE FOLLOWING LINE TO USE the dart_bootstrap binary.
@@ -184,14 +181,12 @@ def ExecuteCommand(options, args):
return PubCommand(options.dart_executable,
options.pub_executable,
options.pub_snapshot,
- options.package_root,
['get', '--offline'],
options.silent)
elif (cmd == 'build'):
return PubCommand(options.dart_executable,
options.pub_executable,
options.pub_snapshot,
- options.package_root,
['build',
'-DOBS_VER=' + utils.GetVersion(),
'--output', args[0]],
@@ -212,8 +207,6 @@ def main():
parser.print_help()
return 1
# Calculate absolute paths before changing directory.
- if (options.package_root != None):
- options.package_root = os.path.abspath(options.package_root)
if (options.dart_executable != None):
options.dart_executable = os.path.abspath(options.dart_executable)
if (options.pub_executable != None):
« no previous file with comments | « tools/bots/bot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698