Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F171100AF for ; Fri, 28 Jun 2013 14:15:38 +0000 (UTC) Received: (qmail 87442 invoked by uid 500); 28 Jun 2013 14:15:37 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 87149 invoked by uid 500); 28 Jun 2013 14:15:36 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 86560 invoked by uid 99); 28 Jun 2013 14:15:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 14:15:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 967C63A5EF; Fri, 28 Jun 2013 14:15:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Fri, 28 Jun 2013 14:15:31 -0000 Message-Id: <982c7b491869402e9e405945fad5d0ad@git.apache.org> In-Reply-To: <94e7ef137d99467e9e3ebce334eb1b68@git.apache.org> References: <94e7ef137d99467e9e3ebce334eb1b68@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/26] js commit: [All] [CB-3941] [CB-3940] packaging was failing if pkg existed but pkg/debug did not. Fixed whitespace difference between build platforms [All] [CB-3941] [CB-3940] packaging was failing if pkg existed but pkg/debug did not. Fixed whitespace difference between build platforms Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/af24bb7d Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/af24bb7d Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/af24bb7d Branch: refs/heads/2.9.x Commit: af24bb7d196b141ee6838776da346472835921f1 Parents: 89127a8 Author: Jesse MacFadyen Authored: Wed Jun 19 18:56:10 2013 -0700 Committer: Jesse MacFadyen Committed: Wed Jun 19 18:56:10 2013 -0700 ---------------------------------------------------------------------- build/packager.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/af24bb7d/build/packager.js ---------------------------------------------------------------------- diff --git a/build/packager.js b/build/packager.js index ec52758..f81b6a4 100644 --- a/build/packager.js +++ b/build/packager.js @@ -38,8 +38,11 @@ packager.generate = function(platform, commitId, useWindowsLineEndings) { time = new Date().valueOf() - time; if (!fs.existsSync('pkg')) { fs.mkdirSync('pkg'); - fs.mkdirSync('pkg/debug'); } + if(!fs.existsSync('pkg/debug')) { + fs.mkdirSync('pkg/debug'); + } + outFile = path.join('pkg', 'cordova.' + platform + '.js'); fs.writeFileSync(outFile, libraryRelease, 'utf8'); @@ -226,7 +229,7 @@ function writeContents(oFile, fileName, contents, debug) { } else { - contents = '// file: ' + fileName + '\n' + contents + contents = '// file: ' + fileName.split("\\").join("/") + '\n' + contents; } oFile.push(contents)