From 74f4ded1fac34785e69298deb29e46f3ef772b13 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 25 Feb 2011 13:32:31 +0100
Subject: [PATCH] g++ jar won't be included into the release

---
 .idea/libraries/Groovy__.xml                      |   2 +-
 lib/{ => dev}/groovypp-all-0.4.170.jar            | Bin
 plugins/groovy/jetgroovy.iml                      |   2 +-
 .../plugins/groovy/compiler/GppCompilerTest.gpp   |  14 ++++++++++----
 .../groovy/compiler/GroovyCompilerTest.gpp        |   7 +++----
 .../groovy/compiler/GroovyCompilerTestCase.java   |   7 ++++---
 6 files changed, 19 insertions(+), 13 deletions(-)
 rename lib/{ => dev}/groovypp-all-0.4.170.jar (100%)

diff --git a/.idea/libraries/Groovy__.xml b/.idea/libraries/Groovy__.xml
index 536437648576..209aa4befc22 100644
--- a/.idea/libraries/Groovy__.xml
+++ b/.idea/libraries/Groovy__.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Groovy++">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/community/lib/groovypp-all-0.4.170.jar!/" />
+      <root url="jar://$PROJECT_DIR$/community/lib/dev/groovypp-all-0.4.170.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/lib/groovypp-all-0.4.170.jar b/lib/dev/groovypp-all-0.4.170.jar
similarity index 100%
rename from lib/groovypp-all-0.4.170.jar
rename to lib/dev/groovypp-all-0.4.170.jar
diff --git a/plugins/groovy/jetgroovy.iml b/plugins/groovy/jetgroovy.iml
index cb5c7093b258..6ed4f70f7075 100644
--- a/plugins/groovy/jetgroovy.iml
+++ b/plugins/groovy/jetgroovy.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="IntelliLang-java" scope="TEST" />
     <orderEntry type="module" module-name="IntelliLang-xml" scope="TEST" />
     <orderEntry type="module" module-name="jam-support-openapi" />
-    <orderEntry type="library" scope="PROVIDED" name="Groovy++" level="project" />
+    <orderEntry type="library" name="Groovy++" level="project" />
   </component>
 </module>
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
index 48f60b0976a4..a1d5bcd3bbc9 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
@@ -17,17 +17,23 @@
 package org.jetbrains.plugins.groovy.compiler;
 
 
+import com.intellij.openapi.application.PluginPathManager
 import com.intellij.openapi.vfs.VfsUtil
-import org.jetbrains.plugins.groovy.config.GroovyConfigUtils
+import com.intellij.testFramework.PsiTestUtil
+import org.jetbrains.plugins.groovy.util.GroovyUtils
 
-/**
+ /**
  * @author peter
  */
 public class GppCompilerTest extends GroovyCompilerTestCase {
   @Override protected void setUp() {
     super.setUp();
-    addGroovyLibrary myModule, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy";
-    addGroovyLibrary myFixture.module, "groovypp-all-(.*)jar", "gpp"
+    addGroovyLibrary myModule
+
+    final String root = PluginPathManager.getPluginHomePath("groovy") + "/../../lib/dev/";
+    final File[] groovyJars = GroovyUtils.getFilesInDirectoryByPattern(root, "groovypp-all-(.*)jar");
+    assert groovyJars.length == 1;
+    PsiTestUtil.addLibrary(myFixture.module, "gpp", root, groovyJars[0].getName());
   }
 
   public void testTraitStubs() throws Throwable {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
index 5856ec4209ed..fe8c7719617a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
@@ -22,15 +22,14 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import junit.framework.AssertionFailedError
-import org.jetbrains.plugins.groovy.config.GroovyConfigUtils
 
-/**
+ /**
  * @author peter
  */
 public class GroovyCompilerTest extends GroovyCompilerTestCase {
   @Override protected void setUp() {
     super.setUp();
-    addGroovyLibrary(myModule, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy");
+    addGroovyLibrary myModule
   }
 
   public void testPlainGroovy() throws Throwable {
@@ -267,7 +266,7 @@ public class GroovyCompilerTest extends GroovyCompilerTestCase {
 
     Module dep = addDependentModule();
 
-    addGroovyLibrary(dep, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy");
+    addGroovyLibrary dep
 
     assertEmpty(make());
     assertOutput("Bar", "239", dep);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
index 68301b376eac..35fde0819569 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
@@ -41,6 +41,7 @@ import com.intellij.testFramework.fixtures.impl.TempDirTestFixtureImpl;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.ui.UIUtil;
+import org.jetbrains.plugins.groovy.config.GroovyConfigUtils;
 import org.jetbrains.plugins.groovy.util.GroovyUtils;
 
 import javax.swing.*;
@@ -79,11 +80,11 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC
     super.tuneFixture(moduleBuilder);
   }
 
-  protected static void addGroovyLibrary(final Module to, String groovyJarPattern, final String libName) {
+  protected static void addGroovyLibrary(final Module to) {
     final String root = PluginPathManager.getPluginHomePath("groovy") + "/../../lib/";
-    final File[] groovyJars = GroovyUtils.getFilesInDirectoryByPattern(root, groovyJarPattern);
+    final File[] groovyJars = GroovyUtils.getFilesInDirectoryByPattern(root, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN);
     assert groovyJars.length == 1;
-    PsiTestUtil.addLibrary(to, libName, root, groovyJars[0].getName());
+    PsiTestUtil.addLibrary(to, "groovy", root, groovyJars[0].getName());
   }
 
   @Override