Creates parent folder of outfile if configured

Closes #141
orphan-oss · May 4, 2021 · b559715 · b559715
1 parent cca4a51
commit b559715
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -95,6 +95,11 @@
             <artifactId>maven-artifact-transfer</artifactId>
             <version>0.13.1</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>

diff --git a/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java b/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java
@@ -474,11 +474,27 @@ private void doExecute() throws MojoExecutionException {
      * @return the work directory.
      */
     private File setupBuildEnvironment() throws MojoExecutionException {
+        createParentFolder();
         Artifact binaryBits = chooseBinaryBits();
         retrieveBinaryBits(binaryBits);
         return unpackWorkDir(binaryBits);
     }
 
+    private void createParentFolder() {
+        if (outfile != null) {
+            File parent = outfile.getParentFile();
+            if (!parent.exists()) {
+                getLog().debug("Parent " + parent.getPath() + " does not exist, creating it!");
+                boolean created = parent.mkdirs();
+                if (created) {
+                    getLog().debug("Parent " + parent.getPath() + " has been created!");
+                } else {
+                    getLog().warn("Cannot create parent " + parent.getPath() + "!");
+                }
+            }
+        }
+    }
+
     /**
      * Unzips the given artifact in-place and returns the newly-unzipped top-level directory.
      * Writes a marker file to prevent unzipping more than once.

diff --git a/src/test/java/com/akathist/maven/plugins/launch4j/Launch4jMojoTest.java b/src/test/java/com/akathist/maven/plugins/launch4j/Launch4jMojoTest.java
@@ -17,11 +17,12 @@ protected void tearDown() throws Exception {
     }
 
     public void testWorkingDir() throws Exception {
-        File pom = getTestFile( "src/test/resources/test-plugin-pom.xml" );
-
+        File pom = getTestFile("src/test/resources/test-project/pom.xml");
         Launch4jMojo mojo = (Launch4jMojo) lookupMojo("launch4j", pom);
-
         assertNotNull(mojo);
+
+        File outfilePath = (File) getVariableValueFromObject(mojo, "outfile");
+        assertEquals("binary/test.exe", outfilePath.getPath());
     }
 
 }
diff --git a/src/test/resources/test-project/example.jar b/src/test/resources/test-project/example.jar
diff --git a/src/test/resources/test-plugin-pom.xml → src/test/resources/test-project/pom.xml b/src/test/resources/test-plugin-pom.xml → src/test/resources/test-project/pom.xml
@@ -15,9 +15,17 @@
         <plugins>
             <plugin>
                 <artifactId>launch4j-maven-plugin</artifactId>
+                <goals>
+                    <goal>launch4j</goal>
+                </goals>
                 <configuration>
                     <headerType>console</headerType>
-                    <outfile>target/test.exe</outfile>
+                    <outfile>binary/test.exe</outfile>
+                    <dontWrapJar>true</dontWrapJar>
+                    <jar>test-project/example.jar</jar>
+                    <jre>
+                        <minVersion>1.5.0</minVersion>
+                    </jre>
                 </configuration>
             </plugin>
         </plugins>