Code formatting, cosmetic
This commit is contained in:
48
build.gradle
48
build.gradle
@@ -47,7 +47,7 @@ String gitVersion() {
|
|||||||
def versionPattern = Pattern.compile("v(\\d+\\.)?(\\d+\\.)?(\\d+)(-.*)?")
|
def versionPattern = Pattern.compile("v(\\d+\\.)?(\\d+\\.)?(\\d+)(-.*)?")
|
||||||
ByteArrayOutputStream out = new ByteArrayOutputStream()
|
ByteArrayOutputStream out = new ByteArrayOutputStream()
|
||||||
exec {
|
exec {
|
||||||
commandLine = [ 'git', 'describe', '--always', '--dirty' ]
|
commandLine = ['git', 'describe', '--always', '--dirty']
|
||||||
standardOutput = out
|
standardOutput = out
|
||||||
}
|
}
|
||||||
def v = out.toString().replace(System.lineSeparator(), '')
|
def v = out.toString().replace(System.lineSeparator(), '')
|
||||||
@@ -157,8 +157,8 @@ task buildDeb(dependsOn: build) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ant.chmod(
|
ant.chmod(
|
||||||
file: "${debBuildBinPath}/mxisd.jar",
|
file: "${debBuildBinPath}/mxisd.jar",
|
||||||
perm: 'a+x'
|
perm: 'a+x'
|
||||||
)
|
)
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
@@ -169,15 +169,15 @@ task buildDeb(dependsOn: build) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ant.replaceregexp(
|
ant.replaceregexp(
|
||||||
file: "${debBuildConfPath}/${debConfFileName}",
|
file: "${debBuildConfPath}/${debConfFileName}",
|
||||||
match: "key.path:(.*)",
|
match: "key.path:(.*)",
|
||||||
replace: "key.path: '${debDataPath}/signing.key'"
|
replace: "key.path: '${debDataPath}/signing.key'"
|
||||||
)
|
)
|
||||||
|
|
||||||
ant.replaceregexp(
|
ant.replaceregexp(
|
||||||
file: "${debBuildConfPath}/${debConfFileName}",
|
file: "${debBuildConfPath}/${debConfFileName}",
|
||||||
match: "storage.provider.sqlite.database:(.*)",
|
match: "storage.provider.sqlite.database:(.*)",
|
||||||
replace: "storage.provider.sqlite.database: '${debDataPath}/mxisd.db'"
|
replace: "storage.provider.sqlite.database: '${debDataPath}/mxisd.db'"
|
||||||
)
|
)
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
@@ -186,25 +186,25 @@ task buildDeb(dependsOn: build) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ant.replace(
|
ant.replace(
|
||||||
file: "${debBuildDebianPath}/control",
|
file: "${debBuildDebianPath}/control",
|
||||||
token: 'Version: 0',
|
token: 'Version: 0',
|
||||||
value: "Version: ${v}"
|
value: "Version: ${v}"
|
||||||
)
|
)
|
||||||
|
|
||||||
ant.replace(
|
ant.replace(
|
||||||
file: "${debBuildDebianPath}/postinst",
|
file: "${debBuildDebianPath}/postinst",
|
||||||
token: '%DEB_DATA_DIR%',
|
token: '%DEB_DATA_DIR%',
|
||||||
value: debDataPath
|
value: debDataPath
|
||||||
)
|
)
|
||||||
|
|
||||||
ant.chmod(
|
ant.chmod(
|
||||||
file: "${debBuildDebianPath}/postinst",
|
file: "${debBuildDebianPath}/postinst",
|
||||||
perm: 'a+x'
|
perm: 'a+x'
|
||||||
)
|
)
|
||||||
|
|
||||||
ant.chmod(
|
ant.chmod(
|
||||||
file: "${debBuildDebianPath}/prerm",
|
file: "${debBuildDebianPath}/prerm",
|
||||||
perm: 'a+x'
|
perm: 'a+x'
|
||||||
)
|
)
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
@@ -214,11 +214,11 @@ task buildDeb(dependsOn: build) {
|
|||||||
|
|
||||||
exec {
|
exec {
|
||||||
commandLine(
|
commandLine(
|
||||||
'fakeroot',
|
'fakeroot',
|
||||||
'dpkg-deb',
|
'dpkg-deb',
|
||||||
'-b',
|
'-b',
|
||||||
debBuildBasePath,
|
debBuildBasePath,
|
||||||
"${project.buildDir}/dist"
|
"${project.buildDir}/dist"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user