Skip to content

Commit

Permalink
Merge pull request #366 from mkalb/VersionInfo
Browse files Browse the repository at this point in the history
Convert EOL to Windows CRLF
  • Loading branch information
Cervator committed Oct 9, 2012
2 parents 20d4170 + 1a1c6db commit 7a34e20
Showing 1 changed file with 21 additions and 4 deletions.
25 changes: 21 additions & 4 deletions build.gradle
Expand Up @@ -18,6 +18,8 @@ task wrapper(type: Wrapper) {
}
*/

import org.apache.tools.ant.filters.FixCrLfFilter;

ext {
startDateTimeString = new Date().format("yyyy-MM-dd_HH-mm-ss")
dirApplet = 'applet'
Expand Down Expand Up @@ -236,6 +238,7 @@ task createVersionFile(type: Copy) {
into "$buildDir"
include versionFileName
expand(buildNumber: env.BUILD_NUMBER, buildUrl: env.BUILD_URL, gitBranch: env.GIT_BRANCH, dateTime: startDateTimeString)
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}

task distMods {
Expand All @@ -256,8 +259,15 @@ task distApplication(type:Sync) {
dependsOn extractNatives
dependsOn distMods
into("$buildDir/$destDirApplication")
from 'README.markdown'
from 'LICENSE.txt'
from ('README.markdown') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from ('LICENSE.txt') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from ('NOTICE') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from jar
from('launchScripts') {
exclude('Launcher.xml')
Expand All @@ -280,8 +290,15 @@ task distApplet(type:Sync) {
description = "Creates an Applet folder"
dependsOn distMods
into("$buildDir/$destDirApplet")
from 'README.markdown'
from 'LICENSE.txt'
from ('README.markdown') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from ('LICENSE.txt') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from ('NOTICE') {
filter(FixCrLfFilter, eol:FixCrLfFilter.CrLf.newInstance("crlf"))
}
from jar
from(dirApplet) {
exclude '*.keystore'
Expand Down

0 comments on commit 7a34e20

Please sign in to comment.