Clean up systrace a bit.

Extract the various event definitions into a table instead of a
switch statement.

Add a --link-assets option to systrace.py to generate a trace.html
file that has the CSS and JS assets linked in rather than embedded,
which is useful for debugging purposes.

Fixed a bug in the tests for lineRE.

Bug: 6488845
Change-Id: I90634f7144fa0a050b911bb9854e5d5662dd6330

1 files changed, 8 insertions, 46 deletions

diff --git a/update.py b/update.py
index 183949c9..357e1a01 100755
--- a/update.py
+++ b/update.py
@@ -1,50 +1,12 @@
 #!/usr/bin/python
 
-import httplib, urllib, subprocess, sys
-
-js_in_files = (
-  'init.js',
-  'src/shared/js/cr.js',
-  'src/shared/js/cr/event_target.js',
-  'src/shared/js/cr/ui.js',
-  'src/shared/js/cr/ui/focus_outline_manager.js',
-  'src/shared/js/cr/ui/tabs.js',
-  'src/shared/js/util.js',
-  'src/tracing/overlay.js',
-  'src/tracing/tracing_controller.js',
-  'src/tracing/timeline_model.js',
-  'src/tracing/linux_perf_importer.js',
-  'src/tracing/trace_event_importer.js',
-  'src/tracing/sorted_array_utils.js',
-  'src/tracing/measuring_stick.js',
-  'src/tracing/timeline.js',
-  'src/tracing/timeline_analysis.js',
-  'src/tracing/timeline_track.js',
-  'src/tracing/fast_rect_renderer.js',
-  'src/tracing/profiling_view.js',
-  'src/tracing/timeline_view.js',
-)
-
-css_in_files = (
-  'src/shared/css/tabs.css',
-  'src/shared/css/widgets.css',
-  'src/tracing/overlay.css',
-  'src/tracing/profiling_view.css',
-  'src/tracing/timeline_analysis.css',
-  'src/tracing/timeline_view.css',
-  'src/tracing/timeline.css',
-  'src/tracing/tracing_controller.css',
-)
-
-js_out_file = 'script.js'
-
-css_out_file = 'style.css'
+import httplib, urllib, subprocess, sys, config
 
 # Read all the Javascript files.
-js_code = [('js_code', open(f).read()) for f in js_in_files]
+js_code = [('js_code', open(f).read()) for f in config.js_in_files]
 
 # Read all the CSS files and concatenate them.
-css_code = ''.join(open(f).read() for f in css_in_files)
+css_code = ''.join(open(f).read() for f in config.css_in_files)
 
 # Define the parameters for the POST request and encode them in
 # a URL-safe format.
@@ -67,14 +29,14 @@ if response.status != 200:
   print sys.stderr, "error returned from JS compile service: %d" % response.status
   sys.exit(1)
 
-open(js_out_file, 'wt').write(data)
-print 'Generated %s.  Check the file to see if errors occured!' % js_out_file
+open(config.js_out_file, 'wt').write(data)
+print 'Generated %s.  Check the file to see if errors occured!' % config.js_out_file
 
-yuic_args = ['yui-compressor', '--type', 'css', '-o', css_out_file]
+yuic_args = ['yui-compressor', '--type', 'css', '-o', config.css_out_file]
 p = subprocess.Popen(yuic_args, stdin=subprocess.PIPE)
 p.communicate(input=css_code)
 if p.wait() != 0:
-  print 'Failed to generate %s.' % css_out_file
+  print 'Failed to generate %s.' % config.css_out_file
   sys.exit(1)
 
-print 'Generated %s.' % css_out_file
+print 'Generated %s.' % config.css_out_file