cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agrieve <...@git.apache.org>
Subject [GitHub] cordova-lib pull request: CB-8226 'cordova platform add' : Look up...
Date Tue, 06 Jan 2015 03:26:31 GMT
Github user agrieve commented on a diff in the pull request:

    https://github.com/apache/cordova-lib/pull/140#discussion_r22506476
  
    --- Diff: cordova-lib/src/cordova/platform.js ---
    @@ -78,62 +76,119 @@ function add(hooksRunner, projectRoot, targets, opts) {
         }
     
         return hooksRunner.fire('before_platform_add', opts)
    -    .then(function() {
    -        return promiseutil.Q_chainmap(targets, function(t) {
    -            // For each platform, download it and call its "create" script.
    -
    -            var p;  // The promise to be returned by this function.
    -            var platform = t.split('@')[0];
    -            // If t is not a platform or platform@version, it must be a dir.
    -            // In this case get platform name from package.json in that dir and
    -            // skip lazy-load.
    -            if( !(platform in platforms) ) {
    -                var pPath = path.resolve(t);
    -                var pkg;
    -                // Prep the message in advance, we might need it in several places.
    -                msg = 'The provided path does not seem to contain a ' +
    -                      'Cordova platform: ' + t;
    -                try {
    -                    pkg = require(path.join(pPath, 'package'));
    -                } catch(e) {
    -                    throw new CordovaError(msg + '\n' + e.message);
    -                }
    -                if ( !pkg || !pkg.name ) {
    -                    throw new CordovaError(msg);
    -                }
    -                // Package names for Cordova platforms look like "cordova-ios".
    -                var nameParts = pkg.name.split('-');
    -                var name = nameParts[1];
    -                if (name == 'amazon') {
    -                    name = 'amazon-fireos';
    -                }
    -                if( !platforms[name] ) {
    -                    throw new CordovaError(msg);
    -                }
    -                platform = name;
    +	.then(function () {
    +	    return promiseutil.Q_chainmap(targets, function (target) {
    +
    +	        // For each platform, download it and call its "create" script.
    +	        var parts = target.split('@');
    +	        var platform = parts[0];
    +	        var version = parts[1];
    +
    +	        return Q.when().then(function () {
    +	            if (!(platform in platforms)) {
    +	                return getPlatformDetailsFromDir(target);
    +	            }
    +	            else {
    +	                if (!version) {
    +	                    events.emit('verbose', 'No version supplied. Retrieving version
from config.xml...');
    +	                }
    +	                version = version || getVersionFromConfigFile(platform, cfg);
    +	                if (version) {
    +	                    version = version.replace(/^file:\/\//, ''); // If version is a
folder, remove the 'file://' prefix from it.
    --- End diff --
    
    Couldn't figure out how to reply to old comment, so creating a new one again :S.
    
    If it starts with "file:", then it's a URL (with file: being the scheme). If it has any
`:`s, or spaces, then it's a malformed URL that most parses allow. However, we really should
support properly formatted URLs by using the url.parse method.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


Mime
View raw message