Merge pull request #184 from Polymer/master

6/17 master -> stable

.gitmodules

@@ -1,10 +1,3 @@
-[submodule "buildbot"]
-	path = buildbot
-	url = https://github.com/Polymer/buildbot.git
 [submodule "tools"]
 	path = tools
 	url = https://github.com/Polymer/tools.git
-[submodule "platform"]
-	path = platform
-	url = https://github.com/Polymer/platform.git
-	branch = master

CONTRIBUTING.md

@@ -8,7 +8,7 @@ We are more than happy to accept external contributions to the project in the fo
 
 Before we can accept patches, there's a quick web form you need to fill out.
 
-- If you're contributing as and individual (e.g. you own the intellectual property), fill out [this form](http://code.google.com/legal/individual-cla-v1.0.html).
+- If you're contributing as an individual (e.g. you own the intellectual property), fill out [this form](http://code.google.com/legal/individual-cla-v1.0.html).
 - If you're contributing under a company, fill out [this form](http://code.google.com/legal/corporate-cla-v1.0.html) instead.
 
 This CLA asserts that contributions are owned by you and that we can license all work under our [license](LICENSE).

build.log

@@ -0,0 +1,41 @@
+BUILD LOG
+---------
+Build Time: 2013-06-17T12:21:13
+
+NODEJS INFORMATION
+==================
+nodejs: v0.10.4
+chai: 1.6.1
+grunt: 0.4.1
+grunt-audit: 0.0.0
+grunt-contrib-uglify: 0.2.2
+grunt-contrib-yuidoc: 0.4.0
+grunt-karma-0.9.1: 0.4.3
+karma: 0.9.2
+karma-chrome-launcher: 0.0.1
+karma-coffee-preprocessor: 0.0.1
+karma-crbot-reporter: 0.0.3
+karma-firefox-launcher: 0.0.2
+karma-jasmine: 0.0.1
+karma-mocha: 0.0.1
+karma-phantomjs-launcher: 0.0.2
+karma-requirejs: 0.0.1
+karma-script-launcher: 0.0.1
+mocha: 1.10.0
+
+REPO REVISIONS
+==============
+polymer: 24689e70b7ebb122909d4ed17b53a2b2a455a2e5
+platform: 569a80ae565a0ecbe01d3a79128021fdf1caaff7
+ShadowDOM: 7a50b20542a559a0ffccb9e3a9330246a1f9fb5f
+HTMLImports: 7960a892cd4461333809605c3806ba4da699b1f0
+CustomElements: 76bfa07e8bfd5ed75c0c14682a66c40600e6baa0
+PointerEvents: 9bab6b80e74fcbbdb4145286aae264ae54175419
+PointerGestures: d6328b1e65daf111720f76b70f6d469a91a96335
+mdv: aaa18dc0069764ec9f25654c949e4a1071f551f2
+
+BUILD HASHES
+============
+polymer.min.js: 434cd0b3e8d81699760c75043ab6f7c5676db006
+polymer.native.min.js: 4f966c0f59a909dd3ac28068f1164016551ec179
+polymer.sandbox.min.js: 7444aba9341f62aeb0d89538ee033c77c16cd0e0

conf/karma.conf.js

@@ -7,21 +7,21 @@
 
 
 // base path, that will be used to resolve files and exclude
-basePath = '../';
+basePath = '../../';
 
 // list of files / patterns to load in the browser
 files = [
-  'tools/test/mocha-htmltest.js',
-  'conf/mocha.conf.js',
-  'node_modules/chai/chai.js',
-  'polymer.js',
-  'test/js/*.js',
-  {pattern: 'tools/**/*.js', included: false},
-  {pattern: 'platform/**/*', included: false},
-  {pattern: 'src/*.js', included: false},
-  {pattern: 'test/**/*.html', included: false},
-  {pattern: 'test/**/*.css', included: false},
-  {pattern: 'test/**/*.js', included: false}
+  'polymer/tools/test/mocha-htmltest.js',
+  'polymer/conf/mocha.conf.js',
+  'polymer/node_modules/chai/chai.js',
+  'polymer/polymer.js',
+  'polymer/test/js/*.js',
+  {pattern: 'platform/*.js', included: false},
+  {pattern: 'polymer/tools/**/*.js', included: false},
+  {pattern: 'polymer/src/*.js', included: false},
+  {pattern: 'polymer/test/**/*.html', included: false},
+  {pattern: 'polymer/test/**/*.css', included: false},
+  {pattern: 'polymer/test/**/*.js', included: false}
 ];
 
 // list of files to exclude

