Skip to content

Commit d48bfa5

Browse files
committed
#500 mlNewProject and mlScaffold now use projectDir
Fixes a problem where paths were being constructed relative to the Gradle daemon dir
1 parent d93eeb6 commit d48bfa5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,14 @@ class NewProjectTask extends MarkLogicTask {
7878
} else {
7979
appConfig.setNoRestServer(true)
8080
}
81-
new ScaffoldGenerator().generateScaffold(new File(".").getAbsolutePath(), appConfig)
81+
new ScaffoldGenerator().generateScaffold(getProject().getProjectDir().getAbsolutePath(), appConfig)
8282
}
8383
}
8484

8585
void makeDirectory(String path) {
86-
println "Making directory: " + path
87-
new File(path).mkdirs()
86+
File f = new File(getProject().getProjectDir(), path);
87+
f.mkdirs()
88+
println "Making directory: " + f.getAbsolutePath()
8889
}
8990

9091
void writeFile(String filename, String text) {

src/main/groovy/com/marklogic/gradle/task/scaffold/GenerateScaffoldTask.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class GenerateScaffoldTask extends MarkLogicTask {
1010
void generateScaffold() {
1111
ScaffoldGenerator g = new ScaffoldGenerator()
1212
def propName = "scaffoldPath"
13-
def path = project.hasProperty(propName) ? project.property(propName) : new File(".").getAbsolutePath()
13+
def path = project.hasProperty(propName) ? project.property(propName) : getProject().getProjectDir().getAbsolutePath()
1414
println "Generating scaffold for path: " + path
1515
g.generateScaffold(path, getAppConfig())
1616
}

0 commit comments

Comments
 (0)