From 0be1b85e6368c97788e63d69137adb20ab6d5773 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 14 May 2018 16:18:12 -0700 Subject: [PATCH 1/2] Packaging: Remove windows bat files from the tar distribution This commit removes windows specific files from the tar distribution. Windows users use the zip, linux users use the tar. --- distribution/archives/build.gradle | 12 +++++++----- distribution/build.gradle | 9 +++++++-- .../migration/migrate_7_0/packaging.asciidoc | 5 +++++ .../src/test/resources/packaging/utils/xpack.bash | 12 ------------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle index 9fa06021236a2..7fbd469d6f390 100644 --- a/distribution/archives/build.gradle +++ b/distribution/archives/build.gradle @@ -57,12 +57,14 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, boolean os } into('bin') { with binFiles(distributionType, oss) - with copySpec { - from('../src/bin') { - include '*.bat' - filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf')) + if (distributionType == 'zip') { + with copySpec { + from('../src/bin') { + include '*.bat' + filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf')) + } + MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) } - MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) } } into('') { diff --git a/distribution/build.gradle b/distribution/build.gradle index 266cb8f8b270a..3ceda42bdfca2 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -283,8 +283,10 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { // main bin files, processed with distribution specific substitutions // everything except windows files from '../src/bin' - exclude '*.exe' - exclude '*.bat' + if (distributionType != 'zip') { + exclude '*.exe' + exclude '*.bat' + } eachFile { it.setMode(0755) } MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) } @@ -295,6 +297,9 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { } else { from project(':distribution').buildDefaultBin } + if (distributionType != 'zip') { + exclude '*.bat' + } } } } diff --git a/docs/reference/migration/migrate_7_0/packaging.asciidoc b/docs/reference/migration/migrate_7_0/packaging.asciidoc index 4070d6807332d..934522db7162f 100644 --- a/docs/reference/migration/migrate_7_0/packaging.asciidoc +++ b/docs/reference/migration/migrate_7_0/packaging.asciidoc @@ -8,3 +8,8 @@ The systemd service file `/usr/lib/systemd/system/elasticsearch.service` was previously marked as a configuration file in rpm and deb packages. Overrides to the systemd elasticsearch service should be made in `/etc/systemd/system/elasticsearch.service.d/override.conf`. + +==== tar package no longer includes windows specific files + +The tar package previously included files in the `bin` directory meant only +for windows. These files have been removed. Use the `zip` package instead. diff --git a/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash b/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash index 95ab2a08d3e57..3bea4adf1a4c6 100644 --- a/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash +++ b/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash @@ -15,30 +15,18 @@ verify_xpack_installation() { #assert_file "$ESHOME/bin" d $user $group 755 local binaryFiles=( 'elasticsearch-certgen' - 'elasticsearch-certgen.bat' 'elasticsearch-certutil' - 'elasticsearch-certutil.bat' 'elasticsearch-croneval' - 'elasticsearch-croneval.bat' 'elasticsearch-migrate' - 'elasticsearch-migrate.bat' 'elasticsearch-saml-metadata' - 'elasticsearch-saml-metadata.bat' 'elasticsearch-setup-passwords' - 'elasticsearch-setup-passwords.bat' 'elasticsearch-sql-cli' - 'elasticsearch-sql-cli.bat' "elasticsearch-sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it 'elasticsearch-syskeygen' - 'elasticsearch-syskeygen.bat' 'elasticsearch-users' - 'elasticsearch-users.bat' 'x-pack-env' - 'x-pack-env.bat' 'x-pack-security-env' - 'x-pack-security-env.bat' 'x-pack-watcher-env' - 'x-pack-watcher-env.bat' ) local binaryFilesCount=5 # start with oss distro number From a65b756fd05043c1194736abbaaf0181cc9d753e Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 15 May 2018 14:24:20 -0700 Subject: [PATCH 2/2] fix doubling of bat files --- distribution/archives/build.gradle | 13 ------------- distribution/build.gradle | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle index 7fbd469d6f390..2fbe5a308dc04 100644 --- a/distribution/archives/build.gradle +++ b/distribution/archives/build.gradle @@ -18,7 +18,6 @@ */ import org.apache.tools.ant.taskdefs.condition.Os -import org.apache.tools.ant.filters.FixCrLfFilter import org.elasticsearch.gradle.BuildPlugin import org.elasticsearch.gradle.EmptyDirTask import org.elasticsearch.gradle.LoggedExec @@ -57,15 +56,6 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, boolean os } into('bin') { with binFiles(distributionType, oss) - if (distributionType == 'zip') { - with copySpec { - from('../src/bin') { - include '*.bat' - filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf')) - } - MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) - } - } } into('') { from { @@ -88,9 +78,6 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, boolean os } with noticeFile - from('../src') { - include 'bin/*.exe' - } into('modules') { with modulesFiles } diff --git a/distribution/build.gradle b/distribution/build.gradle index 3ceda42bdfca2..f9e20523d8758 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -21,6 +21,7 @@ import org.elasticsearch.gradle.ConcatFilesTask import org.elasticsearch.gradle.MavenFilteringHack import org.elasticsearch.gradle.NoticeTask import org.elasticsearch.gradle.test.RunTask +import org.apache.tools.ant.filters.FixCrLfFilter import java.nio.file.Path @@ -279,17 +280,28 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) { binFiles = { distributionType, oss -> copySpec { + // non-windows files, for all distributions with copySpec { - // main bin files, processed with distribution specific substitutions - // everything except windows files from '../src/bin' - if (distributionType != 'zip') { - exclude '*.exe' - exclude '*.bat' - } + exclude '*.exe' + exclude '*.bat' eachFile { it.setMode(0755) } MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) } + // windows files, only for zip + if (distributionType == 'zip') { + with copySpec { + from '../src/bin' + include '*.bat' + filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance('crlf')) + MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, oss)) + } + with copySpec { + from '../src/bin' + include '*.exe' + } + } + // module provided bin files with copySpec { eachFile { it.setMode(0755) } if (oss) {