Skip to content

Commit a5ecc22

Browse files
authored
Clone the JDK using the same fork and branch as CF (#7491)
1 parent 2770c52 commit a5ecc22

9 files changed

Lines changed: 439 additions & 94 deletions

File tree

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ allprojects { currentProj ->
332332
def targets = [
333333
"docs/examples",
334334
"docs/tutorial",
335+
"buildSrc"
335336
]
336337
targets = targets.collectMany {
337338
[
@@ -645,6 +646,7 @@ def createCheckTypeTask(projectName, taskName, checker, args = []) {
645646

646647
tasks.register("addFavicon", Exec) {
647648
dependsOn("allJavadoc")
649+
dependsOn("getHtmlTools")
648650

649651
doFirst {
650652
copy {
@@ -885,31 +887,31 @@ tasks.register("manual") {
885887
dependsOn("makeCfManual", "makeAfuManual", ":dataflow:manual")
886888
}
887889

888-
tasks.register("getPlumeBib", CloneTask) {
890+
tasks.register("getPlumeBib", CloneOrUpdateTask) {
889891
url.set("https://github.com/mernst/plume-bib.git")
890892
directory.set(file(plumeBibHome))
891893
outputs.upToDateWhen { false }
892894
}
893895

894-
tasks.register("getGitScripts", CloneTask) {
896+
tasks.register("getGitScripts", CloneOrUpdateTask) {
895897
url.set("https://github.com/plume-lib/git-scripts.git")
896898
directory.set(file(gitScriptsHome))
897899
outputs.upToDateWhen { false }
898900
}
899901

900-
tasks.register("getPlumeScripts", CloneTask) {
902+
tasks.register("getPlumeScripts", CloneOrUpdateTask) {
901903
url.set("https://github.com/plume-lib/plume-scripts.git")
902904
directory.set(file(plumeScriptsHome))
903905
outputs.upToDateWhen { false }
904906
}
905907

906-
tasks.register("getHtmlTools", CloneTask) {
908+
tasks.register("getHtmlTools", CloneOrUpdateTask) {
907909
url.set("https://github.com/plume-lib/html-tools.git")
908910
directory.set(file(htmlToolsHome))
909911
outputs.upToDateWhen { false }
910912
}
911913

912-
tasks.register("getDoLikeJavac", CloneTask) {
914+
tasks.register("getDoLikeJavac", CloneOrUpdateTask) {
913915
url.set("https://github.com/kelloggm/do-like-javac.git")
914916
directory.set(file(doLikeJavacHome))
915917
outputs.upToDateWhen { false }
@@ -932,7 +934,7 @@ tasks.register("tags", Exec) {
932934
description = "Create Emacs TAGS table"
933935
group = "Emacs"
934936
// running this task will also run the tags task in the subprojects, which is defined later in this file.
935-
commandLine("etags", "-i", "annotation-file-utilities/TAGS", "-i", "checker/TAGS", "-i", "checker-qual/TAGS", "-i", "checker-util/TAGS", "-i", "dataflow/TAGS", "-i", "framework/TAGS", "-i", "framework-test/TAGS", "-i", "javacutil/TAGS", "-i", "docs/manual/TAGS")
937+
commandLine("etags", "-i", "annotation-file-utilities/TAGS", "-i", "buildSrc/TAGS", "-i", "checker/TAGS", "-i", "checker-qual/TAGS", "-i", "checker-util/TAGS", "-i", "dataflow/TAGS", "-i", "framework/TAGS", "-i", "framework-test/TAGS", "-i", "javacutil/TAGS", "-i", "docs/manual/TAGS")
936938
}
937939

938940
subprojects {

buildSrc/build.gradle

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
plugins{
2+
id("java")
3+
}
4+
repositories {
5+
mavenCentral()
6+
}
7+
8+
java {
9+
sourceCompatibility = '17'
10+
targetCompatibility = '17'
11+
}
12+
tasks.withType(Javadoc).configureEach {
13+
// This makes Javadoc warnings errors, so that Javadoc comments are required on all elements.
14+
options.addBooleanOption('Werror', true)
15+
}
16+
17+
dependencies {
18+
implementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
19+
implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.5.0.202512021534-r")
20+
implementation("org.bouncycastle:bcprov-jdk15to18:1.83")
21+
implementation(gradleApi())
22+
}

buildSrc/src/main/groovy/CloneTask.groovy

Lines changed: 0 additions & 78 deletions
This file was deleted.

buildSrc/src/main/groovy/InsertAnnotationsToSource.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.gradle.process.ExecOperations
88

99

1010
abstract class InsertAnnotationsToSource extends DefaultTask {
11-
private ExecOperations execOperations
11+
private final ExecOperations execOperations
1212

1313
@Inject
1414
InsertAnnotationsToSource(ExecOperations execOperations) {

0 commit comments

Comments
 (0)