summarylogtreecommitdiffstats
path: root/build.patch
diff options
context:
space:
mode:
authorEric Liu2019-03-26 21:34:11 -0400
committerEric Liu2019-03-26 21:34:11 -0400
commit2e850ea5c523be8bb9cb62f6dc9c2aece1d39b63 (patch)
treeb96592f3dbc09daccc92d704a45484aff9913320 /build.patch
downloadaur-2e850ea5c523be8bb9cb62f6dc9c2aece1d39b63.tar.gz
initial commit for ELK with xpack
Diffstat (limited to 'build.patch')
-rw-r--r--build.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/build.patch b/build.patch
new file mode 100644
index 00000000000..b4ab046f16d
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,58 @@
+diff --git a/build.gradle b/build.gradle
+index 3fda82e..d926183 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -121,7 +121,6 @@ if (versionMap["jruby-runtime-override"]) {
+ clean {
+ delete "${projectDir}/Gemfile"
+ delete "${projectDir}/Gemfile.lock"
+- delete "${projectDir}/vendor"
+ delete "${projectDir}/.bundle"
+ delete "${projectDir}/qa/integration/Gemfile.lock"
+ delete "${projectDir}/qa/integration/.bundle"
+@@ -158,7 +157,7 @@ task downloadJRuby(type: Download) {
+
+ downloadJRuby.onlyIf { customJRubyDir == "" }
+
+-task verifyFile(dependsOn: downloadJRuby, type: Verify) {
++task verifyFile(type: Verify) {
+ description "Verify the SHA1 of the download JRuby artifact"
+ inputs.file(jrubyTarPath)
+ outputs.file(jrubyTarPath)
+@@ -169,35 +168,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
+
+ verifyFile.onlyIf { customJRubyDir == "" }
+
+-task buildCustomJRuby(type: Exec) {
+- description "Build tar.gz and .jar artifacts from JRuby source directory"
+- workingDir customJRubyDir
+- commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
+- standardOutput = new ByteArrayOutputStream()
+- errorOutput = new ByteArrayOutputStream()
+- ext.output = {
+- standardOutput.toString() + errorOutput.toString()
+- }
+-}
+-
+-buildCustomJRuby.onlyIf { customJRubyDir != "" }
+-
+-task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) {
+- description "Install custom built JRuby in the vendor directory"
+- inputs.file(customJRubyTar)
+- outputs.dir("${projectDir}/vendor/jruby")
+- from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
+- eachFile { f ->
+- f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
+- }
+- exclude "**/stdlib/rdoc/**"
+- includeEmptyDirs = false
+- into "${projectDir}/vendor/jruby"
+-}
+-
+-installCustomJRuby.onlyIf { customJRubyDir != "" }
+-
+-task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) {
++task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) {
+ description "Install JRuby in the vendor directory"
+ inputs.file(jrubyTarPath)
+ outputs.dir("${projectDir}/vendor/jruby")