Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename /gen to /generate #6800

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Rename /gen to /generate #6800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ext.allowJava9 = true
sourceSets {
main {
java {
srcDirs = ["src/main/java", "src/main/gen"]
srcDirs = ["src/main/java", "src/main/generated"]
}

resources {
Expand Down Expand Up @@ -262,7 +262,7 @@ task checkOutdatedDependencies(dependsOn: dependencyUpdates) {
}

clean {
delete "src/main/gen"
delete "src/main/generated"
}

processResources {
Expand Down Expand Up @@ -306,7 +306,7 @@ task generateBstGrammarSource(type: org.jabref.build.antlr.AntlrTask) {

antlr = ANTLR3
inputFile = 'src/main/antlr3/org/jabref/bst/Bst.g'
outputDir = 'src/main/gen/org/jabref/logic/bst/'
outputDir = 'src/main/generated/org/jabref/logic/bst/'
}

task generateSearchGrammarSource(type: org.jabref.build.antlr.AntlrTask) {
Expand All @@ -315,7 +315,7 @@ task generateSearchGrammarSource(type: org.jabref.build.antlr.AntlrTask) {

antlr = ANTLR4
inputFile = "src/main/antlr4/org/jabref/search/Search.g4"
outputDir = "src/main/gen/org/jabref/search"
outputDir = "src/main/generated/org/jabref/search"
javaPackage = "org.jabref.search"
}

Expand All @@ -324,7 +324,7 @@ task generateMedlineSource(type: XjcTask) {
description = "Generates java files for the medline importer."

schemaFile = "src/main/resources/xjc/medline/medline.xsd"
outputDirectory = "src/main/gen/"
outputDirectory = "src/main/generated/"
javaPackage = "org.jabref.logic.importer.fileformat.medline"
}

Expand All @@ -333,7 +333,7 @@ task generateBibtexmlSource(type: XjcTask) {
description = "Generates java files for the bibtexml importer."

schemaFile = "src/main/resources/xjc/bibtexml/bibtexml.xsd"
outputDirectory = "src/main/gen"
outputDirectory = "src/main/generated"
javaPackage = "org.jabref.logic.importer.fileformat.bibtexml"
}

Expand All @@ -342,7 +342,7 @@ task generateEndnoteSource(type: XjcTask) {
description = "Generates java files for the endnote importer."

schemaFile = "src/main/resources/xjc/endnote/endnote.xsd"
outputDirectory = "src/main/gen/"
outputDirectory = "src/main/generated/"
javaPackage = "org.jabref.logic.importer.fileformat.endnote"
}

Expand All @@ -352,7 +352,7 @@ task generateModsSource(type: XjcTask) {

schemaFile = "src/main/resources/xjc/mods/mods-3-7.xsd"
bindingFile = "src/main/resources/xjc/mods/mods-binding.xjb"
outputDirectory = "src/main/gen/"
outputDirectory = "src/main/generated/"
javaPackage = "org.jabref.logic.importer.fileformat.mods"
arguments = '-npa'
}
Expand All @@ -373,7 +373,7 @@ compileJava {
options.compilerArgs << "-Xlint:none"
dependsOn "generateSource"

options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/main/gen")
options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/main/generated")

moduleOptions {
// TODO: Remove access to internal api
Expand Down