cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From galexandrov <...@git.apache.org>
Subject [GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Date Tue, 02 Jun 2015 09:49:28 GMT
Github user galexandrov commented on a diff in the pull request:

    https://github.com/apache/cordova-lib/pull/219#discussion_r31507207
  
    --- Diff: cordova-lib/src/plugman/platforms/ios.js ---
    @@ -184,13 +192,76 @@ module.exports = {
     
     
             var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection();
    -        var plist_file_entry = _.find(xcBuildConfiguration, function (entry) { return
entry.buildSettings && entry.buildSettings.INFOPLIST_FILE; });
    -        var plist_file = path.join(project_dir, plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^"(.*)"$/g,
'$1').replace(/\\&/g, '&'));
    -        var config_file = path.join(path.dirname(plist_file), 'config.xml');
     
    -        if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) {
    +        // CB-9033
    +        var plist_file_index;
    +        var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) {

    +            if (entry.buildSettings && entry.buildSettings.INFOPLIST_FILE) {

    +
    +                var plist_file = path.join(project_dir, entry.buildSettings.INFOPLIST_FILE.replace(/^"(.*)"$/g,
'$1').replace(/\\&/g, '&'));
    +                 if (!fs.existsSync(plist_file)) 
    +                    return false; 
    +                
    +                var config_file = path.join(path.dirname(plist_file), 'config.xml');

    +                  if (!fs.existsSync(config_file)) 
    +                    return false; 
    +
    +                // only return project that contains both a plist and a config.xml (especially
to discard apple watch extension/app)
    +                plist_file_index = index;
    --- End diff --
    
    Instead of checking for config.xml can we check for SKIP_INSTALL property in BuildSettings.
SKIP_INSTALL property should be missing or equals to NO for the iPhone app target and should
equals to YES for WatchKit Extension and WatchKit App.


---
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