Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drive-relative paths in Windows SHELL environments #2516

Merged
merged 11 commits into from
Nov 24, 2023
Merged

drive-relative paths in Windows SHELL environments #2516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c7135f
fix for #2359, drive-relative paths accepted in Windows SHELL environ…
philwalk Nov 8, 2023
f9b3332
added anti-regression test handling of drive-relative for os.Path
philwalk Nov 9, 2023
ce08732
fix classpath-split regex String to accept either forward slash or ba…
philwalk Nov 9, 2023
545d535
added integration tests for JAVA_HOME setting to RunScriptTestDefinit…
philwalk Nov 11, 2023
e364fbf
apply suggested changes
philwalk Nov 13, 2023
79c9b1c
Merge branch 'main' of https://github.com/VirtusLab/scala-cli into fi…
philwalk Nov 15, 2023
223aaa9
Merge remote-tracking branch 'origin/main' into fix-for-windows-shell…
Gedochao Nov 21, 2023
935b9b4
fix for cli.base-image.nativeImage in Windows
philwalk Nov 21, 2023
1e6c9e9
Merge branch 'fix-for-windows-shell-environments-issue-2359' of https…
philwalk Nov 21, 2023
f733fc2
fix JAVA_HOME test; tweak mill script
philwalk Nov 22, 2023
693a065
Apply suggestions from code review
philwalk Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ out/
.scala-build
dest/
target/

# ignore vim backup files
*.sw[op]
2 changes: 1 addition & 1 deletion modules/cli/src/main/scala/scala/cli/commands/installcompletions/InstallCompletions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ object InstallCompletions extends ScalaCommand[InstallCompletionsOptions] {
def getFormat(format: Option[String]): Option[String] =
format.map(_.trim).filter(_.nonEmpty)
.orElse {
Option(System.getenv("SHELL")).map(_.split(File.separator).last).map {
Option(System.getenv("SHELL")).map(_.split("[\\/]+").last).map {
case "bash" => Bash.id
case "zsh" => Zsh.id
case other => other
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/src/test/scala/scala/cli/integration/CompileTestDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ abstract class CompileTestDefinitions(val scalaVersionOpt: Option[String])
"."
).call(cwd = root)
val classPath = res.out.trim().split(File.pathSeparator)
val classPathFileNames = classPath.map(_.split(Pattern.quote(File.separator)).last)
val classPathFileNames = classPath.map(_.split(Pattern.quote("[\\/]+")).last)
expect(classPathFileNames.exists(_.startsWith("spark-core_")))
// usually a duplicate is there if we don't call .distrinct when necessary here or there
expect(classPathFileNames.exists(_.startsWith("snappy-java")))
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/src/test/scala/scala/cli/integration/PackageTestDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ abstract class PackageTestDefinitions(val scalaVersionOpt: Option[String])
if (actualScalaVersion.startsWith("2.")) actualScalaVersion
else {
val scalaLibJarName = scalaLibCp.split(File.pathSeparator)
.map(_.split(Pattern.quote(File.separator)).last).find(_.startsWith("scala-library-"))
.map(_.split(Pattern.quote("[\\/]+")).last).find(_.startsWith("scala-library-"))
.getOrElse {
sys.error(s"scala-library not found in provided class path $scalaLibCp")
}
Expand Down
2 changes: 1 addition & 1 deletion project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ object Deps {
def munit = ivy"org.scalameta::munit:0.7.29"
def nativeTestRunner = ivy"org.scala-native::test-runner:${Versions.scalaNative}"
def nativeTools = ivy"org.scala-native::tools:${Versions.scalaNative}"
def osLib = ivy"com.lihaoyi::os-lib:0.9.1"
def osLib = ivy"com.lihaoyi::os-lib:0.9.2"
philwalk marked this conversation as resolved.
Show resolved Hide resolved
def pprint = ivy"com.lihaoyi::pprint:0.8.1"
def pythonInterface = ivy"io.github.alexarchambault.python:interface:0.1.0"
def pythonNativeLibs = ivy"ai.kien::python-native-libs:0.2.4"
Expand Down