Merge pull request #4417 from paulolieuthier/dev-configurable-cwd

Make working directory configurable for Gradle's and Maven's dev tasks
quarkusio · Oct 8, 2019 · f36cf38 · f36cf38
2 parents d5f982f + c0a7f31
commit f36cf38
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java
@@ -30,6 +30,8 @@ public class QuarkusPluginExtension {
 
     private String sourceDir;
 
+    private String workingDir;
+
     private String outputConfigDirectory;
 
     public QuarkusPluginExtension(Project project) {
@@ -80,6 +82,18 @@ public void setSourceDir(String sourceDir) {
         this.sourceDir = sourceDir;
     }
 
+    public File workingDir() {
+        if (workingDir == null) {
+            workingDir = outputDirectory().getPath();
+        }
+
+        return new File(workingDir);
+    }
+
+    public void setWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+    }
+
     public File wiringClassesDirectory() {
         return new File(project.getBuildDir() + File.separator + wiringClassesDirectory);
     }

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
@@ -70,6 +70,8 @@ public class QuarkusDev extends QuarkusTask {
 
     private String sourceDir;
 
+    private String workingDir;
+
     private String jvmArgs;
 
     private boolean preventnoverify = false;
@@ -104,6 +106,20 @@ public void setSourceDir(String sourceDir) {
         this.sourceDir = sourceDir;
     }
 
+    @Optional
+    @InputDirectory
+    public File getWorkingDir() {
+        if (workingDir == null)
+            return extension().workingDir();
+        else
+            return new File(workingDir);
+    }
+
+    @Option(description = "Set working directory", option = "working-dir")
+    public void setWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+    }
+
     @Optional
     @Input
     public String getJvmArgs() {
@@ -308,7 +324,7 @@ public void startDev() {
             ProcessBuilder pb = new ProcessBuilder(args.toArray(new String[0]));
             pb.redirectErrorStream(true);
             pb.redirectInput(ProcessBuilder.Redirect.INHERIT);
-            pb.directory(extension.outputDirectory());
+            pb.directory(getWorkingDir());
             System.out.println("Starting process: ");
             pb.command().forEach(System.out::println);
             System.out.println("Args: ");

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -132,6 +132,9 @@ public class DevMojo extends AbstractMojo {
     @Parameter(defaultValue = "${project.build.sourceDirectory}")
     private File sourceDir;
 
+    @Parameter(defaultValue = "${project.build.directory}")
+    private File workingDir;
+
     @Parameter(defaultValue = "${jvm.args}")
     private String jvmArgs;
 
@@ -404,7 +407,7 @@ public void execute() throws MojoFailureException, MojoExecutionException {
             pb.redirectError(ProcessBuilder.Redirect.INHERIT);
             pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
             pb.redirectInput(ProcessBuilder.Redirect.INHERIT);
-            pb.directory(outputDirectory);
+            pb.directory(workingDir);
             Process p = pb.start();
 
             //https://github.com/quarkusio/quarkus/issues/232

diff --git a/docs/src/main/asciidoc/gradle-tooling.adoc b/docs/src/main/asciidoc/gradle-tooling.adoc
@@ -252,6 +252,14 @@ redeployed application. If there are any issues with compilation or deployment a
 
 Hit `CTRL+C` to stop the application.
 
+You can change the working directory the development environment runs on:
+
+----
+quarkusDev {
+    workingDir = rootProject.projectDir
+}
+----
+
 == Debugging
 
 In development mode, Quarkus starts by default with debug mode enabled, listening to port `5005` without suspending the JVM.