cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shazron <...@git.apache.org>
Subject [GitHub] cordova-ios pull request #265: CB-11952 - Introduce buildFlag option
Date Fri, 07 Oct 2016 08:03:43 GMT
Github user shazron commented on a diff in the pull request:

    https://github.com/apache/cordova-ios/pull/265#discussion_r82344457
  
    --- Diff: bin/templates/scripts/cordova/lib/build.js ---
    @@ -199,33 +220,54 @@ module.exports.findXCodeProjectIn = findXCodeProjectIn;
      * @param  {Boolean} isDevice      Flag that specify target for package (device/emulator)
      * @return {Array}                 Array of arguments that could be passed directly to
spawn method
      */
    -function getXcodeBuildArgs(projectName, projectPath, configuration, isDevice) {
    +function getXcodeBuildArgs(projectName, projectPath, configuration, isDevice, buildFlags)
{
         var xcodebuildArgs;
    +    var options;
    +    var buildActions = [ 'build' ];
    +    var settings;
    +    var customArgs = {};
    +    customArgs.otherFlags = [];
    +
    +    if (buildFlags) {
    +        if (typeof buildFlags === 'string' || buildFlags instanceof String) {
    +            parseBuildFlag(buildFlags, customArgs);
    +        } else { // buildFlags is an Array of strings
    +            buildFlags.forEach( function(flag) {
    +                parseBuildFlag(flag, customArgs);
    +            });
    +        }
    +    }
    +    
         if (isDevice) {
    -        xcodebuildArgs = [
    -            '-xcconfig', path.join(__dirname, '..', 'build-' + configuration.toLowerCase()
+ '.xcconfig'),
    -            '-workspace', projectName + '.xcworkspace',
    -            '-scheme', projectName,
    -            '-configuration', configuration,
    -            '-destination', 'generic/platform=iOS',
    -            '-archivePath', projectName + '.xcarchive',
    -            'archive',
    -            'CONFIGURATION_BUILD_DIR=' + path.join(projectPath, 'build', 'device'),
    -            'SHARED_PRECOMPS_DIR=' + path.join(projectPath, 'build', 'sharedpch')
    +        options = [
    +            '-xcconfig', customArgs.xcconfig || path.join(__dirname, '..', 'build-' +
configuration.toLowerCase() + '.xcconfig'),
    +            '-project',  customArgs.project || projectName + '.xcodeproj',
    +            customArgs.archs || 'ARCHS=armv7 arm64',
    +            '-target', customArgs.target || projectName,
    +            '-configuration', customArgs.configuration || configuration,
    +            '-sdk', customArgs.sdk || 'iphoneos'
    +        ];
    +        settings = [
    +            customArgs.valid_archs || 'VALID_ARCHS=armv7 arm64',
    +            customArgs.configuration_build_dir || 'CONFIGURATION_BUILD_DIR=' + path.join(projectPath,
'build', 'device'),
    +            customArgs.shared_precomps_dir || 'SHARED_PRECOMPS_DIR=' + path.join(projectPath,
'build', 'sharedpch')
             ];
         } else { // emulator
    -        xcodebuildArgs = [
    -            '-xcconfig', path.join(__dirname, '..', 'build-' + configuration.toLowerCase()
+ '.xcconfig'),
    -            '-workspace', projectName + '.xcworkspace',
    -            '-scheme', projectName ,
    -            '-configuration', configuration,
    -            '-sdk', 'iphonesimulator',
    -            '-destination', 'platform=iOS Simulator,name=iPhone 5s',
    -            'build',
    -            'CONFIGURATION_BUILD_DIR=' + path.join(projectPath, 'build', 'emulator'),
    -            'SHARED_PRECOMPS_DIR=' + path.join(projectPath, 'build', 'sharedpch')
    +        options = [
    +            '-xcconfig', customArgs.xcconfig || path.join(__dirname, '..', 'build-' +
configuration.toLowerCase() + '.xcconfig'),
    +            '-project', customArgs.project || projectName + '.xcodeproj',
    +            customArgs.archs || 'ARCHS=x86_64 i386',
    +            '-target', customArgs.target || projectName,
    +            '-configuration', customArgs.configuration || configuration,
    +            '-sdk', customArgs.sdk || 'iphonesimulator'
    +        ];
    +        settings = [
    --- End diff --
    
    Same as above. All missing flags are essential.


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