Skip to content

Commit

Permalink
Fix license header generation on Windows (#31790)
Browse files Browse the repository at this point in the history
Updates the build.gradle to take into account the OS differences for
Windows (in particular line separator and project naming)
  • Loading branch information
costin authored Jul 5, 2018
1 parent 6acb591 commit f40581c
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -445,12 +445,19 @@ allprojects {
}

File licenseHeaderFile;
if (eclipse.project.name.startsWith(':x-pack')) {
String prefix = ':x-pack';

if (Os.isFamily(Os.FAMILY_WINDOWS)) {
prefix = prefix.replace(':', '_')
}
if (eclipse.project.name.startsWith(prefix)) {
licenseHeaderFile = new File(project.rootDir, 'buildSrc/src/main/resources/license-headers/elastic-license-header.txt')
} else {
licenseHeaderFile = new File(project.rootDir, 'buildSrc/src/main/resources/license-headers/oss-license-header.txt')
}
String licenseHeader = licenseHeaderFile.getText('UTF-8').replace('\n', '\\\\n')

String lineSeparator = Os.isFamily(Os.FAMILY_WINDOWS) ? '\\\\r\\\\n' : '\\\\n'
String licenseHeader = licenseHeaderFile.getText('UTF-8').replace(System.lineSeparator(), lineSeparator)
task copyEclipseSettings(type: Copy) {
// TODO: "package this up" for external builds
from new File(project.rootDir, 'buildSrc/src/main/resources/eclipse.settings')
Expand Down

0 comments on commit f40581c

Please sign in to comment.