cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nikhi...@apache.org
Subject [11/14] cordova-windows git commit: fix merge conflict
Date Wed, 13 May 2015 21:15:06 GMT
fix merge conflict


Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/eddc8f7b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/eddc8f7b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/eddc8f7b

Branch: refs/heads/master
Commit: eddc8f7bf74400bbbfed3344c49987d835ab10ce
Parents: 32d459c 61057cf
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Fri May 1 23:54:28 2015 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Fri May 1 23:54:28 2015 -0700

----------------------------------------------------------------------
 README.md                   | 4 +++-
 template/cordova/lib/run.js | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/eddc8f7b/README.md
----------------------------------------------------------------------
diff --cc README.md
index 0fa2095,6845207..413012c
--- a/README.md
+++ b/README.md
@@@ -24,11 -24,10 +24,13 @@@ Apache Cordova for Window
  
  [![Build status](https://ci.appveyor.com/api/projects/status/19h1fq0lyvwtei05/branch/master)](https://ci.appveyor.com/project/Humbedooh/cordova-windows/branch/master)
  
 -Includes Windows universal app template to build [Apache Cordova](http://cordova.apache.org)
applications that target Windows 8.0, Windows 8.1 and Windows Phone 8.1. An Apache Cordova
based applications is, at the core, an application written with web technology: HTML, CSS
and JavaScript.
 +# Experimental branch for Windows 10 #
 +**You are using an experimental branch** which includes support for Windows 10 Universal
Apps.  For more information about what's new with Windows 10 support, see [What's New in Windows
10 for Cordova](cordova-windows10.md).
 +
 +Also includes a universal app template to build [Apache Cordova](http://cordova.apache.org)
applications that target Windows 8.0, Windows 8.1 and Windows Phone 8.1. An Apache Cordova
based applications is, at the core, an application written with web technology: HTML, CSS
and JavaScript.
  
+ (Warning: Windows8 has been deprecated, please update your applications to target Windows
8.1)
+ 
  [Apache Cordova](http://cordova.apache.org) is a project of [The Apache Software Foundation
(ASF)](http://apache.org)
  
  Requires

http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/eddc8f7b/template/cordova/lib/run.js
----------------------------------------------------------------------
diff --cc template/cordova/lib/run.js
index d54823d,5445af5..1b0a059
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@@ -52,43 -52,12 +52,47 @@@ module.exports.run = function (argv) 
      var buildType    = args.release ? 'release' : 'debug',
          buildArchs   = args.archs ? args.archs.split(' ') : ['anycpu'],
          projectType  = args.phone ? 'phone' : 'windows',
 -        deployTarget = args.target ? args.target : args.device ? 'device' : 'emulator';
 +        deployTarget = args.target ? args.target : (args.emulator ? 'emulator' : 'device'),
 +        projOverride = args.appx;
  
      // for win switch we should correctly handle 8.0 and 8.1 version as per configuration
 +    // as well as 10
 +    var targetWindowsVersion = getWindowsTargetVersion();
 +    if (projectType == 'windows') {
 +        if (targetWindowsVersion == '8.0') {
 +            projectType = 'windows80';
 +        }
 +        else if (targetWindowsVersion === '10.0') {
 +            projectType = 'windows10';
 +        }
 +    }
 +    else if (projectType === 'phone') {
 +        if (targetWindowsVersion === '10.0' || targetWindowsVersion === 'UAP') {
 +            projectType = 'windows10';
 +        }
 +    }
 +
 +    if (projOverride) {
 +        switch (projOverride) {
 +            case '8.1-phone':
 +                projectType = 'phone';
 +                targetWindowsVersion = '8.1';
 +                break;
 +            case '8.1-win':
 +                projectType = 'windows';
 +                targetWindowsVersion = '8.1';
 +                break;
 +            case 'uap':
 +                projectType = 'windows10';
 +                break;
 +            default:
 +                console.warn('Unrecognized --appx parameter passed to run: "' + projOverride
+ '", ignoring.');
 +                break;
 +        }
++
+     if (projectType == 'windows' && getWindowsTargetVersion() == '8.0') {
+         console.log('Warning: windows8 has been deprecated.  Please update you project to
target windows8.1');
+         projectType = 'windows80';
      }
  
      // if --nobuild isn't specified then build app first


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


Mime
View raw message