Fix sbt plugin incompatibilities on Windows #2189
Conversation
|
I had put in an issue #2127 and had at least a plan sketch to use the I found that I think PR right now looks good. |
| @@ -185,4 +178,12 @@ private[scalanative] object NativeLib { | |||
| case true => Some(path) | |||
| case false => None | |||
| } | |||
|
|
|||
| private def makeDirPath(path: Path, elems: String*): String = { | |||
| val pathSep = if (Platform.isWindows) raw"\\" else File.separator | |||
There was a problem hiding this comment.
This is needed because it is inside a glob which is like a regex?
There was a problem hiding this comment.
Yes, I think that glob in java is also implemented based on regex.
Without this, we would not be able to correctly find all native libs.
| @@ -85,7 +85,8 @@ object Discover { | |||
| private[scalanative] def checkClangVersion(pathToClangBinary: Path): Unit = { | |||
| def versionMajorFull(clang: String): (Int, String) = { | |||
| val versionCommand = s"$clang --version" | |||
| val path = Process(s"which $binaryNameOrPath") | ||
| val binaryNameOrPath = sys.env.getOrElse(envPath, binaryName) | ||
| val locateCmd = if (Platform.isWindows) "where" else "which" | ||
| val path = Process(s"$locateCmd $binaryNameOrPath") |
There was a problem hiding this comment.
Should this also use a Seq for the arguments?
| package scala.scalanative.build | ||
|
|
||
| object Platform { | ||
| private lazy val osUsed = System.getProperty("os.name", "unknown").toLowerCase |
There was a problem hiding this comment.
This won't work on a Turkish/Lithuanian/Azeri system.
| private lazy val osUsed = System.getProperty("os.name", "unknown").toLowerCase | |
| private lazy val osUsed = System.getProperty("os.name", "unknown").toLowerCase(Locale.ROOT) |
- Use toLowerCase with Root locale - Pass command as sequence instead of string - Remove duplicated commands definitions
This PR fixes fatal errors in the sbt plugin when trying to use it on Windows. Changes include: * detection of os used in sbt plugin * using `where` command instead of `which` * passing paths in process commands in sequences, to correctly handle spaces * fixes to regex and globing filters including usage of the correct path separator Some methods with single usage were inlined.
This PR fixes fatal errors in the sbt plugin when trying to use it on Windows. Changes include: * detection of os used in sbt plugin * using `where` command instead of `which` * passing paths in process commands in sequences, to correctly handle spaces * fixes to regex and globing filters including usage of the correct path separator Some methods with single usage were inlined.
This PR fixes fatal errors in the sbt plugin when trying to use it on Windows. Changes include:
wherecommand instead ofwhichSome methods with single usage were inlined.
There are still some pending sbt plugin related issues that would need to resolve in the following PRs, e.g.:
llvm-configdependent settings -llvm-configis not included in prebuilt binaries targeted for Windows. We don't want to force users to build it locally. Probably forincludeandlibdir we can use fixed relative paths based on the location ofclangorclang++. I have such change prepared, however I decided to not include it now, because of next problemincludeandlibdirectories, however might finally decide to leave this part for users to configure.