From ec5bdc2381855311d4d0e1d384786a7ca62d2023 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 18 Dec 2017 23:07:25 -0500 Subject: [PATCH 1/5] Add Windows testing --- .appveyor.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..1cc9a9906 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,26 @@ +build: off + +init: + - git config --global core.autocrlf input + +install: + - cinst nodejs -params 'installdir=C:\\nodejs' + - SET PATH=C:\nodejs\bin;%PATH% + - cinst jdk8 -params 'installdir=C:\\jdk8' + - SET JAVA_HOME=C:\jdk8 + - SET PATH=C:\jdk8\bin;%PATH% + + - ps: | + Add-Type -AssemblyName System.IO.Compression.FileSystem + if (!(Test-Path -Path "C:\sbt" )) { + (new-object System.Net.WebClient).DownloadFile( + 'https://github.com/sbt/sbt/releases/download/v1.0.4/sbt-1.0.4.zip', + 'C:\sbt-bin.zip' + ) + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt") + } + - SET PATH=C:\sbt\sbt\bin;%PATH% + - SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8 +test_script: + - sbt "scripted actions/*" + - sbt "scripted server/*" From c920919c2c13d66d36a7a257ea56b0eebd63b3d2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 19 Dec 2017 00:17:46 -0500 Subject: [PATCH 2/5] Fix build so it works on Windows --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index ec5065942..368393d59 100644 --- a/build.sbt +++ b/build.sbt @@ -34,6 +34,7 @@ def buildLevelSettings: Seq[Setting[_]] = scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt"), "git@github.com:sbt/sbt.git")), resolvers += Resolver.mavenLocal, scalafmtOnCompile := true, + scalafmtOnCompile in Sbt := false, scalafmtVersion := "1.3.0", )) @@ -463,10 +464,9 @@ lazy val sbtIgnoredProblems = { } def runNpm(command: String, base: File, log: sbt.internal.util.ManagedLogger) = { - val npm = if (sbt.internal.util.Util.isWindows) "npm.cmd" else "npm" import scala.sys.process._ try { - val exitCode = Process(s"$npm $command", Option(base)) ! log + val exitCode = Process(s"npm $command", Option(base)) ! log if (exitCode != 0) throw new Exception("Process returned exit code: " + exitCode) } catch { case e: java.io.IOException => log.warn("failed to run npm " + e.getMessage) From 294110e2b8074e13c50aeb8e4e734fe77651433c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 19 Dec 2017 00:44:31 -0500 Subject: [PATCH 3/5] Remove JNA from sbt/sbt There's a conflict in JNA version difference between sbt and IO. Fixes #3821 --- build.sbt | 3 +-- project/Dependencies.scala | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 368393d59..dcedffd62 100644 --- a/build.sbt +++ b/build.sbt @@ -311,8 +311,7 @@ lazy val commandProj = (project in file("main-command")) .settings( testedBaseSettings, name := "Command", - libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi, - jna, jnaPlatform), + libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson.value, templateResolverApi), managedSourceDirectories in Compile += baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f8e14429f..73405aea8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -106,8 +106,6 @@ object Dependencies { val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1" val junit = "junit" % "junit" % "4.11" val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1" - val jna = "net.java.dev.jna" % "jna" % "4.1.0" - val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "4.1.0" private def scala211Module(name: String, moduleVersion: String) = Def setting ( scalaBinaryVersion.value match { From 3507403a360cdac49950574394c157c53e53e4c1 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 19 Dec 2017 02:12:03 -0500 Subject: [PATCH 4/5] -Djna.nosys=true --- .appveyor.yml | 6 ++---- build.sbt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1cc9a9906..45e3cfd3f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,8 +4,6 @@ init: - git config --global core.autocrlf input install: - - cinst nodejs -params 'installdir=C:\\nodejs' - - SET PATH=C:\nodejs\bin;%PATH% - cinst jdk8 -params 'installdir=C:\\jdk8' - SET JAVA_HOME=C:\jdk8 - SET PATH=C:\jdk8\bin;%PATH% @@ -22,5 +20,5 @@ install: - SET PATH=C:\sbt\sbt\bin;%PATH% - SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8 test_script: - - sbt "scripted actions/*" - - sbt "scripted server/*" + - sbt "-Djna.nosys=true" "scripted actions/*" + - sbt "-Djna.nosys=true" "scripted server/*" diff --git a/build.sbt b/build.sbt index dcedffd62..8000bd603 100644 --- a/build.sbt +++ b/build.sbt @@ -572,7 +572,7 @@ def otherRootSettings = scriptedUnpublished := scriptedUnpublishedTask.evaluated, scriptedSource := (sourceDirectory in sbtProj).value / "sbt-test", // scriptedPrescripted := { addSbtAlternateResolver _ }, - scriptedLaunchOpts := List("-Xmx1500M", "-Xms512M", "-server"), + scriptedLaunchOpts := List("-Xmx1500M", "-Xms512M", "-server", "-Djna.nosys=true"), publishAll := { val _ = (publishLocal).all(ScopeFilter(inAnyProject)).value }, publishLocalBinAll := { val _ = (publishLocalBin).all(ScopeFilter(inAnyProject)).value }, aggregate in bintrayRelease := false From bc4d3d5031152b06162b7c2ad1a44991041dd967 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 19 Dec 2017 03:24:51 -0500 Subject: [PATCH 5/5] just scripted actions/* --- .appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 45e3cfd3f..0b15d875f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,4 +21,3 @@ install: - SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8 test_script: - sbt "-Djna.nosys=true" "scripted actions/*" - - sbt "-Djna.nosys=true" "scripted server/*"