summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-01-14 19:28:35 +0100
committerStefan Zeiger <szeiger@novocode.com>2016-01-14 19:28:35 +0100
commite97bc1fb8e5c82da2a53d5bb0a5b08e0e53847e2 (patch)
tree7fb74a2168806176c8d3c00aeafd6b38eacdc646 /project
parentf6bd7123fcce1bd72f141a8a0f95559c12bb5dd2 (diff)
downloadscala-e97bc1fb8e5c82da2a53d5bb0a5b08e0e53847e2.tar.gz
scala-e97bc1fb8e5c82da2a53d5bb0a5b08e0e53847e2.tar.bz2
scala-e97bc1fb8e5c82da2a53d5bb0a5b08e0e53847e2.zip
Normalize Windows paths when calling JarJar from the sbt build
Diffstat (limited to 'project')
-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)
}