conf/mocha.conf.js

@@ -2,5 +2,5 @@ mocha.setup({
   ui:'tdd',
   slow: 1000,
   timeout: 30000,
-  htmlbase: '/base/test/'
+  htmlbase: '/base/polymer/test/'
 });

gruntfile.js

@@ -5,26 +5,26 @@
  */
 module.exports = function(grunt) {
   Platform = [
-    'platform/platform.min.js'
+    '../platform/platform.min.js'
   ];
 
   PlatformNative = [
-    'platform/platform.native.min.js'
+    '../platform/platform.native.min.js'
   ];
 
   PlatformSandbox = [
-    'platform/platform.sandbox.min.js'
+    '../platform/platform.sandbox.min.js'
   ];
 
   Polymer = [
+    'src/build.js',
     'src/lang.js',
     'src/oop.js',
     'src/register.js',
     'src/base.js',
     'src/trackObservers.js',
     'src/bindProperties.js',
     'src/bindMDV.js',
-    'src/polymerSyntaxMDV.js',
     'src/attrs.js',
     'src/marshal.js',
     'src/events.js',
@@ -77,7 +77,8 @@ module.exports = function(grunt) {
     },
     uglify: {
       options: {
-        banner: '/* Copyright 2013 The Polymer Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. */\n'
+        banner: grunt.file.read('LICENSE'),
+        nonull: true
       },
       Polymer: {
         options: {
@@ -124,16 +125,39 @@ module.exports = function(grunt) {
         }
       }
     },
+    audit: {
+      polymer: {
+        options: {
+          repos: [
+            '.',
+            '../platform',
+            '../ShadowDOM',
+            '../HTMLImports',
+            '../CustomElements',
+            '../PointerEvents',
+            '../PointerGestures',
+            '../mdv'
+          ]
+        },
+        dest: 'build.log',
+        src: [
+          'polymer.min.js',
+          'polymer.native.min.js',
+          'polymer.sandbox.min.js'
+        ]
+      }
+    },
     pkg: grunt.file.readJSON('package.json')
   });
 
   // plugins
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
   grunt.loadNpmTasks('grunt-karma-0.9.1');
+  grunt.loadNpmTasks('grunt-audit');
 
   // tasks
-  grunt.registerTask('default', ['uglify']);
+  grunt.registerTask('default', ['uglify', 'audit']);
   grunt.registerTask('minify', ['uglify']);
   grunt.registerTask('docs', ['yuidoc']);
   grunt.registerTask('test', ['karma:polymer']);

package.json

@@ -10,6 +10,7 @@
     "grunt-karma-0.9.1": "~0.4.3",
     "karma-mocha": "*",
     "karma-script-launcher": "*",
-    "karma-crbot-reporter": "*"
+    "karma-crbot-reporter": "*",
+    "grunt-audit": "~0.0.1"
   }
 }

polymer.js

@@ -9,15 +9,14 @@
 var thisFile = 'polymer.js';
 var scopeName = 'Polymer';
 var modules = [
-  'platform/platform.js',
+  '../platform/platform.js',
   'src/lang.js',
   'src/oop.js',
   'src/register.js',
   'src/base.js',
   'src/trackObservers.js',
   'src/bindProperties.js',
   'src/bindMDV.js',
-  'src/polymerSyntaxMDV.js',
   'src/attrs.js',
   'src/marshal.js',
   'src/events.js',