fluencelabs/frank
1
0
Fork 0
mirror of https://github.com/fluencelabs/frank synced 2025-04-25 06:22:13 +00:00
Code Issues Projects Releases Wiki Activity

delete tools installing

Browse Source
This commit is contained in:
vms 2019-10-10 23:03:52 +03:00
parent 7f658229f5
commit ceecb43167
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
project/SbtCommons.scala
View File

@ -32,15 +32,13 @@ object SbtCommons {
"-XX:MaxMetaspaceSize=4G", "-XX:MaxMetaspaceSize=4G",
"-Xms4G", "-Xms4G",
"-Xmx4G", "-Xmx4G",
"-Xss6M", "-Xss6M"
//s"-Djava.library.path=${file("").getAbsolutePath}/src/main/rust/target/release"
), ),
javaOptions in IntegrationTest ++= Seq( javaOptions in IntegrationTest ++= Seq(
"-XX:MaxMetaspaceSize=4G", "-XX:MaxMetaspaceSize=4G",
"-Xms4G", "-Xms4G",
"-Xmx4G", "-Xmx4G",
"-Xss6M", "-Xss6M"
//s"-Djava.library.path=${file("").getAbsolutePath}/src/main/rust/target/release"
), ),
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.0") addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.0")
) )
@ -57,23 +55,12 @@ object SbtCommons {
val rustToolchain = "nightly-2019-09-23" val rustToolchain = "nightly-2019-09-23"
def installPrerequisites() = {
val installRust = s"curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $rustToolchain"
val installToolchain = s"~/.cargo/bin/rustup toolchain install $rustToolchain"
val installCross = "cargo install cross"
//assert((installRust !) == 0, "Rust installation failed")
//assert((installToolchain !) == 0 , s"toolchain $rustToolchain installation failed")
(installCross !)
}
def compileFrank() = { def compileFrank() = {
val projectRoot = file("").getAbsolutePath val projectRoot = file("").getAbsolutePath
val frankFolder = s"$projectRoot/src/main/rust" val frankFolder = s"$projectRoot/src/main/rust"
val localCompileCmd = s"cargo +$rustToolchain build --manifest-path $frankFolder/Cargo.toml --release --lib" val localCompileCmd = s"cargo +$rustToolchain build --manifest-path $frankFolder/Cargo.toml --release --lib"
val crossCompileCmd = s"cd $frankFolder ; cross build --target x86_64-unknown-linux-gnu --release --lib" val crossCompileCmd = s"cd $frankFolder ; cross build --target x86_64-unknown-linux-gnu --release --lib"
println(crossCompileCmd)
assert((localCompileCmd !) == 0, "Frank VM native compilation failed") assert((localCompileCmd !) == 0, "Frank VM native compilation failed")
assert((crossCompileCmd !) == 0, "Cross compilation to linux failed") assert((crossCompileCmd !) == 0, "Cross compilation to linux failed")
} }
@ -86,9 +73,6 @@ object SbtCommons {
.dependsOn(Def.task { .dependsOn(Def.task {
val log = streams.value.log val log = streams.value.log
log.info("Installing prerequisites for native part compilation")
installPrerequisites()
log.info("Compiling Frank VM") log.info("Compiling Frank VM")
compileFrank() compileFrank()
}) })