@@ -65,7 +65,8 @@ lazy val chiselSettings = Seq (
65
65
</developer >
66
66
</developers >,
67
67
68
- publishTo <<= version { v : String =>
68
+ publishTo := {
69
+ val v = version.value
69
70
val nexus = " https://oss.sonatype.org/"
70
71
if (v.trim.endsWith(" SNAPSHOT" )) {
71
72
Some (" snapshots" at nexus + " content/repositories/snapshots" )
@@ -90,11 +91,6 @@ lazy val chiselSettings = Seq (
90
91
parallelExecution in Test := true ,
91
92
92
93
javacOptions ++= Seq (" -target" , " 1.7" )
93
- // Hopefully we get these options back in Chisel3
94
- // scalacOptions in (Compile, doc) <++= (baseDirectory in LocalProject("chisel"), version) map { (bd, v) =>
95
- // Seq("-diagrams", "-diagrams-max-classes", "25", "-sourcepath", bd.getAbsolutePath, "-doc-source-url",
96
- // "https://github.com/ucb-bar/chisel/tree/master/€{FILE_PATH}.scala")
97
- // }
98
94
)
99
95
100
96
lazy val coreMacros = (project in file(" coreMacros" )).
@@ -134,10 +130,10 @@ lazy val chisel = (project in file(".")).
134
130
),
135
131
aggregate in doc := false ,
136
132
// Include macro classes, resources, and sources main JAR.
137
- mappings in (Compile , packageBin) < ++= mappings in (coreMacros, Compile , packageBin),
138
- mappings in (Compile , packageSrc) < ++= mappings in (coreMacros, Compile , packageSrc),
139
- mappings in (Compile , packageBin) < ++= mappings in (chiselFrontend, Compile , packageBin),
140
- mappings in (Compile , packageSrc) < ++= mappings in (chiselFrontend, Compile , packageSrc),
133
+ mappings in (Compile , packageBin) ++= ( mappings in (coreMacros, Compile , packageBin)).value ,
134
+ mappings in (Compile , packageSrc) ++= ( mappings in (coreMacros, Compile , packageSrc)).value ,
135
+ mappings in (Compile , packageBin) ++= ( mappings in (chiselFrontend, Compile , packageBin)).value ,
136
+ mappings in (Compile , packageSrc) ++= ( mappings in (chiselFrontend, Compile , packageSrc)).value ,
141
137
// Export the packaged JAR so projects that depend directly on Chisel project (rather than the
142
138
// published artifact) also see the stuff in coreMacros and chiselFrontend.
143
139
exportJars := true
0 commit comments