You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sg...@apache.org on 2016/01/14 13:46:27 UTC
[1/2] cordova-windows git commit: CB-10356 "npm install" fails for
cordova-windows
Repository: cordova-windows
Updated Branches:
refs/heads/4.3.x ecee22c4b -> 9f3a3b038
CB-10356 "npm install" fails for cordova-windows
github close #137
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/ff4c2bcb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/ff4c2bcb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/ff4c2bcb
Branch: refs/heads/4.3.x
Commit: ff4c2bcb52f873a3dce810a8fb8cc832d4025b44
Parents: ecee22c
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu Jan 14 11:04:57 2016 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Jan 14 15:46:24 2016 +0300
----------------------------------------------------------------------
.gitignore | 8 ++-
node_modules/semver/bin/semver | 133 ++++++++++++++++++++++++++++++++++++
node_modules/semver/range.bnf | 16 +++++
3 files changed, 155 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/ff4c2bcb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9899188..dc4c300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,12 @@ Debug
obj
Thumbs.db
-# Skip node_modules
-node_modules/
+# Skip node_modules .bin folder and dev dependencies
+node_modules/.bin
+node_modules/istanbul/
+node_modules/jasmine-node/
+node_modules/jshint/
+node_modules/rewire/
npm-debug.log
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/ff4c2bcb/node_modules/semver/bin/semver
----------------------------------------------------------------------
diff --git a/node_modules/semver/bin/semver b/node_modules/semver/bin/semver
new file mode 100644
index 0000000..c5f2e85
--- /dev/null
+++ b/node_modules/semver/bin/semver
@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+// Standalone semver comparison program.
+// Exits successfully and prints matching version(s) if
+// any supplied version is valid and passes all tests.
+
+var argv = process.argv.slice(2)
+ , versions = []
+ , range = []
+ , gt = []
+ , lt = []
+ , eq = []
+ , inc = null
+ , version = require("../package.json").version
+ , loose = false
+ , identifier = undefined
+ , semver = require("../semver")
+ , reverse = false
+
+main()
+
+function main () {
+ if (!argv.length) return help()
+ while (argv.length) {
+ var a = argv.shift()
+ var i = a.indexOf('=')
+ if (i !== -1) {
+ a = a.slice(0, i)
+ argv.unshift(a.slice(i + 1))
+ }
+ switch (a) {
+ case "-rv": case "-rev": case "--rev": case "--reverse":
+ reverse = true
+ break
+ case "-l": case "--loose":
+ loose = true
+ break
+ case "-v": case "--version":
+ versions.push(argv.shift())
+ break
+ case "-i": case "--inc": case "--increment":
+ switch (argv[0]) {
+ case "major": case "minor": case "patch": case "prerelease":
+ case "premajor": case "preminor": case "prepatch":
+ inc = argv.shift()
+ break
+ default:
+ inc = "patch"
+ break
+ }
+ break
+ case "--preid":
+ identifier = argv.shift()
+ break
+ case "-r": case "--range":
+ range.push(argv.shift())
+ break
+ case "-h": case "--help": case "-?":
+ return help()
+ default:
+ versions.push(a)
+ break
+ }
+ }
+
+ versions = versions.filter(function (v) {
+ return semver.valid(v, loose)
+ })
+ if (!versions.length) return fail()
+ if (inc && (versions.length !== 1 || range.length))
+ return failInc()
+
+ for (var i = 0, l = range.length; i < l ; i ++) {
+ versions = versions.filter(function (v) {
+ return semver.satisfies(v, range[i], loose)
+ })
+ if (!versions.length) return fail()
+ }
+ return success(versions)
+}
+
+function failInc () {
+ console.error("--inc can only be used on a single version with no range")
+ fail()
+}
+
+function fail () { process.exit(1) }
+
+function success () {
+ var compare = reverse ? "rcompare" : "compare"
+ versions.sort(function (a, b) {
+ return semver[compare](a, b, loose)
+ }).map(function (v) {
+ return semver.clean(v, loose)
+ }).map(function (v) {
+ return inc ? semver.inc(v, inc, loose, identifier) : v
+ }).forEach(function (v,i,_) { console.log(v) })
+}
+
+function help () {
+ console.log(["SemVer " + version
+ ,""
+ ,"A JavaScript implementation of the http://semver.org/ specification"
+ ,"Copyright Isaac Z. Schlueter"
+ ,""
+ ,"Usage: semver [options] <version> [<version> [...]]"
+ ,"Prints valid versions sorted by SemVer precedence"
+ ,""
+ ,"Options:"
+ ,"-r --range <range>"
+ ," Print versions that match the specified range."
+ ,""
+ ,"-i --increment [<level>]"
+ ," Increment a version by the specified level. Level can"
+ ," be one of: major, minor, patch, premajor, preminor,"
+ ," prepatch, or prerelease. Default level is 'patch'."
+ ," Only one version may be specified."
+ ,""
+ ,"--preid <identifier>"
+ ," Identifier to be used to prefix premajor, preminor,"
+ ," prepatch or prerelease version increments."
+ ,""
+ ,"-l --loose"
+ ," Interpret versions and ranges loosely"
+ ,""
+ ,"Program exits successfully if any valid version satisfies"
+ ,"all supplied ranges, and prints all satisfying versions."
+ ,""
+ ,"If no satisfying versions are found, then exits failure."
+ ,""
+ ,"Versions are printed in ascending order, so supplying"
+ ,"multiple versions to the utility will just sort them."
+ ].join("\n"))
+}
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/ff4c2bcb/node_modules/semver/range.bnf
----------------------------------------------------------------------
diff --git a/node_modules/semver/range.bnf b/node_modules/semver/range.bnf
new file mode 100644
index 0000000..000df92
--- /dev/null
+++ b/node_modules/semver/range.bnf
@@ -0,0 +1,16 @@
+range-set ::= range ( logical-or range ) *
+logical-or ::= ( ' ' ) * '||' ( ' ' ) *
+range ::= hyphen | simple ( ' ' simple ) * | ''
+hyphen ::= partial ' - ' partial
+simple ::= primitive | partial | tilde | caret
+primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
+partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
+xr ::= 'x' | 'X' | '*' | nr
+nr ::= '0' | ['1'-'9']['0'-'9']+
+tilde ::= '~' partial
+caret ::= '^' partial
+qualifier ::= ( '-' pre )? ( '+' build )?
+pre ::= parts
+build ::= parts
+parts ::= part ( '.' part ) *
+part ::= nr | [-0-9A-Za-z]+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-windows git commit: CB-10344 Fixed icons and
splashscreens parsing
Posted by sg...@apache.org.
CB-10344 Fixed icons and splashscreens parsing
github close #136
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/9f3a3b03
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/9f3a3b03
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/9f3a3b03
Branch: refs/heads/4.3.x
Commit: 9f3a3b03886e2c6b48d0153acb9df704b13580bd
Parents: ff4c2bc
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Wed Jan 13 18:48:37 2016 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Jan 14 15:46:25 2016 +0300
----------------------------------------------------------------------
template/cordova/lib/prepare.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/9f3a3b03/template/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index a4ef655..69403cf 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -355,7 +355,7 @@ function copyImages(config, platformRoot) {
return null;
}
- var images = config.getIcons().concat(config.getSplashScreens());
+ var images = config.getIcons('windows').concat(config.getSplashScreens('windows'));
images.forEach(function (img) {
if (img.target) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org