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/03 03:38:29 UTC
[1/2] git commit: Windows helper. Removes unnecessary
$(MSBuildThisFileDirectory)
Repository: cordova-lib
Updated Branches:
refs/heads/master 359af154b -> c8d6abdf2
Windows helper. Removes unnecessary $(MSBuildThisFileDirectory)
This property is not required since all main .jsproj and other shared project files are in the same folder
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/86c32d63
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/86c32d63
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/86c32d63
Branch: refs/heads/master
Commit: 86c32d6366dd0b126da2225f4240e549e3e58f01
Parents: 2ac042e
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu Aug 28 16:48:24 2014 +0400
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu Aug 28 16:51:51 2014 +0400
----------------------------------------------------------------------
cordova-lib/src/util/windows/jsproj.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/86c32d63/cordova-lib/src/util/windows/jsproj.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/windows/jsproj.js b/cordova-lib/src/util/windows/jsproj.js
index a20fe7f..ef1cb38 100644
--- a/cordova-lib/src/util/windows/jsproj.js
+++ b/cordova-lib/src/util/windows/jsproj.js
@@ -82,8 +82,6 @@ jsproj.prototype = {
events.emit('verbose','addReference::' + relPath);
- relPath = this.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + relPath : relPath;
-
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -110,8 +108,6 @@ jsproj.prototype = {
removeReference:function(relPath) {
events.emit('verbose','removeReference::' + relPath);
- relPath = this.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + relPath : relPath;
-
var extName = path.extname(relPath);
var includeText = path.basename(relPath,extName);
// <ItemGroup>
@@ -131,10 +127,9 @@ jsproj.prototype = {
}
// make ItemGroup to hold file.
var item = new et.Element('ItemGroup');
- var me = this;
+
relative_path.forEach(function(filePath) {
filePath = filePath.split('/').join('\\');
- filePath = me.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + filePath : filePath;
var content = new et.Element('Content');
content.attrib.Include = filePath;
@@ -148,7 +143,6 @@ jsproj.prototype = {
if (!isRegexp) {
// path.normalize(relative_path);// ??
relative_path = relative_path.split('/').join('\\');
- relative_path = this.isUniversalWindowsApp ? '$(MSBuildThisFileDirectory)' + relative_path : relative_path;
}
var root = this.xml.getroot();
[2/2] git commit: Merge branch 'improvements' of
https://github.com/MSOpenTech/cordova-lib
Posted by pu...@apache.org.
Merge branch 'improvements' of https://github.com/MSOpenTech/cordova-lib
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c8d6abdf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c8d6abdf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c8d6abdf
Branch: refs/heads/master
Commit: c8d6abdf25ff9eb31672fd43f84714e316d4fdc2
Parents: 359af15 86c32d6
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Sep 2 18:37:43 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Sep 2 18:37:43 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/util/windows/jsproj.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------