From 4d6cdd19b95a465880d7174e45862c9939d411dc Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 28 Dec 2011 15:19:52 +0400
Subject: [PATCH] jps: fixes

---
 jps/model/src/org/jetbrains/jps/Library.groovy         |  4 ++--
 jps/model/src/org/jetbrains/jps/Module.groovy          |  8 ++++----
 jps/plugins/gwt/jps-gwt.iml                            | 10 +---------
 .../org/jetbrains/jps/gwt/GwtModulesSearcherTest.java  |  1 -
 jps/src/org/jetbrains/jps/ProjectBuilder.groovy        |  5 +++--
 .../org/jetbrains/jps/builders/StandardBuilders.groovy |  4 +++-
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/jps/model/src/org/jetbrains/jps/Library.groovy b/jps/model/src/org/jetbrains/jps/Library.groovy
index 474e0d7ad1e3..4e5fc5fffa82 100644
--- a/jps/model/src/org/jetbrains/jps/Library.groovy
+++ b/jps/model/src/org/jetbrains/jps/Library.groovy
@@ -23,11 +23,11 @@ class Library extends LazyInitializeableObject implements ClasspathItem {
     Closure lazyInit = {
       def meta = new InitializingExpando()
       meta.classpath = {Object[] arg ->
-        arg.each { classpath << it }
+        arg.each { classpath << it.toString() }
       }
 
       meta.src = {Object[] arg ->
-        arg.each { sourceRoots << it }
+        arg.each { sourceRoots << it.toString() }
       }
 
       initializer.delegate = meta
diff --git a/jps/model/src/org/jetbrains/jps/Module.groovy b/jps/model/src/org/jetbrains/jps/Module.groovy
index ae7baafcb8f1..bf21d1ce0a1a 100644
--- a/jps/model/src/org/jetbrains/jps/Module.groovy
+++ b/jps/model/src/org/jetbrains/jps/Module.groovy
@@ -58,19 +58,19 @@ class Module extends LazyInitializeableObject implements ClasspathItem {//}, Com
       }
 
       meta.content = {Object[] arg ->
-        arg.each { contentRoots << it}
+        arg.each { contentRoots << it.toString() }
       }
 
       meta.src = {Object[] arg ->
-        arg.each { sourceRoots << it }
+        arg.each { sourceRoots << it.toString() }
       }
 
       meta.testSrc = {Object[] arg ->
-        arg.each { testRoots << it }
+        arg.each { testRoots << it.toString() }
       }
 
       meta.exclude = {Object[] arg ->
-        arg.each { excludes << it }
+        arg.each { excludes << it.toString() }
       }
 
       initializer.delegate = meta
diff --git a/jps/plugins/gwt/jps-gwt.iml b/jps/plugins/gwt/jps-gwt.iml
index b5a325a384ba..621daa2f0ea8 100644
--- a/jps/plugins/gwt/jps-gwt.iml
+++ b/jps/plugins/gwt/jps-gwt.iml
@@ -11,15 +11,7 @@
     <orderEntry type="module" module-name="jps" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="jps-javaee" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
 </module>
 
diff --git a/jps/plugins/gwt/testSrc/org/jetbrains/jps/gwt/GwtModulesSearcherTest.java b/jps/plugins/gwt/testSrc/org/jetbrains/jps/gwt/GwtModulesSearcherTest.java
index 0a1d17892aba..0375f1105c49 100644
--- a/jps/plugins/gwt/testSrc/org/jetbrains/jps/gwt/GwtModulesSearcherTest.java
+++ b/jps/plugins/gwt/testSrc/org/jetbrains/jps/gwt/GwtModulesSearcherTest.java
@@ -5,7 +5,6 @@ import junit.framework.TestCase;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author nik
diff --git a/jps/src/org/jetbrains/jps/ProjectBuilder.groovy b/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
index 29a397ba907b..22b5ead3770d 100644
--- a/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
+++ b/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
@@ -94,11 +94,12 @@ class ProjectBuilder {
       if (chunk.elements.size() > 1) {
         File outputDir
         if (targetFolder != null) {
-          def basePath = tests ? new File(targetFolder, "test").absolutePath : new File(targetFolder, "production").absolutePath
+          def basePath = forTests ? new File(targetFolder, "test").absolutePath : new File(targetFolder, "production").absolutePath
+          def name = chunk.name
           if (name.length() > 100) {
             name = name.substring(0, 100) + "_etc"
           }
-          outputDir = new File(basePath, name).absolutePath
+          outputDir = new File(basePath, name)
         }
         else {
           outputDir = new File(forTests ? chunk.representativeModule().testOutputPath : chunk.representativeModule().outputPath)
diff --git a/jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy b/jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy
index 9c326160a20f..daecae206150 100644
--- a/jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy
+++ b/jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy
@@ -60,7 +60,9 @@ class JavacBuilder implements ModuleBuilder, ModuleCycleBuilder {
     params.debug = String.valueOf(debugInfo);
     params.nowarn = String.valueOf(nowarn);
     params.deprecation = String.valueOf(deprecation);
-    params.verbose = "true"
+    if (state.projectWrapper != null) {
+      params.verbose = "true"
+    }
 
     def javacExecutable = getJavacExecutable(module)
     if (javacExecutable != null) {