azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename module: ide-lazy-resolve -> ide-common

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-29 17:59:20 +03:00
parent 4e99572dbc
commit 3a10416192
7 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/IdeLazyResolver.xml
Generated
+4 -4
View File
@@ -1,9 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="IdeLazyResolver">
<output-path>$PROJECT_DIR$/out/artifacts/IdeLazyResolver</output-path>
<root id="archive" name="ide-lazy-resolver.jar">
<element id="module-output" name="ide-lazy-resolve" />
<element id="dir-copy" path="$PROJECT_DIR$/idea/ide-lazy-resolve" />
<output-path>$PROJECT_DIR$/out/artifacts/internal/</output-path>
<root id="archive" name="kotlin-ide-common.jar">
<element id="module-output" name="ide-common" />
<element id="dir-copy" path="$PROJECT_DIR$/idea/ide-common" />
</root>
</artifact>
</component>
.idea/artifacts/KotlinPlugin.xml
Generated
+1 -1
View File
@@ -29,7 +29,7 @@
</element>
<element id="module-output" name="eval4j" />
<element id="module-output" name="idea-analysis" />
<element id="module-output" name="ide-lazy-resolve" />
<element id="module-output" name="ide-common" />
<element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
<element id="module-output" name="kotlin-android-plugin" />
</element>
.idea/modules.xml
Generated
+2 -3
View File
@@ -22,8 +22,8 @@
<module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
<module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" filepath="$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" filepath="$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea_runner/idea_runner.iml" filepath="$PROJECT_DIR$/idea_runner/idea_runner.iml" group="ide" />
@@ -48,5 +48,4 @@
<module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
</modules>
</component>
</project>
</project>
build.xml
+2 -2
View File
@@ -692,7 +692,7 @@
source="${java.target}" target="${java.target}">
<withKotlin externalannotations="${external.annotations.path}"/>
<src>
<dirset dir="${basedir}/idea/ide-lazy-resolve">
<dirset dir="${basedir}/idea/ide-common">
<include name="src"/>
</dirset>
<dirset dir="${basedir}/idea/idea-analysis">
@@ -768,7 +768,7 @@
<fileset dir="js/js.frontend/src"/>
<fileset dir="js/js.inliner/src"/>
<fileset dir="idea/idea-analysis/src"/>
<fileset dir="idea/ide-lazy-resolve/src"/>
<fileset dir="idea/ide-common/src"/>
<manifest>
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
idea/ide-lazy-resolve/ide-lazy-resolve.iml → idea/ide-common/ide-common.iml
+3 -3
View File
@@ -17,9 +17,9 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="intellij-core-analysis" level="project" />
<orderEntry type="library" name="guava" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="module" module-name="frontend.java" />
</component>
</module>
</module>
idea/ide-lazy-resolve/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java → idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
View File
idea/idea-analysis/idea-analysis.iml
+2 -3
View File
@@ -32,7 +32,6 @@
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="js.frontend" />
<orderEntry type="library" name="trove4j" level="project" />
<orderEntry type="module" module-name="ide-lazy-resolve" exported="" />
<orderEntry type="module" module-name="ide-common" exported="" />
</component>
</module>
</module>