From 5721e092bbed96ec47305721eef91394848c7f49 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 26 Mar 2022 17:51:42 +0000 Subject: [PATCH] Refine build.sbt. ignore no use middle files of scala. --- .gitignore | 7 +- design/build.sbt | 87 +++++++++--------- .../target/scala-2.12/classes/wrapper$.class | Bin 3748 -> 0 bytes .../classes/wrapper$delayedInit$body.class | Bin 711 -> 0 bytes .../target/scala-2.12/classes/wrapper.class | Bin 772 -> 0 bytes 5 files changed, 45 insertions(+), 49 deletions(-) delete mode 100644 design/target/scala-2.12/classes/wrapper$.class delete mode 100644 design/target/scala-2.12/classes/wrapper$delayedInit$body.class delete mode 100644 design/target/scala-2.12/classes/wrapper.class diff --git a/.gitignore b/.gitignore index 0b7e860a..00c47916 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,12 @@ .metals/ .vscode/ - # design/project/target/ # design/project/project/ design/project/ design/.idea/ -design/target/streams/ -design/target/.history - -design/target/scala-2.12/ --design/target/scala-2.12/classes/wrapper* +design/target/ generated_rtl/*.sv verif/sim/*.log diff --git a/design/build.sbt b/design/build.sbt index 371c683b..7ff481f2 100644 --- a/design/build.sbt +++ b/design/build.sbt @@ -1,56 +1,57 @@ -// See README.md for license details. +// ThisBuild / scalaVersion := "2.13.8" +// ThisBuild / version := "3.3.0" +// ThisBuild / organization := "COLIN" -def scalacOptionsVersion(scalaVersion: String): Seq[String] = { - Seq() ++ { - // If we're building with Scala > 2.11, enable the compile option - CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq() - case _ => Seq("-Xsource:2.11") - } - } -} +// mainClass in (Compile, run) := Some("QUASAR_Wrp") -def javacOptionsVersion(scalaVersion: String): Seq[String] = { - Seq() ++ { - // Scala 2.12 requires Java 8. We continue to generate - // Java 7 compatible code for Scala 2.11 - // for compatibility with old clients. - CrossVersion.partialVersion(scalaVersion) match { - case Some((2, scalaMajor: Long)) if scalaMajor < 12 => - Seq("-source", "1.7", "-target", "1.7") - case _ => - Seq("-source", "1.8", "-target", "1.8") - } - } -} +// resolvers ++= Seq( +// Resolver.sonatypeRepo("snapshots"), +// Resolver.sonatypeRepo("releases") +// ) -name := "QUASAR" +// val chiselVersion = "3.5.2" -version := "3.3.0" +// lazy val root = (project in file(".")) +// .settings( +// name := "QUASAR", +// libraryDependencies ++= Seq( +// "edu.berkeley.cs" %% "chisel3" % chiselVersion, +// "edu.berkeley.cs" %% "chisel-iotesters" % "2.5.2", +// "edu.berkeley.cs" %% "chiseltest" % "0.5.2" +// ), +// scalacOptions ++= Seq( +// "-language:reflectiveCalls", +// "-deprecation", +// "-feature", +// "-Xcheckinit", +// "-P:chiselplugin:genBundleElements", +// "-Ymacro-annotations", +// ), +// addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full), +// ) -scalaVersion := "2.12.10" +ThisBuild / scalaVersion := "2.12.10" +ThisBuild / version := "3.3.0" +ThisBuild / organization := "COLIN" -// Making the main-class -mainClass in (Compile, run) := Some("wrapper") - -crossScalaVersions := Seq("2.12.10", "2.11.12") +mainClass in (Compile, run) := Some("QUASAR_Wrp") resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), Resolver.sonatypeRepo("releases") ) -addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) - -// Provide a managed dependency on X if -DXVersion="" is supplied on the command line. -val defaultVersions = Seq( - "chisel-iotesters" -> "1.4.1+", - "chiseltest" -> "0.2.1+" +lazy val root = (project in file(".")) + .settings( + name := "QUASAR", + libraryDependencies ++= Seq( + "edu.berkeley.cs" %% "chisel-iotesters" % "1.4.1", + "edu.berkeley.cs" %% "chiseltest" % "0.2.1+" + ), + scalacOptions ++= Seq( + "-Xsource:2.11" + ), + addCompilerPlugin( + "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full + ) ) - -libraryDependencies ++= defaultVersions.map { case (dep, ver) => - "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", ver) } - -scalacOptions ++= scalacOptionsVersion(scalaVersion.value) - -javacOptions ++= javacOptionsVersion(scalaVersion.value) diff --git a/design/target/scala-2.12/classes/wrapper$.class b/design/target/scala-2.12/classes/wrapper$.class deleted file mode 100644 index 3abeab80a9cd93c00b410be52a29db866dc7bd03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3748 zcmbtWd2>@$96h&N+7M{kvPFyE5cl#`A@ z2qdq_Ycgj_YdSYJc}11n7+M9oswHX4-0?~!hIWCKvo%?j&O|VCxA#?GTYau!U9+#M z+!^Iww#%oaRW?;MU9jz|HG1e2*zk1I7~%pQzP&)~%-Hbx!ils%ybvav7g(Wgs8Y=} zY^&%>#}yE#nZK7ynwh546VjQk3iMqn)T0$$$FQb3yDwsBScW@fmlaDW_?4Dy(`51V zotvq-a?(_}f>Ct`Yg1Fo;p}2Fc1HrElQqk8wI>{KYL;uvsNA4^LzT}nc>XB=xD-c9 zrq1Q4Kx?LdoDdxGUK3c0HF2~cCD7&jiDc%;Nw6sQUcFm zyUs5o(6i(_z0OF(5?GyS0E3R&uD>(R=4hOTwh8RQZXGG-!G1b{ZX~;i_Pzvq(5s&g z5RM36JYr3x)hs96NbeQcp6L%#{4e61Z_YBrbOHNtpfPn4=)+2#=wVX0p6EnXxvp}U z>7q{YGjGeB);MJwnAeBWVQctvG9j2xFH`#+Z^|?*tI0aG;}vOX+16CeN?Yo>2EUh( zE*2y$4vR-(7>Z+9_fIOI;R&l;u?@>jhl)Z^sS^7@nfr59S5B+kkoQJ$nN~5p9LFg= zeU<;2&>d=g~MaSZAnEp&I_OcH~w6xf))P*r<9L~}*u7}7LuYCVbJHGwU4Pk~|< z=#%|&r^ouxMuFSW!bLu^k2=={Ul0ya+yLFaW60$GO?aZw9F8e zhF+t^2ZjkuVOj^eOnoNHOwGY{g(p&nWTZ&!^R6slb>sBoXhSN2ruc~ zgz0-qPF-|R)oMkFUK?^ZDy>>=W4I=;JX7B-wVtlUjX17jE`crBs+syO7mDat16C@Z zdki_yfL$SXRoOSoN1+L*LRI&P9;%dYI$RGC!v{P~Oxm_vb$RR%__;x-MyH1VL*zv? z_YWhBvR}&TkMMCEAL0|T`crN{rq`5_G7`9rTfGqYoYfSKX-m2_hsTFD{}j<(Ff27% zo0(M3Io<0NfP&2v)VO5-^F0`h537o!O43#2Y|^j#taRjzqG)qJPK;QVa)wMdi-^yl$=cTpeGMl2p7)QB}@vmLz=?B!awG1(4YyEMhvguQx`{{@)mOY08fm+|vN9yExb! zTF*Bs<{l0w~1NnU*|lAFFwEtUA2gC_6`#{xxoK9 zGPRu+Tjz0#)+2>ScpEsg<38jlFY0jHj-9(wZTDeZsAs7q7Pv#A`weh_E@JGNE4a!~ z%drXrq;LxtCJB?*R)$-K8CVR)Pyy9j^w~d1dWc^%=~CGTu(N++mfcp%&g1$;4&1zt z_v*oyc3#SNn2h6n+zK4(zSa(7*+=*S&>*mZ@I9|_e&}L838e4?-&>gbkG!wv(;Mi- zD;UKX&f--R`9FrwXg`XdXmLzXx-`_>ps>bM38As{TAnfm?w9OM>MGU?kl5UYaLA*Q L(2LJafnM-0$W?cJ diff --git a/design/target/scala-2.12/classes/wrapper$delayedInit$body.class b/design/target/scala-2.12/classes/wrapper$delayedInit$body.class deleted file mode 100644 index 8dbfbdfc3459c9b838b8e4ecf180112ca7fd3ff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 711 zcmZ`%+iuf96r6PuyGfHKEu}XuEnraEN`y-A6odp-D@Ae&QrfNzzCML)Cfgj&&kEy`M&&4&vyZg_6MH>r{?q^1NWWoA(HqcARRJ2-KYE zjIKb1)4~ax+MCX)d?P!dj9zx0x~Iz1-8xKIRT!uV%uJgs)CE=xd3%vRii1eo)6*S+ zQhW2bjyW`IXrLvq{IBRI@jK-o@mdxZ1jg8U4T&Qe_l33Utp4C$w?QH_&))299|n`pIfAbWJy2@3nmFYV zF{=Zyy&4#M-Ne zY68|FslXbf5}-gVhPP`3;wHD*jGHaT@=?3eQl)0#7{28?kLFF(f5OjJY6gyPjksEO zr`+sgjp~cVSh{P@5|Dw-u+I$w>wL{Ij@C@FxY)s6aEJhhv6HB*w&2e0xh5bTxR?CKc z5J1GA34o#qC+@7(iPgi@G(y5p#y*#j|2lUl+(s*a1b5KJ5gNfGPaq0K3{VN+4@#e&W&i*H