From 1ee07e89bc0a2a2fe4ffba954123ddfbb79f28b4 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Thu, 18 Feb 2016 01:17:37 +0300
Subject: [PATCH] First working version of JPS plugin

---
 .idea/libraries/teavm_all.xml                 | 12 ++++
 .idea/libraries/teavm_core_1_0_0_SNAPSHOT.xml |  9 ---
 .../teavm_tooling_1_0_0_SNAPSHOT.xml          |  9 ---
 .../install_artifacts_for_idea.xml            |  7 --
 .../install_core_artifact.xml                 | 27 --------
 .../install_tooling_artifact.xml              | 27 --------
 core/pom.xml                                  | 27 --------
 tools/idea/jps-plugin/.gitignore              |  1 +
 tools/idea/jps-plugin/pom.xml                 | 65 +++++++++++++++++++
 .../java/org/teavm/idea/jps/TeaVMBuilder.java |  1 +
 .../teavm/idea/jps/TeaVMBuilderService.java   | 14 ++++
 tools/idea/jps-plugin/teavm-jps-plugin.iml    |  6 +-
 .../src/main/resources/META-INF/plugin.xml    |  2 +-
 tools/idea/teavm-idea-plugin.iml              |  7 +-
 14 files changed, 98 insertions(+), 116 deletions(-)
 create mode 100644 .idea/libraries/teavm_all.xml
 delete mode 100644 .idea/libraries/teavm_core_1_0_0_SNAPSHOT.xml
 delete mode 100644 .idea/libraries/teavm_tooling_1_0_0_SNAPSHOT.xml
 delete mode 100644 .idea/runConfigurations/install_artifacts_for_idea.xml
 delete mode 100644 .idea/runConfigurations/install_core_artifact.xml
 delete mode 100644 .idea/runConfigurations/install_tooling_artifact.xml
 create mode 100644 tools/idea/jps-plugin/.gitignore
 create mode 100644 tools/idea/jps-plugin/pom.xml

