fix directory ambiguity problem in frogpad

tools/testing/frogpad/frogpad.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 """
 Frogpad is used to compile .dart files to javascript.
 
@@ skipping 101 matching lines @@
 
 # Regex that finds #import, #source and #native directives in .dart files.
 #   match.group(1) = "import", "source" or "native"
 #   match.group(2) = url of file being imported
 DIRECTIVE_RE = re.compile(r"^#(import|source|native)\([\"']([^\"']*)[\"']")
 
 # id of script tag that holds name of the top dart file to be compiled,
 # (This file name passed will be passed to the frog compiler by frogpad.dart.)
 MAIN_ID = "main_id"
 
+# id of the script tag that holds the name of the frog directory
+FROGDIR_ID = "frogdir_id"
+
 DART_LIBRARIES = {
     "core": "lib/corelib.dart",
     "coreimpl": "lib/corelib_impl.dart",
     "dom": "../client/dom/frog/dom_frog.dart",
     "html": "../client/html/frog/html_frog.dart",
     "isolate": "../lib/isolate/isolate_frog.dart",
     "json": "../lib/json/json_frog.dart"
 }
 
 class Pad(object):
@@ skipping 84 matching lines @@
 
     match = COMPILATION_ERROR_REGEX.match(js)
     if match:
       sys.exit(1)
 
   def generate_html(self):
     tags = []
     for f in self.id_to_file.values():
       tags.append(self._create_tag(f.id, f.contents))
     tags.append(self._create_tag(MAIN_ID, self.main_file))
+    tags.append(self._create_tag(FROGDIR_ID, self.frog_dir))
     html = HTML.replace("{{script_tags}}", "".join(tags))
     html = html.replace("{{FROGPAD_JS}}", read_file(self.frogpad_js))
     return html
 
   def generate_js(self):
     drt = os.path.join(self.dart_dir, "client/tests/drt/DumpRenderTree")
     if platform.system() == 'Darwin':
       drt += ".app"
     elif platform.system() == 'Windows':
       raise Exception("frogpad does not run on Windows")
@@ skipping 45 matching lines @@
     self.id = self._make_id()
     check_exists(name)
     with open(self.name, "r") as f:
       self.contents = f.read()
 
   def _make_id(self):
     """
     Generates an id (based on the file name) for the <script> tag that will
     hold the contents of this file.
     """
-    (dirname, name) = os.path.split(self.name)
-    dirname = os.path.basename(dirname)
-    name = name.replace(".", "_")
-    return dirname + "_" + name
+    return self.name.replace("/", "_").replace(".", "_")
 
   def directives(self):
     """Load files referenced by #source, #import and #native directives."""
     lines = self.contents.split("\n")
     self.line_number = 0
     for line in lines:
       self.line_number += 1
       self._directive(line)
 
   def _directive(self, line):
@@ skipping 55 matching lines @@
     raise CommandFailedException(msg)
   logging.debug("SUCCEEDED (%d bytes)" % len(stdout))
   return stdout
 
 
 def main(argv):
   Pad(argv)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv))