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 2020/02/21 09:40:35 UTC
[lucene-solr] branch master updated: LUCENE-9232: add a script-hack
check so that in case somebody upgrades the scripts automatically they'll
know they need to add the hack.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new cb68d7d LUCENE-9232: add a script-hack check so that in case somebody upgrades the scripts automatically they'll know they need to add the hack.
cb68d7d is described below
commit cb68d7d2c57bac9bdaf0b689fd03d464a509e243
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Feb 21 10:40:12 2020 +0100
LUCENE-9232: add a script-hack check so that in case somebody upgrades the scripts automatically they'll know they need to add the hack.
---
build.gradle | 1 +
gradle/validation/gradlew-scripts-tweaked.gradle | 44 ++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/build.gradle b/build.gradle
index 1bbf1a2..0540ea3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,6 +87,7 @@ apply from: file('gradle/validation/config-file-sanity.gradle')
apply from: file('gradle/validation/rat-sources.gradle')
apply from: file('gradle/validation/owasp-dependency-check.gradle')
apply from: file('gradle/validation/ecj-lint.gradle')
+apply from: file('gradle/validation/gradlew-scripts-tweaked.gradle')
// Source or data regeneration tasks
apply from: file('gradle/generation/jflex.gradle')
diff --git a/gradle/validation/gradlew-scripts-tweaked.gradle b/gradle/validation/gradlew-scripts-tweaked.gradle
new file mode 100644
index 0000000..c0bc647
--- /dev/null
+++ b/gradle/validation/gradlew-scripts-tweaked.gradle
@@ -0,0 +1,44 @@
+import java.nio.charset.StandardCharsets
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This ensures 'gradlew*' scripts contain the manual fix so that they
+// don't fork a daemon subprocess on the initial run.
+
+configure(rootProject) {
+ task gradlewScriptsTweaked() {
+ def scripts = [
+ file("gradlew"),
+ file("gradlew.bat")
+ ]
+
+ inputs.files(scripts)
+ outputs.upToDateWhen { true }
+
+ doFirst {
+ scripts.each { file ->
+ def content = new String(file.readBytes(), StandardCharsets.US_ASCII)
+ if (content.indexOf("Don't fork a daemon mode on initial run that generates local defaults") < 0) {
+ throw new GradleException("Launch script ${file} does not have a manual daemon tweak (see LUCENE-9232).")
+ }
+ }
+ }
+ }
+
+ check.dependsOn gradlewScriptsTweaked
+}