Skip to content

repls depends on interactive #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2015
Merged

repls depends on interactive #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ lazy val interactive = configureAsSubproject(project)
lazy val repl = configureAsSubproject(project)
.settings(libraryDependencies += jlineDep)
.settings(disableDocsAndPublishingTasks: _*)
.dependsOn(compiler)
.dependsOn(compiler, interactive)

lazy val scaladoc = configureAsSubproject(project)
.settings(
Expand Down
19 changes: 10 additions & 9 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,12 +796,6 @@ TODO:
<path refid="asm.classpath"/>
</path>

<path id="quick.repl.build.path">
<path refid="quick.compiler.build.path"/>
<pathelement location="${build-quick.dir}/classes/repl"/>
<path refid="repl.deps.classpath"/>
</path>

<path id="quick.scalap.build.path">
<path refid="quick.compiler.build.path"/>
<pathelement location="${build-quick.dir}/classes/scalap"/>
Expand Down Expand Up @@ -832,6 +826,13 @@ TODO:
<pathelement location="${build-quick.dir}/classes/interactive"/>
</path>

<path id="quick.repl.build.path">
<path refid="quick.compiler.build.path"/>
<path refid="quick.interactive.build.path"/>
<pathelement location="${build-quick.dir}/classes/repl"/>
<path refid="repl.deps.classpath"/>
</path>

<path id="quick.bin.tool.path">
<path refid="quick.repl.build.path"/>
<path refid="quick.actors.build.path"/>
Expand Down Expand Up @@ -1156,15 +1157,15 @@ TODO:
<target name="quick.comp" depends="quick.reflect">
<staged-build with="locker" stage="quick" project="compiler"/> </target>

<target name="quick.repl" depends="quick.comp">
<staged-build with="locker" stage="quick" project="repl"/> </target>

<target name="quick.scaladoc" depends="quick.comp">
<staged-build with="locker" stage="quick" project="scaladoc" version="scaladoc"/> </target>

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

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

<target name="quick.scalap" depends="quick.repl">
<staged-build with="locker" stage="quick" project="scalap"/> </target>

Expand Down
1 change: 1 addition & 0 deletions src/intellij/repl.iml.SAMPLE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<orderEntry type="module" module-name="compiler" />
<orderEntry type="module" module-name="library" />
<orderEntry type="module" module-name="reflect" />
<orderEntry type="module" module-name="interactive" />
<orderEntry type="library" name="starr" level="project" />
<orderEntry type="library" name="repl-deps" level="project" />
<orderEntry type="library" name="asm" level="project" />
Expand Down