systrace: rebase against upstream trace-viewer
This changes replaces the use of the Chromium trace viewer code with that of
the trace-viewer project (essentially the Chromium code factored out into its
own project). It updates the update.py script to pull the source from there
and adds an argument to systrace.py to use linked assets from a different
directory to facilitate development of trace-viewer code using systrace to
test.
Change-Id: I5c5a4ce336ce82cd07f1f42e97d4b4cb918ec17a
diff --git a/README b/README
index b61ae6e..e49186b 100644
--- a/README
+++ b/README
@@ -1,15 +1,22 @@
-The src directory contains Chromium source from the following locations:
+The trace-viewer directory contains code from:
- http://src.chromium.org/chrome/trunk/src/chrome/browser/resources/shared/
- http://src.chromium.org/chrome/trunk/src/chrome/browser/resources/tracing/
+ http://trace-viewer.googlecode.com/svn/trunk/
-The file src/UPSTREAM_REVISION contains the upstream revision number that was
-last pulled. There may be local patches applied on top of the upstream source,
-but we should keep those to a minimum.
+The file UPSTREAM_REVISION contains the upstream revision number that was last
+pulled. Changes should be made upstream and then pulled into the trace-viewer
+directory.
-The update.py script should be used to package the CSS and Javascript files in
-the src directory into the style.css and script.js files. These files are
-being checked in, and get embedded in each trace HTML file the systrace.py
-generates. Each time a file in the www directory gets updated, this script
-will need to be rerun, and the generated files must be committed along with the
-changes to the www directory.
+The update.py script should be used to pull the latest upstream code, update
+the UPSTREAM_REVISION file, and package the CSS and Javascript files into
+style.css and script.js, respectively. These generated files are being checked
+into the git repository, and they get embedded in each trace HTML file that
+systrace.py generates.
+
+To make development of trace-viewer code in the context of systrace easier,
+systrace supports arguments to generate HTML files that link to files in a
+trace-viewer development directory rather than embedding the JS and CSS in the
+HTML. Do take advantage of this, you should check out the trace-viewer code in
+a new directory (e.g. trace-viewer-dev) and use systrace as follows:
+
+ $ ./systrace.py --link-assets --asset-dir trace-viewer-dev
+