Add full content of modules to frameworkModules.js Reviewed by Eric Li <[email protected]> Tested by Tracy Li <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/2fa00c43 Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/2fa00c43 Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/2fa00c43 Branch: refs/heads/master Commit: 2fa00c43bef0eda0ab199d9456fb032939f04ab8 Parents: 70152ad Author: Jeffrey Heifetz <[email protected]> Authored: Wed Apr 3 14:23:08 2013 -0400 Committer: Bryan Higgins <[email protected]> Committed: Fri May 3 10:13:30 2013 -0400 ---------------------------------------------------------------------- .../templates/project/cordova/lib/file-manager.js | 17 +++++++++++--- 1 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2fa00c43/blackberry10/bin/templates/project/cordova/lib/file-manager.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/templates/project/cordova/lib/file-manager.js b/blackberry10/bin/templates/project/cordova/lib/file-manager.js index 3ce3f15..3f9e92b 100755 --- a/blackberry10/bin/templates/project/cordova/lib/file-manager.js +++ b/blackberry10/bin/templates/project/cordova/lib/file-manager.js @@ -134,7 +134,7 @@ function getModulesArray(dest, files, baseDir) { if (!fs.statSync(file).isDirectory()) { if (baseDir !== dest.EXT || !isExcluded(file)) { - modulesList.push(path.relative(path.normalize(dest.CHROME), file).replace(/\\/g, "/")); + modulesList.push({name: path.relative(path.normalize(dest.CHROME), file).replace(/\\/g, "/"), file: file}); } } }); @@ -145,7 +145,8 @@ function getModulesArray(dest, files, baseDir) { function generateFrameworkModulesJS(session) { var dest = session.sourcePaths, modulesList = [], - modulesStr = "var frameworkModules = ", + modulesStr = "(function () { ", + frameworkModulesStr = "window.frameworkModules = [", libFiles = wrench.readdirSyncRecursive(dest.LIB), extFiles, extModules; @@ -158,8 +159,16 @@ function generateFrameworkModulesJS(session) { modulesList = modulesList.concat(extModules); } - modulesStr += JSON.stringify(modulesList, null, " ") + ";"; - fs.writeFileSync(path.normalize(dest.CHROME + "/frameworkModules.js"), modulesStr); + modulesList.forEach(function (module, index) { + modulesStr += "define('" + module.name + "', function (require, exports, module) {\n" + + fs.readFileSync(module.file, "utf-8") + "\n" + + "});\n"; + frameworkModulesStr += "'" + module.name + "'" + (index !== modulesList.length-1 ? ", " : ""); + }); + + modulesStr += "}());"; + frameworkModulesStr += "];\n"; + fs.writeFileSync(path.normalize(dest.CHROME + "/frameworkModules.js"), frameworkModulesStr + modulesStr); } function copyWWE(session, target) {
