You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/09/19 01:16:29 UTC
[1/4] git commit: merged package.json changes
Repository: cordova-windows
Updated Branches:
refs/heads/master 93d463d81 -> a315941ef
merged package.json changes
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/e3ccdb41
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/e3ccdb41
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/e3ccdb41
Branch: refs/heads/master
Commit: e3ccdb4144c6d92249984493acfdfe6cdfe145b1
Parents: 717dd95
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Sep 3 18:55:19 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Sep 3 18:59:36 2014 -0700
----------------------------------------------------------------------
windows/package.json | 54 ++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/e3ccdb41/windows/package.json
----------------------------------------------------------------------
diff --git a/windows/package.json b/windows/package.json
index 81f8b75..9bcd619 100644
--- a/windows/package.json
+++ b/windows/package.json
@@ -1,26 +1,32 @@
{
- "name": "cordova-windows",
- "version": "3.6.0-dev",
- "description": "cordova-windows release",
- "main": "bin/create",
- "repository":{
- "type":"git",
- "url":"https://github.com/apache/cordova-windows"
- },
- "keywords": [
- "windows",
- "cordova",
- "apache"
- ],
- "dependencies": {
- "q": "^0.9.0",
- "nopt": "~3",
- "node-uuid": "~1.4",
- "shelljs": "~0.3"
- },
- "scripts": {
- "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm -rf .\\testcreate"
- },
- "author": "Apache Software Foundation",
- "license": "Apache Version 2.0"
+ "name": "cordova-windows",
+ "version": "3.6.0-dev",
+ "description": "cordova-windows dev",
+ "main": "bin/create",
+ "repository":{
+ "type":"git",
+ "url":"https://github.com/apache/cordova-windows"
+ },
+ "keywords": [
+ "windows",
+ "cordova",
+ "apache"
+ ],
+ "dependencies": {
+ "q": "^0.9.0",
+ "nopt": "~3",
+ "node-uuid": "~1.4",
+ "shelljs": "~0.3"
+ },
+ "bundledDependencies": [
+ "nopt",
+ "shelljs",
+ "node-uuid",
+ "q"
+ ],
+ "scripts": {
+ "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm -rf .\\testcreate"
+ },
+ "author": "Apache Software Foundation",
+ "license": "Apache Version 2.0"
}
[2/4] git commit: CB-7494 Fixes wrong replacements in *.appxmanifest
files
Posted by pu...@apache.org.
CB-7494 Fixes wrong replacements in *.appxmanifest files
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/fdce7411
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/fdce7411
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/fdce7411
Branch: refs/heads/master
Commit: fdce7411529e3630f6b7c17f9942a3113ba67c6e
Parents: 1a80ff8
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Mon Sep 8 18:36:40 2014 +0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Mon Sep 8 18:43:09 2014 +0400
----------------------------------------------------------------------
windows/bin/lib/create.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/fdce7411/windows/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/windows/bin/lib/create.js b/windows/bin/lib/create.js
index ddfaeb8..44f722b 100644
--- a/windows/bin/lib/create.js
+++ b/windows/bin/lib/create.js
@@ -37,7 +37,9 @@ module.exports.run = function (argv) {
}
var packageName = args.argv.remain[1] || "Cordova.Example",
appName = args.argv.remain[2] || "CordovaAppProj",
- safeAppName = appName.replace(/(\.\s|\s\.|\s+|\.+)/g, '_'),
+ // 64 symbols restriction goes from manifest schema definition
+ // http://msdn.microsoft.com/en-us/library/windows/apps/br211415.aspx
+ safeAppName = appName.length <= 64 ? appName : appName.substr(0, 64),
templateOverrides = args.argv.remain[3],
guid = args['guid'] || uuid.v1(),
root = path.join(__dirname, '..', '..');
@@ -66,8 +68,8 @@ module.exports.run = function (argv) {
["package.windows.appxmanifest", "package.windows80.appxmanifest", "package.phone.appxmanifest"].forEach(function (file) {
var fileToReplace = path.join(projectPath, file);
shell.sed('-i', /\$guid1\$/g, guid, fileToReplace);
- shell.sed('-i', /\$safeprojectname\$/g, safeAppName, fileToReplace);
- shell.sed('-i', /\$projectname\$/g, packageName, fileToReplace);
+ shell.sed('-i', /\$safeprojectname\$/g, packageName, fileToReplace);
+ shell.sed('-i', /\$projectname\$/g, safeAppName, fileToReplace);
});
// Delete bld forder and bin folder
[3/4] git commit: fix merge issue and make tabs 4 spaces
Posted by pu...@apache.org.
fix merge issue and make tabs 4 spaces
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/f4ebe0fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/f4ebe0fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/f4ebe0fe
Branch: refs/heads/master
Commit: f4ebe0fef928490332ed0d39d7a2df4900e5a021
Parents: e3ccdb4 93d463d
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Sep 18 16:15:40 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Sep 18 16:15:40 2014 -0700
----------------------------------------------------------------------
windows/VERSION | 2 +-
windows/package.json | 10 +-
.../cordova/lib/ApplyPlatformConfig.ps1 | 305 -------------------
windows/template/cordova/lib/ConfigParser.js | 22 ++
windows/template/cordova/lib/build.js | 13 +-
windows/template/cordova/lib/prepare.js | 261 ++++++++++++++++
windows/template/cordova/lib/utils.js | 14 -
7 files changed, 291 insertions(+), 336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/f4ebe0fe/windows/package.json
----------------------------------------------------------------------
diff --cc windows/package.json
index 9bcd619,af0a941..86253d9
--- a/windows/package.json
+++ b/windows/package.json
@@@ -1,32 -1,26 +1,26 @@@
{
- "name": "cordova-windows",
- "version": "3.7.0-dev",
- "description": "cordova-windows release",
- "main": "bin/create",
- "repository":{
- "type":"git",
- "url":"https://github.com/apache/cordova-windows"
- },
- "keywords": [
- "windows",
- "cordova",
- "apache"
- ],
- "dependencies": {
- "q": "^0.9.0",
- "nopt": "~3",
- "node-uuid": "~1.4",
- "shelljs": "~0.3"
- },
- "scripts": {
- "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm -rf .\\testcreate"
- },
- "author": "Apache Software Foundation",
- "license": "Apache Version 2.0"
+ "name": "cordova-windows",
- "version": "3.6.0-dev",
- "description": "cordova-windows dev",
++ "version": "3.7.0-dev",
++ "description": "cordova-windows release",
+ "main": "bin/create",
+ "repository":{
+ "type":"git",
+ "url":"https://github.com/apache/cordova-windows"
+ },
+ "keywords": [
+ "windows",
+ "cordova",
+ "apache"
+ ],
+ "dependencies": {
+ "q": "^0.9.0",
+ "nopt": "~3",
+ "node-uuid": "~1.4",
+ "shelljs": "~0.3"
+ },
- "bundledDependencies": [
- "nopt",
- "shelljs",
- "node-uuid",
- "q"
- ],
+ "scripts": {
+ "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm -rf .\\testcreate"
+ },
+ "author": "Apache Software Foundation",
+ "license": "Apache Version 2.0"
}
[4/4] git commit: Merge branch 'CB-7494' of
https://github.com/MSOpenTech/cordova-windows
Posted by pu...@apache.org.
Merge branch 'CB-7494' of https://github.com/MSOpenTech/cordova-windows
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/a315941e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/a315941e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/a315941e
Branch: refs/heads/master
Commit: a315941efa1921712da7280689854a2e1daec34d
Parents: f4ebe0f fdce741
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Sep 18 16:16:13 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Sep 18 16:16:13 2014 -0700
----------------------------------------------------------------------
windows/bin/lib/create.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------