Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C807617BA3 for ; Fri, 12 Jun 2015 03:04:37 +0000 (UTC) Received: (qmail 51636 invoked by uid 500); 12 Jun 2015 03:04:37 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 51594 invoked by uid 500); 12 Jun 2015 03:04:37 -0000 Mailing-List: contact dev-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 dev@cordova.apache.org Received: (qmail 51581 invoked by uid 99); 12 Jun 2015 03:04:37 -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, 12 Jun 2015 03:04:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 26688DFFD5; Fri, 12 Jun 2015 03:04:37 +0000 (UTC) From: agrieve To: dev@cordova.apache.org Reply-To: dev@cordova.apache.org References: In-Reply-To: Subject: [GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec... Content-Type: text/plain Message-Id: <20150612030437.26688DFFD5@git1-us-west.apache.org> Date: Fri, 12 Jun 2015 03:04:37 +0000 (UTC) Github user agrieve commented on a diff in the pull request: https://github.com/apache/cordova-android/pull/182#discussion_r32287653 --- Diff: bin/templates/cordova/lib/build.js --- @@ -245,18 +258,29 @@ var builders = { } } + var name=extractRealProjectNameFromManifest(ROOT); var subProjectsAsGradlePaths = subProjects.map(function(p) { return ':' + p.replace(/[/\\]/g, ':'); }); + //Remove the proj.id/name- prefix from projects + var settingsGradlePaths = subProjects.map(function(p){ + var realDir=p.replace(/[/\\]/g, ':'); + var libName=realDir.replace(name+'-',''); + var str='include ":'+libName+'"\n'; + if(realDir.indexOf(name+'-')!==-1) + str+='project(":'+libName+'").projectDir = new File("'+p+'")\n'; + return str; + }); + // Write the settings.gradle file. fs.writeFileSync(path.join(projectPath, 'settings.gradle'), '// GENERATED FILE - DO NOT EDIT\n' + - 'include ":"\n' + - 'include "' + subProjectsAsGradlePaths.join('"\ninclude "') + '"\n'); + 'include ":"\n' + settingsGradlePaths.join('')); // Update dependencies within build.gradle. var buildGradle = fs.readFileSync(path.join(projectPath, 'build.gradle'), 'utf8'); var depsList = ''; subProjectsAsGradlePaths.forEach(function(p) { --- End diff -- nit: delete subProjectsAsGradlePaths, and just loop on subProjects here. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org For additional commands, e-mail: dev-help@cordova.apache.org