diff --git a/.idea/libraries/teavm_all.xml b/.idea/libraries/teavm_all.xml
new file mode 100644
index 000000000..55f1409ea
--- /dev/null
+++ b/.idea/libraries/teavm_all.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="teavm-all">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/tools/idea/jps-plugin/lib/teavm-all.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/core/src/main/java" />
+      <root url="file://$PROJECT_DIR$/tools/core/src/main/java" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/teavm_core_1_0_0_SNAPSHOT.xml b/.idea/libraries/teavm_core_1_0_0_SNAPSHOT.xml
deleted file mode 100644
index 0020c2209..000000000
--- a/.idea/libraries/teavm_core_1_0_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="teavm-core-1.0.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/teavm/teavm-core/1.0.0-SNAPSHOT/teavm-core-1.0.0-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/teavm_tooling_1_0_0_SNAPSHOT.xml b/.idea/libraries/teavm_tooling_1_0_0_SNAPSHOT.xml
deleted file mode 100644
index fc8ee2eca..000000000
--- a/.idea/libraries/teavm_tooling_1_0_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="teavm-tooling-1.0.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/teavm/teavm-tooling/1.0.0-SNAPSHOT/teavm-tooling-1.0.0-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/install_artifacts_for_idea.xml b/.idea/runConfigurations/install_artifacts_for_idea.xml
deleted file mode 100644
index 7a8853f9b..000000000
--- a/.idea/runConfigurations/install_artifacts_for_idea.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="install-artifacts-for-idea" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration">
-    <toRun type="MavenRunConfiguration" name="install-core-artifact" />
-    <toRun type="MavenRunConfiguration" name="install-tooling-artifact" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/install_core_artifact.xml b/.idea/runConfigurations/install_core_artifact.xml
deleted file mode 100644
index efd598046..000000000
--- a/.idea/runConfigurations/install_core_artifact.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="install-core-artifact" type="MavenRunConfiguration" factoryName="Maven">
-    <MavenSettings>
-      <option name="myGeneralSettings" />
-      <option name="myRunnerSettings" />
-      <option name="myRunnerParameters">
-        <MavenRunnerParameters>
-          <option name="profiles">
-            <set />
-          </option>
-          <option name="goals">
-            <list>
-              <option value="clean" />
-              <option value="install" />
-            </list>
-          </option>
-          <option name="profilesMap">
-            <map />
-          </option>
-          <option name="resolveToWorkspace" value="false" />
-          <option name="workingDirPath" value="$PROJECT_DIR$/core" />
-        </MavenRunnerParameters>
-      </option>
-    </MavenSettings>
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/install_tooling_artifact.xml b/.idea/runConfigurations/install_tooling_artifact.xml
deleted file mode 100644
index 6998c9525..000000000
--- a/.idea/runConfigurations/install_tooling_artifact.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="install-tooling-artifact" type="MavenRunConfiguration" factoryName="Maven">
-    <MavenSettings>
-      <option name="myGeneralSettings" />
-      <option name="myRunnerSettings" />
-      <option name="myRunnerParameters">
-        <MavenRunnerParameters>
-          <option name="profiles">
-            <set />
-          </option>
-          <option name="goals">
-            <list>
-              <option value="clean" />
-              <option value="install" />
-            </list>
-          </option>
-          <option name="profilesMap">
-            <map />
-          </option>
-          <option name="resolveToWorkspace" value="false" />
-          <option name="workingDirPath" value="$PROJECT_DIR$/tools/core" />
-        </MavenRunnerParameters>
-      </option>
-    </MavenSettings>
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 1199992a2..92c112da5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -72,33 +72,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-              <artifactSet>
-                <includes>
-                  <include>org.ow2.asm:asm-debug-all</include>
-                </includes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.teavm.asm</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/tools/idea/jps-plugin/.gitignore b/tools/idea/jps-plugin/.gitignore
new file mode 100644
index 000000000..f1ff06d60
--- /dev/null
+++ b/tools/idea/jps-plugin/.gitignore
@@ -0,0 +1 @@
+lib/
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/pom.xml b/tools/idea/jps-plugin/pom.xml
new file mode 100644
index 000000000..66ec62bc4
--- /dev/null
+++ b/tools/idea/jps-plugin/pom.xml
@@ -0,0 +1,65 @@
+<!--
+  ~  Copyright 2016 Alexey Andreev.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.teavm</groupId>
+    <artifactId>teavm</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+  <packaging>pom</packaging>
+
+  <artifactId>teavm-jps-repack</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-tooling</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <outputFile>lib/teavm-all.jar</outputFile>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>org.teavm.asm</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
index fdd677c65..c93b008cb 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
@@ -83,6 +83,7 @@ public class TeaVMBuilder extends ModuleLevelBuilder {
         tool.setSourceMapsFileGenerated(true);
         tool.setTargetDirectory(new File(config.getTargetDirectory()));
         tool.setClassLoader(buildClassLoader(module));
+        tool.setMinifying(false);
 
         try {
             tool.generate();
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
index ef1bc191b..96725390c 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
@@ -15,8 +15,11 @@
  */
 package org.teavm.idea.jps;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.incremental.BuilderService;
@@ -27,6 +30,17 @@ public class TeaVMBuilderService extends BuilderService {
     @NotNull
     @Override
     public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() {
+        try {
+            Enumeration<URL> resources = TeaVMBuilderService.class.getClassLoader().getResources(
+                    "org/objectweb/asm/ClassVisitor.class");
+            while (resources.hasMoreElements()) {
+                URL url = resources.nextElement();
+                System.out.println(url);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        System.out.println();
         return Arrays.asList(new TeaVMBuilder());
     }
 
diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml
index b50dcbc95..dec22f577 100644
--- a/tools/idea/jps-plugin/teavm-jps-plugin.iml
+++ b/tools/idea/jps-plugin/teavm-jps-plugin.iml
@@ -11,9 +11,7 @@
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-144.3600.7" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="teavm-tooling-1.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
+    <orderEntry type="library" name="teavm-all" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/tools/idea/src/main/resources/META-INF/plugin.xml b/tools/idea/src/main/resources/META-INF/plugin.xml
index a5ffd49d2..cf8390e39 100644
--- a/tools/idea/src/main/resources/META-INF/plugin.xml
+++ b/tools/idea/src/main/resources/META-INF/plugin.xml
@@ -21,7 +21,7 @@
     <moduleConfigurable instance="org.teavm.idea.ui.TeaVMConfigurable"/>
     <moduleService serviceInterface="org.teavm.idea.TeaVMConfigurationStorage"
                    serviceImplementation="org.teavm.idea.TeaVMConfigurationStorage"/>
-    <compileServer.plugin classpath="jps-plugin/teavm-jps-plugin.jar"/>
+    <compileServer.plugin classpath="jps/teavm-jps-plugin.jar;teavm-all.jar"/>
   </extensions>
 
   <module-components>
diff --git a/tools/idea/teavm-idea-plugin.iml b/tools/idea/teavm-idea-plugin.iml
index c91659d49..33bdc0471 100644
--- a/tools/idea/teavm-idea-plugin.iml
+++ b/tools/idea/teavm-idea-plugin.iml
@@ -12,10 +12,7 @@
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-144.3600.7" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="teavm-jps-plugin" exported="" />
-    <orderEntry type="library" exported="" name="teavm-tooling-1.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="module" module-name="teavm-jps-plugin" />
+    <orderEntry type="library" name="teavm-all" level="project" />
   </component>
 </module>
\ No newline at end of file