Merge pull request #685 from geoand/#684

Set proper error message when building native image without prior packaging

Author: stuartwdouglas

cli/maven/src/main/java/org/jboss/shamrock/maven/NativeImageMojo.java

@@ -126,6 +126,11 @@ public NativeImageMojo() {
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
 
+        if (! buildDir.isDirectory()  || ! new File(buildDir, "lib").isDirectory()) {
+            throw new MojoFailureException("Unable to find the required build output. " +
+                    "Please ensure that the 'build' goal has been properly configured for the project - since it is a prerequisite of the 'native-image' goal");
+        }
+
         try(AppCreator appCreator = AppCreator.builder()
                 // configure the build phase we want the app to go through
                 .addPhase(new NativeImagePhase()

core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/NativeImagePhase.java

@@ -237,6 +237,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException {
         final String runnerJarName = runnerJar.getFileName().toString();
 
         Path outputLibDir = outputDir.resolve(runnerJarOutcome.getLibDir().getFileName());
+        boolean outputLibDirCopied = false;
         if (Files.exists(outputLibDir)) {
             outputLibDir = null;
         } else {
@@ -245,6 +246,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException {
             } catch (IOException e) {
                 throw new AppCreatorException("Failed to copy the runnable jar and the lib to the docker project dir", e);
             }
+            outputLibDirCopied = true;
         }
 
         final Config config = SmallRyeConfigProviderResolver.instance().getConfig();
@@ -411,7 +413,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException {
             if(runnerJarCopied) {
                 IoUtils.recursiveDelete(runnerJar);
             }
-            if(outputLibDir != null) {
+            if(outputLibDirCopied) {
                 IoUtils.recursiveDelete(outputLibDir);
             }
         }