Relativize jar paths

pantsbuild · Jul 18, 2018 · 5cedd46 · 5cedd46
1 parent 2834948
commit 5cedd46
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/scala/org/pantsbuild/zinc/compiler/OutputUtils.scala b/src/scala/org/pantsbuild/zinc/compiler/OutputUtils.scala
@@ -39,19 +39,24 @@ object OutputUtils {
     sorted
   }
 
+  def relativize(base: String, path: Path): String = {
+    new File(base).toURI().relativize(new File(path.toString).toURI()).getPath()
+  }
+
   /**
    * Create a JAR of of filePaths provided.
    *
    * @param filePaths set of all paths to be added to the JAR
    * @param outputJarPath Absolute Path to the output JAR being created
    * @param jarEntryTime time to be set for each JAR entry
    */
-  def createJar(filePaths: mutable.TreeSet[Path], outputJarPath: Path, jarEntryTime: Long) {
+  def createJar(
+    base: String, filePaths: mutable.TreeSet[Path], outputJarPath: Path, jarEntryTime: Long) {
 
     val target = new JarOutputStream(Files.newOutputStream(outputJarPath))
 
-    def addToJar(source: Path): FileVisitResult = {
-      val jarEntry = new JarEntry(source.toString)
+    def addToJar(source: Path, entryName: String): FileVisitResult = {
+      val jarEntry = new JarEntry(entryName)
       // setting jarEntry time to a fixed value for all entries within the jar so that jars are
       // byte-for-byte reproducible.
       jarEntry.setTime(jarEntryTime)
@@ -62,7 +67,8 @@ object OutputUtils {
       FileVisitResult.CONTINUE
     }
 
-    filePaths.map(addToJar(_))
+    val pathToName = filePaths.zipWithIndex.map{case(k, v) => (k, relativize(base, k))}.toMap
+    pathToName.map(e => addToJar(e._1, e._2))
     target.close()
   }
 
@@ -75,7 +81,7 @@ object OutputUtils {
     // Sort the contents of the classesDirectory for deterministic jar creation
     val sortedClasses = sort(classesDirectory)
 
-    createJar(sortedClasses, outputJarPath, jarCreationTime)
+    createJar(classesDirectory.toString, sortedClasses, outputJarPath, jarCreationTime)
   }
 
   /**

diff --git a/tests/scala/org/pantsbuild/zinc/compiler/JarCreationSpec.scala b/tests/scala/org/pantsbuild/zinc/compiler/JarCreationSpec.scala
@@ -21,7 +21,7 @@ class JarCreationSpec extends WordSpec with MustMatchers {
         IO.withTemporaryDirectory { tempOutputDir =>
           val jarOutputPath = Paths.get(tempOutputDir.toString, "spec-empty-output.jar")
 
-          OutputUtils.createJar(filePaths, jarOutputPath, System.currentTimeMillis())
+          OutputUtils.createJar(tempInputDir.toString, filePaths, jarOutputPath, System.currentTimeMillis())
           OutputUtils.existsClass(jarOutputPath, "NonExistent.class") must be(false)
         }
       }
@@ -30,14 +30,15 @@ class JarCreationSpec extends WordSpec with MustMatchers {
   "JarCreationWithClasses" should {
     "succeed when input classes are provided" in {
       IO.withTemporaryDirectory { tempInputDir =>
-        val tempFile = File.createTempFile(tempInputDir.toString, "Clazz.class")
+        val tempFile = File.createTempFile("Temp", ".class", tempInputDir)
         val filePaths = mutable.TreeSet(tempFile.toPath)
 
         IO.withTemporaryDirectory { tempOutputDir =>
           val jarOutputPath = Paths.get(tempOutputDir.toString, "spec-valid-output.jar")
 
-          OutputUtils.createJar(filePaths, jarOutputPath, System.currentTimeMillis())
-          OutputUtils.existsClass(jarOutputPath, tempFile.toString) must be(true)
+          OutputUtils.createJar(tempInputDir.toString, filePaths, jarOutputPath, System.currentTimeMillis())
+          OutputUtils.existsClass(jarOutputPath, tempFile.toString) must be(false)
+          OutputUtils.existsClass(jarOutputPath, tempFile.getName) must be(true)
         }
       }
     }