Repository: cordova-lib Updated Branches: refs/heads/master 7bcfcf068 -> d1347c2ac
Emit platformAPI loading error, remove GradleBuilder and Browser create console logs Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/cdd68a0e Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/cdd68a0e Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/cdd68a0e Branch: refs/heads/master Commit: cdd68a0e37c3bb2616374194b017e607bbd0a87e Parents: 7bcfcf0 Author: Jesse MacFadyen <[email protected]> Authored: Wed Apr 5 17:51:10 2017 -0700 Committer: Steve Gill <[email protected]> Committed: Mon Apr 24 23:22:24 2017 -0700 ---------------------------------------------------------------------- .../cordova/lib/builders/GradleBuilder.js | 1 - .../platforms/cordova-browser/bin/lib/create.js | 16 ++++++++-------- cordova-lib/src/cordova/platform.js | 19 +++++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/cdd68a0e/cordova-lib/spec-cordova/fixtures/platforms/atari/bin/templates/cordova/lib/builders/GradleBuilder.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/platforms/atari/bin/templates/cordova/lib/builders/GradleBuilder.js b/cordova-lib/spec-cordova/fixtures/platforms/atari/bin/templates/cordova/lib/builders/GradleBuilder.js index 5b5ce13..0d7f6a2 100644 --- a/cordova-lib/spec-cordova/fixtures/platforms/atari/bin/templates/cordova/lib/builders/GradleBuilder.js +++ b/cordova-lib/spec-cordova/fixtures/platforms/atari/bin/templates/cordova/lib/builders/GradleBuilder.js @@ -131,7 +131,6 @@ GradleBuilder.prototype.prepBuildFiles = function() { } }; subProjects.forEach(function(p) { - console.log('Subproject Path: ' + p); var libName=p.replace(/[/\\]/g, ':').replace(name+'-',''); depsList += ' debugCompile(project(path: "' + libName + '", configuration: "debug"))'; insertExclude(p); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/cdd68a0e/cordova-lib/spec-cordova/fixtures/platforms/cordova-browser/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/platforms/cordova-browser/bin/lib/create.js b/cordova-lib/spec-cordova/fixtures/platforms/cordova-browser/bin/lib/create.js index 9b6e0ff..a2b8420 100644 --- a/cordova-lib/spec-cordova/fixtures/platforms/cordova-browser/bin/lib/create.js +++ b/cordova-lib/spec-cordova/fixtures/platforms/cordova-browser/bin/lib/create.js @@ -18,7 +18,7 @@ * specific language governing permissions and limitations * under the License. */ - + var fs = require('fs'), shjs = require('shelljs'), Q = require ('q'), @@ -28,9 +28,9 @@ var fs = require('fs'), check_reqs = require('./check_reqs'); module.exports.createProject = function(project_path,package_name,project_name){ - + var VERSION = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8'); - + // Set default values for path, package and name project_path = typeof project_path !== 'undefined' ? project_path : "CordovaExample"; @@ -39,14 +39,14 @@ module.exports.createProject = function(project_path,package_name,project_name){ console.error('Project already exists! Delete and recreate'); process.exit(2); } - + // Check that requirements are met and proper targets are installed if (!check_reqs.run()) { console.error('Please make sure you meet the software requirements in order to build a browser cordova project'); process.exit(2); } - console.log('Creating Browser project. Path: ' + path.relative(process.cwd(),project_path)); + // console.log('Creating Browser project. Path: ' + path.relative(process.cwd(),project_path)); //copy template directory shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'www'), project_path); @@ -61,7 +61,7 @@ module.exports.createProject = function(project_path,package_name,project_name){ //copy check_reqs file shjs.cp( path.join(ROOT, 'bin', 'lib', 'check_reqs.js'), path.join(project_path,'cordova', 'lib')); - + //copy cordova js file shjs.cp('-r', path.join(ROOT, 'cordova-lib', 'cordova.js'), path.join(project_path,'www')); @@ -69,13 +69,13 @@ module.exports.createProject = function(project_path,package_name,project_name){ shjs.cp('-rf', path.join(ROOT, 'cordova-js-src'), path.join(project_path, 'platform_www')); //copy cordova directory - shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path); + shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path); [ 'run', 'build', 'clean', 'version', - ].forEach(function(f) { + ].forEach(function(f) { shjs.chmod(755, path.join(project_path, 'cordova', f)); }); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/cdd68a0e/cordova-lib/src/cordova/platform.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 6df68b2..f2e01fb 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -100,7 +100,7 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) { return Q.when().then(function() { // if platform is a local path or url, it should be assigned // to spec - if (cordova_util.isDirectory(path.resolve(platform)) || + if (cordova_util.isDirectory(path.resolve(platform)) || cordova_util.isUrl(platform)) { spec = platform; platform = null; @@ -204,7 +204,8 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) { PlatformApi = cordova_util.requireNoCache(apiEntryPoint); events.emit('verbose', 'PlatformApi successfully found for platform ' + platform); } - } catch (e) { + } catch (err) { + events.emit('verbose', 'Error: PlatformApi not loaded for platform.' + err); } finally { if (!PlatformApi) { events.emit('verbose', 'Failed to require PlatformApi instance for platform "' + platform + @@ -378,7 +379,7 @@ function downloadPlatform(projectRoot, platform, version, opts) { /** * Removes the cordova- prefix from the platform's name for known platforms. * @param {string} name - platform name - * @returns {string} + * @returns {string} */ function platformFromName(name) { var platName = name; @@ -387,7 +388,7 @@ function platformFromName(name) { platName = platMatch[1]; events.emit('verbose', 'Removing "cordova-" prefix from ' + name); } - return platName; + return platName; } // Returns a Promise @@ -397,6 +398,8 @@ function getPlatformDetailsFromDir(dir, platformIfKnown){ var platform; var version; + // console.log("getPlatformDetailsFromDir : ", dir, platformIfKnown, libDir); + try { var pkgPath = path.join(libDir, 'package.json'); var pkg = cordova_util.requireNoCache(pkgPath); @@ -405,13 +408,13 @@ function getPlatformDetailsFromDir(dir, platformIfKnown){ } catch(e) { // Older platforms didn't have package.json. platform = platformIfKnown || platformFromName(path.basename(dir)); - var verFile = fs.existsSync(path.join(libDir, 'VERSION')) ? path.join(libDir, 'VERSION') : + var verFile = fs.existsSync(path.join(libDir, 'VERSION')) ? path.join(libDir, 'VERSION') : fs.existsSync(path.join(libDir, 'CordovaLib', 'VERSION')) ? path.join(libDir, 'CordovaLib', 'VERSION') : null; if (verFile) { version = fs.readFileSync(verFile, 'UTF-8').trim(); } } - + // platform does NOT have to exist in 'platforms', but it should have a name, and a version if (!version || !platform) { return Q.reject(new CordovaError('The provided path does not seem to contain a ' + @@ -670,12 +673,12 @@ function addDeprecatedInformationToPlatforms(platformsList){ } /** - * Handles all cordova platform commands. + * Handles all cordova platform commands. * @param {string} command - Command to execute (add, rm, ls, update, save) * @param {Object[]} targets - Array containing platforms to execute commands on * @param {Object} opts - * @returns {Promise} + * @returns {Promise} */ module.exports = platform; function platform(command, targets, opts) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
