diff options
-rw-r--r-- | .idea/modules.xml | 1 | ||||
-rw-r--r-- | build/scripts/layouts.gant | 24 | ||||
-rw-r--r-- | community-main.iml | 1 |
3 files changed, 23 insertions, 3 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 46fdb988e98c..ebc8d48f9899 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -76,6 +76,7 @@ <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" group="plugins/GAE" /> <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" group="plugins/GAE" /> <module fileurl="file://$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" filepath="$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" group="plugins/Google" /> + <module fileurl="file://$PROJECT_DIR$/../studio/cloud/login/google-login.iml" filepath="$PROJECT_DIR$/../studio/cloud/login/google-login.iml" group="plugins/Google" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/../base/gradle-import/gradle-import.iml" filepath="$PROJECT_DIR$/../base/gradle-import/gradle-import.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="community/plugins/gradle" /> diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 55053c774bc4..626095994a8b 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -262,7 +262,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir public def layoutCommunityPlugins(String home) { layoutAndroid() - layoutCloud() + layoutGoogle() dir("plugins") { def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"] @@ -563,15 +563,32 @@ public def layoutCommunityPlugins(String home) { } } -def layoutCloud() { +def layoutGoogle() { dir("plugins") { layoutPlugin("google-cloud-tools") { jar("google-cloud-tools.jar") { module("google-cloud-tools") } dir("templates") { - fileset(dir: "$home/../studio/cloud/resources/templates") + fileset(dir: "${home}/../studio/cloud/resources/templates") } + dir("clientTemplates") { + fileset(dir: "${home}/../studio/cloud/resources/clientTemplates") + } + fileset(dir: "${home}/../studio/cloud/lib") { + include(name: "**/*.jar") + } + } + layoutPlugin("google-login") { + jar("google-login.jar") { + module("google-login") + } + fileset(dir: "${home}/../studio/cloud/login/lib") { + include(name: "**/*.jar") + } + // Additional libraries that need to be manually copied, see how freemarker + // is copied by the Android plugin + fileset(file: "${home}/../../prebuilts/tools/common/google-api-java-client/1.8.0-rc/google-api-java-client-min-repackaged.jar") } } } @@ -763,6 +780,7 @@ def layoutAndroid() { // Note: This is a HACK: rather than encoding the full path, we should really query // the project model for the classpath just like we do for the androidModules' dependencies // below + // Also see similar issue in Google Cloud Login plugin fileset(file: "${home}/../../prebuilts/tools/common/m2/repository/org/freemarker/freemarker/2.3.20/freemarker-2.3.20.jar") androidModules = [ diff --git a/community-main.iml b/community-main.iml index 9efc575717ac..124943e8a84a 100644 --- a/community-main.iml +++ b/community-main.iml @@ -102,6 +102,7 @@ <orderEntry type="module" module-name="java-tests" scope="TEST" /> <orderEntry type="module" module-name="community-tests" scope="TEST" /> <orderEntry type="module" module-name="google-cloud-tools" /> + <orderEntry type="module" module-name="google-login" /> <orderEntry type="module" module-name="jira" /> <orderEntry type="module" module-name="java-decompiler" /> <orderEntry type="module" module-name="structuralsearch" /> |