HADOOP-12899. External distribution stitching scripts do not work cor…

…rectly on Windows. Contributed by Chris Nauroth.
JarvisZhang · Mar 10, 2016 · adf1cdf · adf1cdf
1 parent 79961ec
commit adf1cdf
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
@@ -90,16 +90,17 @@
                 <id>dist</id>
                 <phase>prepare-package</phase>
                 <goals>
-                    <goal>exec</goal>
+                  <goal>exec</goal>
                 </goals>
                 <configuration>
-                    <executable>${basedir}/../dev-support/bin/dist-layout-stitching</executable>
-                    <workingDirectory>${project.build.directory}</workingDirectory>
-                    <requiresOnline>false</requiresOnline>
-                    <arguments>
-                       <argument>${project.version}</argument>
-                       <argument>${project.build.directory}</argument>
-                    </arguments>
+                  <executable>${shell-executable}</executable>
+                  <workingDirectory>${project.build.directory}</workingDirectory>
+                  <requiresOnline>false</requiresOnline>
+                  <arguments>
+                    <argument>${basedir}/../dev-support/bin/dist-layout-stitching</argument>
+                    <argument>${project.version}</argument>
+                    <argument>${project.build.directory}</argument>
+                  </arguments>
                 </configuration>
               </execution>
               <execution>
@@ -109,12 +110,13 @@
                   <goal>exec</goal>
                 </goals>
                 <configuration>
-                    <executable>${basedir}/../dev-support/bin/dist-tar-stitching</executable>
+                    <executable>${shell-executable}</executable>
                     <workingDirectory>${project.build.directory}</workingDirectory>
                     <requiresOnline>false</requiresOnline>
                     <arguments>
-                       <argument>${project.version}</argument>
-                       <argument>${project.build.directory}</argument>
+                      <argument>${basedir}/../dev-support/bin/dist-tar-stitching</argument>
+                      <argument>${project.version}</argument>
+                      <argument>${project.build.directory}</argument>
                     </arguments>
                 </configuration>
               </execution>