Skip to content

Commit 519b020

Browse files
feat: rewrite Piped SQL, WIP
Signed-off-by: Andreas Reichel <[email protected]>
1 parent 1cb26a7 commit 519b020

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

build.gradle

+3-26
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,11 @@ java {
124124
}
125125

126126
javadoc {
127-
dependsOn(compileJavacc, compileJava )
128-
source += fileTree(layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get()) {
129-
include("**/ParseException.java")
130-
include("**/Provider.java")
131-
include("**/Token.java")
132-
}
133-
source += fileTree(layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser").get()) {
134-
include("**/Node.java")
135-
include("**/SimpleNode.java")
136-
}
127+
include("build/generated/javacc/net/sf/jsqlparser/parser/*.java" )
137128
if(JavaVersion.current().isJava9Compatible()) {
138129
options.addBooleanOption('html5', true)
139130
}
140-
options.addStringOption('Xdoclint:none', '-quiet')
141-
options.addStringOption('J-Xmx8g')
142-
options.addStringOption('J-Xss2m')
131+
options.addBooleanOption("Xdoclint:none", true)
143132
}
144133

145134
jar {
@@ -164,16 +153,6 @@ tasks.register('xmldoc', Javadoc) {
164153
)
165154

166155
source = sourceSets.main.allJava
167-
source += fileTree(layout.buildDirectory.dir("generated/javacc/net/sf/jsqlparser/parser").get()) {
168-
include("**/ParseException.java")
169-
include("**/Provider.java")
170-
include("**/Token.java")
171-
}
172-
source += fileTree(layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser").get()) {
173-
include("**/Node.java")
174-
include("**/SimpleNode.java")
175-
}
176-
177156
// beware: Gradle deletes this folder automatically and there is no switch-off
178157
destinationDir = reporting.file("xmlDoclet")
179158
options.docletpath = configurations.xmlDoclet.files as List
@@ -183,10 +162,8 @@ tasks.register('xmldoc', Javadoc) {
183162
options.addBooleanOption("withFloatingToc", Boolean.parseBoolean(System.getenv().getOrDefault("FLOATING_TOC", "true")))
184163
options.addStringOption("basePackage", "net.sf.jsqlparser")
185164
options.addStringOption("filename", outFile.getName())
186-
options.addStringOption('J-Xmx8g')
187-
options.addStringOption('J-Xss2m')
188165

189-
dependsOn(compileJavacc, compileJava )
166+
dependsOn(compileJava)
190167
doLast {
191168
copy {
192169
from rstFile

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Specifies the JVM arguments used for the daemon process.
22
# The setting is particularly useful for tweaking memory settings.
3-
org.gradle.jvmargs=-Xmx4G -Xss4m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
3+
org.gradle.jvmargs=-Xmx8G -Xss8m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
44

55
org.gradle.caching=true
66

0 commit comments

Comments
 (0)