summaryrefslogtreecommitdiff
path: root/project/JarJar.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-01-26 06:54:26 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2016-01-26 06:54:26 +0100
commit47b89108cf0f33c70c9958ffd182762243afdbbf (patch)
tree6f09761820b044d7c38d88f80e73ba6e903e3092 /project/JarJar.scala
parent7604ccbf12f52a4091a98ba74040cf11e476053e (diff)
parent05ec8ac76dbed2c8a9781c9a4366fc01fc4e3aa3 (diff)
downloadscala-47b89108cf0f33c70c9958ffd182762243afdbbf.tar.gz
scala-47b89108cf0f33c70c9958ffd182762243afdbbf.tar.bz2
scala-47b89108cf0f33c70c9958ffd182762243afdbbf.zip
Merge pull request #4913 from szeiger/wip/sbt-windows-fixes
Some fixes for the sbt build on Windows
Diffstat (limited to 'project/JarJar.scala')
-rw-r--r--project/JarJar.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/project/JarJar.scala b/project/JarJar.scala
index 2eec0e9033..918060c9ee 100644
--- a/project/JarJar.scala
+++ b/project/JarJar.scala
@@ -35,12 +35,12 @@ object JarJar {
}
case class JarEntryInput(jarFile: JarFile, entry: JarEntry) extends Entry {
- def name = entry.getName
+ def name = entry.getName.replace('\\', '/')
def time = entry.getTime
def data = sbt.IO.readBytes(jarFile.getInputStream(entry))
}
case class FileInput(base: File, file: File) extends Entry {
- def name = file.relativeTo(base).get.getPath
+ def name = file.relativeTo(base).get.getPath.replace('\\', '/')
def time = file.lastModified
def data = sbt.IO.readBytes(file)
}