wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use stable dep. versions | Small bumps/cleanup

Browse Source
This commit is contained in:
abejgonzalez
2020-11-30 21:11:24 -08:00
parent fa699af026
commit 3a29f53572
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -4,7 +4,7 @@ src/main/scala/dsptools/sandbox.sc
test_run_dir/ test_run_dir/
*.fir *.fir
*.f *.f
*.anno *.anno.json
### XilinxISE template ### XilinxISE template
# intermediate build files # intermediate build files
@@ -345,4 +345,4 @@ project/plugins/project/
hs_err_pid* hs_err_pid*
# ignore lib from rocket build # ignore lib from rocket build
lib lib

20
build.sbt
View File

@@ -1,14 +1,14 @@
// See LICENSE for license details. // See LICENSE for license details.
val defaultVersions = Map( val defaultVersions = Map(
"chisel3" -> "3.4-SNAPSHOT", "chisel3" -> "3.4.+",
"chisel-iotesters" -> "1.5-SNAPSHOT" "chisel-iotesters" -> "1.5.+"
) )
lazy val commonSettings = Seq( lazy val commonSettings = Seq(
organization := "edu.berkeley.cs", organization := "edu.berkeley.cs",
version := "0.1-SNAPSHOT", version := "0.1-SNAPSHOT",
scalaVersion := "2.12.8", scalaVersion := "2.12.10",
scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls", "-Xsource:2.11"), scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls", "-Xsource:2.11"),
libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { libraryDependencies ++= Seq("chisel3","chisel-iotesters").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep))
@@ -19,7 +19,8 @@ lazy val commonSettings = Seq(
), ),
resolvers ++= Seq( resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"), Resolver.sonatypeRepo("snapshots"),
Resolver.sonatypeRepo("releases") Resolver.sonatypeRepo("releases"),
Resolver.mavenLocal
) )
) )
@@ -29,21 +30,16 @@ lazy val mdf = (project in file("mdf/scalalib"))
lazy val macros = (project in file("macros")) lazy val macros = (project in file("macros"))
.dependsOn(mdf) .dependsOn(mdf)
.settings(commonSettings) .settings(commonSettings)
.settings(Seq( .settings(
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"edu.berkeley.cs" %% "firrtl-interpreter" % "1.4.0" % Test "edu.berkeley.cs" %% "firrtl-interpreter" % "1.4.+" % Test
), ),
mainClass := Some("barstools.macros.MacroCompiler") mainClass := Some("barstools.macros.MacroCompiler")
)) )
.enablePlugins(sbtassembly.AssemblyPlugin) .enablePlugins(sbtassembly.AssemblyPlugin)
lazy val tapeout = (project in file("tapeout")) lazy val tapeout = (project in file("tapeout"))
.settings(commonSettings) .settings(commonSettings)
.settings(Seq(
libraryDependencies ++= Seq(
"io.github.daviddenton" %% "handlebars-scala-fork" % "2.3.0"
)
))
.settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls")) .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls"))
lazy val root = (project in file(".")).aggregate(macros, tapeout) lazy val root = (project in file(".")).aggregate(macros, tapeout)

2
project/build.properties
View File

@@ -1 +1 @@
sbt.version=1.2.7 sbt.version=1.3.13