From cf1bf4f3c0a8376fae4f434efd3cfbefc6aab4ec Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 12 Nov 2012 17:41:10 +0400 Subject: [PATCH] =?UTF-8?q?PyCharm=20=E2=80=94=20build=20JB=20Chrome=20ext?= =?UTF-8?q?ension?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python/build/pycharm_build.gant | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index ce23fae644dd..40434becab7e 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -173,9 +173,7 @@ target('default': "Build artifacts") { buildDmg("pycharm", "${home}/python/build/DMG_background.png") } -private layoutPlugins() { - def layouts = includeFile("$home/build/scripts/layouts.gant") - +private layoutPlugins(layouts) { dir("plugins") { layouts.layoutPlugin("django-db-config") layouts.layoutPlugin("python-javascript-debugger") @@ -218,7 +216,7 @@ private String appInfoFile() { private layoutFull(Map args, String target, Set usedJars) { def openapiModules = pycharmPlatformApiModules() def implementationModules = [platformUltimateImplementationModules, pycharmImplementationModules()].flatten() - + def superLayouts = includeFile("$home/build/scripts/layouts.gant") def result = layout(target) { dir("lib") { jar("util.jar") { @@ -318,7 +316,7 @@ private layoutFull(Map args, String target, Set usedJars) { fileset(dir: "$home/community/license") } - layoutPlugins() + layoutPlugins(superLayouts) dir("bin") { fileset(dir: "$home/community/bin") { @@ -328,7 +326,7 @@ private layoutFull(Map args, String target, Set usedJars) { } } patchPropertiesFile(target, args + [appendices: ["$home/build/conf/ideaJNC.properties"]]) - + superLayouts.packJetBrainsChromeExtension(target) return result }