Permalink
Browse files

solve some circular dependencies

  • Loading branch information...
vladdu committed Mar 8, 2018
1 parent 2129b8d commit 6e80fefe2cbe91ed367f0415427afe4ca9da8591
Showing with 668 additions and 705 deletions.
  1. +3 −3 extras/wrangler/plugins/org.erlide.wrangler.help/.settings/org.eclipse.jdt.core.prefs
  2. +8 −4 libs/com.ericsson.otp.jinterface/.classpath
  3. +10 −2 libs/com.google.truth/.classpath
  4. +6 −6 libs/nl.kii.util/.classpath
  5. +4 −16 libs/org.erlide.annotations/.classpath
  6. +11 −3 libs/org.fishwife.jrugged/.classpath
  7. +11 −2 libs/org.incava.util.diff/.classpath
  8. +36 −36 meta/architecture/mvn.java.hsp
  9. +2 −3 plugins/org.erlide.core/META-INF/MANIFEST.MF
  10. +2 −2 plugins/org.erlide.core/plugin.xml
  11. +1 −1 plugins/org.erlide.core/src/org/erlide/core/ErlangPlugin.java
  12. +86 −133 plugins/org.erlide.core/src/org/erlide/core/builder/BuilderHelper.java
  13. +1 −1 plugins/org.erlide.core/src/org/erlide/core/builder/BuilderMessages.java
  14. +1 −2 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ErlangBuilder.java
  15. +28 −0 plugins/org.erlide.core/src/org/erlide/core/builder/ErlangBuilderFactory.java
  16. +1 −2 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ErlangEclipseBuilder.java
  17. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ErlangNature.xtend
  18. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ErlangToolExtensions.xtend
  19. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ErlcMessageParser.java
  20. +4 −6 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/ExternalBuilder.java
  21. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/IMessageParser.java
  22. +4 −9 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/InternalBuilder.java
  23. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{ → builder}/executor/ProgressCallback.java
  24. +1 −1 plugins/org.erlide.core/src/org/erlide/core/{ → builder}/executor/ToolExecutor.java
  25. +2 −2 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/external/EmakeBuilder.xtend
  26. +2 −2 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/external/MakeBuilder.java
  27. +3 −2 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/external/RebarBuilder.xtend
  28. 0 plugins/org.erlide.core/src/org/erlide/core/{internal → }/builder/messages.properties
  29. +14 −8 plugins/org.erlide.core/src/org/erlide/core/internal/ConsoleMessageReporter.java
  30. +0 −28 plugins/org.erlide.core/src/org/erlide/core/internal/builder/ErlangBuilderFactory.java
  31. +189 −201 plugins/org.erlide.core/src/org/erlide/dialyzer/builder/DialyzerUtils.java
  32. +7 −7 plugins/org.erlide.core/src/org/erlide/dialyzer/internal/builder/BuilderMessages.java
  33. +1 −1 plugins/org.erlide.core/src/org/erlide/dialyzer/internal/builder/DialyzerBuilder.java
  34. +0 −1 plugins/org.erlide.cover.api/plugin.xml
  35. +6 −0 plugins/org.erlide.help/.project
  36. +7 −0 plugins/org.erlide.help/.settings/org.eclipse.jdt.core.prefs
  37. +1 −1 plugins/org.erlide.ui/src/org/erlide/ui/wizards/ErlangProjectBuilderPage.xtend
  38. +183 −200 plugins/org.erlide.ui/src/org/erlide/ui/wizards/ProjectCreator.java
  39. +9 −5 tests/org.erlide.core.tests/.classpath
  40. +6 −5 tests/org.erlide.core.tests/src/org/erlide/core/services/builder/BuildersTest.xtend
  41. +1 −1 tests/org.erlide.core.tests/src/org/erlide/core/services/builder/ToolExecutorTest.java
  42. +12 −4 tests/org.erlide.testing.libs/.classpath
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.8
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="src" path="src">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="truth-0.28.jar" sourcepath="truth-0.28-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="src" path="src">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="xtend-gen">
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="xtend-gen/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -5,24 +5,12 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="xtend-gen">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="xtend-gen/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="jrugged-aspects-3.2.2.jar" sourcepath="jrugged-aspects-3.2.2-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="jrugged-core-3.2.2.jar" sourcepath="jrugged-core-3.2.2-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry exported="true" kind="lib" path="jrugged-aspects-3.2.2.jar" sourcepath="jrugged-aspects-3.2.2-sources.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="annotationpath" value="../../erlide_eclipse/.eea"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="java-diff-1.1.jar" sourcepath="java-diff-1.1-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <attributes> <attribute name="annotationpath" value="../../erlide_eclipse/.eea"/> </attributes> </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Oops, something went wrong.

0 comments on commit 6e80fef

Please sign in to comment.