8000 Merge pull request #12 from lrytz/topic/code-retreat · lrytz/scala@5b4b177 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5b4b177

Browse files
retronymretronym
committed
Merge pull request scala#12 from lrytz/topic/code-retreat
repls depends on interactive
2 parents 689b4dd + 73d17c8 commit 5b4b177

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ lazy val interactive = configureAsSubproject(project)
194194
lazy val repl = configureAsSubproject(project)
195195
.settings(libraryDependencies += jlineDep)
196196
.settings(disableDocsAndPublishingTasks: _*)
197-
.dependsOn(compiler)
197+
.dependsOn(compiler, interactive)
198198

199199
lazy val scaladoc = configureAsSubproject(project)
200200
.settings(

‎build.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -796,12 +796,6 @@ TODO:
796796
<path refid="asm.classpath"/>
797797
</path>
798798

799-
<path id="quick.repl.build.path">
800-
<path refid="quick.compiler.build.path"/>
801-
<pathelement location="${build-quick.dir}/classes/repl"/>
802-
<path refid="repl.deps.classpath"/>
803-
</path>
804-
805799
<path id="quick.scalap.build.path">
806800
<path refid="quick.compiler.build.path"/>
807801
<pathelement location="${build-quick.dir}/classes/scalap"/>
@@ -832,6 +826,13 @@ TODO:
832826
<pathelement location="${build-quick.dir}/classes/interactive"/>
833827
</path>
834828

829+
<path id="quick.repl.build.path">
830+
<path refid="quick.compiler.build.path"/>
831+
<path refid="quick.interactive.build.path"/>
832+
<pathelement location="${build-quick.dir}/classes/repl"/>
833+
<path refid="repl.deps.classpath"/>
834+
</path>
835+
835836
<path id="quick.bin.tool.path">
836837
<path refid="quick.repl.build.path"/>
837838
<path refid="quick.actors.build.path"/>
@@ -1156,15 +1157,15 @@ TODO:
11561157
<target name="quick.comp" depends="quick.reflect">
11571158
<staged-build with="locker" stage="quick" project="compiler"/> </target>
11581159

1159-
<target name="quick.repl" depends="quick.comp">
1160-
<staged-build with="locker" stage="quick" project="repl"/> </target>
1161-
11621160
<target name="quick.scaladoc" depends="quick.comp">
11631161
<staged-build with="locker" stage="quick" project="scaladoc" version="scaladoc"/> </target>
11641162

11651163
<target name="quick.interactive" depends="quick.comp, quick.scaladoc">
11661164
<staged-build with="locker" stage="quick" project="interactive"/> </target>
11671165

1166+
<target name="quick.repl" depends="quick.comp, quick.interactive">
1167+
<staged-build with="locker" stage="quick" project="repl"/> </target>
1168+
11681169
<target name="quick.scalap" depends="quick.repl">
11691170
<staged-build with="locker" stage="quick" project="scalap"/> </target>
11701171

‎src/intellij/repl.iml.SAMPLE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<orderEntry type="module" module-name="compiler" />
1111
<orderEntry type="module" module-name="library" />
1212
<orderEntry type="module" module-name="reflect" />
13+
<orderEntry type="module" module-name="interactive" />
1314
<orderEntry type="library" name="starr" level="project" />
1415
<orderEntry type="library" name="repl-deps" level="project" />
1516
<orderEntry type="library" name="asm" level="project" />

0 commit comments

Comments
 (0)
0