You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2022/07/30 18:45:39 UTC
[lucene] branch main updated: LUCENE-10669: The build should be more helpful when generated resources are touched (#1053)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new f93e52e5bb1 LUCENE-10669: The build should be more helpful when generated resources are touched (#1053)
f93e52e5bb1 is described below
commit f93e52e5bb1503bc7ca175e157f0f6c96dafd383
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Jul 30 20:45:32 2022 +0200
LUCENE-10669: The build should be more helpful when generated resources are touched (#1053)
---
gradle/generation/moman.gradle | 16 +++++++++++-----
gradle/generation/regenerate.gradle | 4 +++-
lucene/CHANGES.txt | 5 +++++
lucene/core/src/generated/checksums/utilGenLev.json | 1 +
lucene/core/src/generated/checksums/utilGenPacked.json | 2 ++
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/gradle/generation/moman.gradle b/gradle/generation/moman.gradle
index a369a70da4c..62dbed15acf 100644
--- a/gradle/generation/moman.gradle
+++ b/gradle/generation/moman.gradle
@@ -41,14 +41,17 @@ configure(project(":lucene:core")) {
task utilGenPackedInternal(dependsOn: installMoman) {
def targetDir = file("src/java/org/apache/lucene/util/packed")
+ def templateFiles = [
+ file("${resources}/gen_BulkOperation.py"),
+ file("${resources}/gen_Packed64SingleBlock.py")
+ ]
+
inputs.property("source", momanSource)
+ inputs.files templateFiles
outputs.files fileTree(dir: targetDir, includes: ["Packed64SingleBlock.java", "BulkOperation*.java"])
doLast {
- [
- file("${resources}/gen_BulkOperation.py"),
- file("${resources}/gen_Packed64SingleBlock.py")
- ].each { prog ->
+ templateFiles.each { prog ->
logger.lifecycle("Executing: ${prog} in ${targetDir}")
quietExec {
workingDir targetDir
@@ -69,7 +72,10 @@ configure(project(":lucene:core")) {
task utilGenLevInternal(dependsOn: installMoman) {
def targetDir = file("src/java/org/apache/lucene/util/automaton")
+ def templateFile = file("${resources}/createLevAutomata.py")
+
inputs.property("source", momanSource)
+ inputs.file templateFile
outputs.files fileTree(dir: targetDir, includes: ["*ParametricDescription.java"])
doLast {
@@ -79,7 +85,7 @@ configure(project(":lucene:core")) {
workingDir targetDir
executable project.externalTool("python3")
args = ['-B',
- file("${resources}/createLevAutomata.py").toString(),
+ templateFile.toString(),
num,
transpose,
"${momanDir}/finenight/python"]
diff --git a/gradle/generation/regenerate.gradle b/gradle/generation/regenerate.gradle
index d176c6fcb5f..f13cf9d9936 100644
--- a/gradle/generation/regenerate.gradle
+++ b/gradle/generation/regenerate.gradle
@@ -181,7 +181,9 @@ configure([
throw new GradleException("Checksums mismatch for derived resources; you might have" +
" modified a generated resource (regenerate task: ${sourceTaskName}):\n" +
"Current:\n ${current.entrySet().join('\n ')}\n\n" +
- "Expected:\n ${expected.entrySet().join('\n ')}"
+ "Expected:\n ${expected.entrySet().join('\n ')}\n\n" +
+ "Input files for this task are:\n " + sourceTask.inputs.files.join('\n ') + "\n\n" +
+ "Files generated by this task are:\n " + sourceTask.outputs.files.join('\n ')
)
}
}
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index cf616c1883e..51115424b29 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -110,6 +110,11 @@ Bug Fixes
---------------------
* LUCENE-10663: Fix KnnVectorQuery explain with multiple segments. (Shiming Li)
+Build
+---------------------
+
+* LUCENE-10669: The build should be more helpful when generated resources are touched (Dawid Weiss)
+
Other
---------------------
* LUCENE-10559: Add Prefilter Option to KnnGraphTester (Kaival Parikh)
diff --git a/lucene/core/src/generated/checksums/utilGenLev.json b/lucene/core/src/generated/checksums/utilGenLev.json
index da75cc5db53..29855fbfcf4 100644
--- a/lucene/core/src/generated/checksums/utilGenLev.json
+++ b/lucene/core/src/generated/checksums/utilGenLev.json
@@ -1,4 +1,5 @@
{
+ "gradle/generation/moman/createLevAutomata.py": "b265f527a6ab7c0778f4b2e95de5232931795cad",
"lucene/core/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java": "8a07d087eba9db1bc228b9dbc4e3b9294dac8478",
"lucene/core/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java": "a328606a8933fe2f989bf3dbed84aa34fb4113ed",
"lucene/core/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java": "0d839846eb3cbe0ef62576ab33d63a97c28a8b45",
diff --git a/lucene/core/src/generated/checksums/utilGenPacked.json b/lucene/core/src/generated/checksums/utilGenPacked.json
index 5abfd8ebdc8..10562224ed8 100644
--- a/lucene/core/src/generated/checksums/utilGenPacked.json
+++ b/lucene/core/src/generated/checksums/utilGenPacked.json
@@ -1,4 +1,6 @@
{
+ "gradle/generation/moman/gen_BulkOperation.py": "d721930b5dae7f938b52a17700eb84b157930b2b",
+ "gradle/generation/moman/gen_Packed64SingleBlock.py": "0fd2a498c3edbd195a68c2d1d686be0aed51a104",
"lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java": "c4e16930960a18e74802c56ee60f8e83bd8b6dd2",
"lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java": "2b0d9226bae8a07ce4970bcaa9d4d0cd4fe2c79a",
"lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java": "c483aa35c275bacc1f3a010c5b879441be502108",