g++ jar won't be included into the release

This commit is contained in:
peter
2011-02-25 13:33:12 +01:00
parent 0194535238
commit 74f4ded1fa
6 changed files with 19 additions and 13 deletions
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
@@ -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 {
@@ -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);
@@ -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