Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ED073200C41 for ; Fri, 24 Mar 2017 23:24:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EB801160B93; Fri, 24 Mar 2017 22:24:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3F554160B75 for ; Fri, 24 Mar 2017 23:24:24 +0100 (CET) Received: (qmail 91212 invoked by uid 500); 24 Mar 2017 22:24:23 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 91203 invoked by uid 99); 24 Mar 2017 22:24:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Mar 2017 22:24:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 543CCDFF5A; Fri, 24 Mar 2017 22:24:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cordova-lib git commit: CB-12337 Resolve symbolic links in project root Date: Fri, 24 Mar 2017 22:24:23 +0000 (UTC) archived-at: Fri, 24 Mar 2017 22:24:25 -0000 Repository: cordova-lib Updated Branches: refs/heads/master fd6b9dd45 -> e62852c30 CB-12337 Resolve symbolic links in project root If project path had symlinks its absolute value was different from that returned by __dirname inside project-local modules. So when it was joined with various dirs like 'www' the two absolute paths were merged resulting in an invalid path. This should make 'cordova emulate android' work on Windows for projects with symlinks in path. There may be other places where similar measures need to be taken. This closes #514 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e62852c3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e62852c3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e62852c3 Branch: refs/heads/master Commit: e62852c30a61899aa102ccf016984eed0f15244c Parents: fd6b9dd Author: Sergey Zolotarev Authored: Tue Jan 10 01:51:57 2017 +0600 Committer: Steve Gill Committed: Thu Mar 23 23:06:27 2017 -0700 ---------------------------------------------------------------------- cordova-lib/src/cordova/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e62852c3/cordova-lib/src/cordova/util.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/util.js b/cordova-lib/src/cordova/util.js index 0596c4b..67552c8 100644 --- a/cordova-lib/src/cordova/util.js +++ b/cordova-lib/src/cordova/util.js @@ -135,7 +135,7 @@ function isCordova(dir) { // Cd to project root dir and return its path. Throw CordovaError if not in a Corodva project. function cdProjectRoot() { - var projectRoot = this.isCordova(); + var projectRoot = convertToRealPathSafe(this.isCordova()); if (!projectRoot) { throw new CordovaError('Current working directory is not a Cordova-based project.'); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org