Merge pull request #174 from Polymer/flattened-repos

Flatten repos
Polymer · Jun 7, 2013 · e92d318 · e92d318
2 parents 5fdfb68 + 6877360
commit e92d318
Show file tree

Hide file tree

Showing 17 changed files with 491 additions and 496 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,8 +3,4 @@
 	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
+	url = https://github.com/Polymer/tools.git
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
@@ -17,7 +17,6 @@ files = [
   '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},

diff --git a/gruntfile.js b/gruntfile.js
@@ -5,15 +5,15 @@
  */
 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 = [

diff --git a/platform b/platform
diff --git a/polymer.js b/polymer.js
@@ -9,7 +9,7 @@
 var thisFile = 'polymer.js';
 var scopeName = 'Polymer';
 var modules = [
-  'platform/platform.js',
+  '../platform/platform.js',
   'src/lang.js',
   'src/oop.js',
   'src/register.js',

diff --git a/polymer.min.js b/polymer.min.js
diff --git a/polymer.min.js.map b/polymer.min.js.map
diff --git a/polymer.native.min.js b/polymer.native.min.js
diff --git a/polymer.native.min.js.map b/polymer.native.min.js.map