cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/9] js commit: Revert "[all] Remove remaining usage of builder."
Date Thu, 21 Feb 2013 12:56:01 GMT
Revert "[all] Remove remaining usage of builder."

This reverts commit cded0ad0826489ca07ae8bdd33905a37d40f3adf.


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d4d3d1da
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d4d3d1da
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d4d3d1da

Branch: refs/heads/master
Commit: d4d3d1daad58f91a2001726fc4be10a82306c48a
Parents: 1de6aaf
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Feb 21 07:54:13 2013 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Feb 21 07:54:13 2013 -0500

----------------------------------------------------------------------
 lib/scripts/bootstrap.js |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d4d3d1da/lib/scripts/bootstrap.js
----------------------------------------------------------------------
diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js
index 4206c60..45c70aa 100644
--- a/lib/scripts/bootstrap.js
+++ b/lib/scripts/bootstrap.js
@@ -35,7 +35,12 @@
                  * Create all cordova objects once page has fully loaded and native side
is ready.
                  */
                 channel.join(function() {
-                    var platform = require('cordova/platform');
+                    var builder = require('cordova/builder'),
+                        platform = require('cordova/platform');
+
+                    builder.buildIntoButDoNotClobber(platform.defaults, context);
+                    builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();


Mime
View raw message