Author: tveronezi
Date: Mon May 12 21:00:50 2014
New Revision: 1594092
URL: http://svn.apache.org/r1594092
Log:
* using our existing gz method instead of "ant.gzip".
* fixing build issue on windows.
Modified:
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/CompressTool.groovy
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
Modified:
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/CompressTool.groovy
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/CompressTool.groovy?rev=1594092&r1=1594091&r2=1594092&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/CompressTool.groovy
(original)
+++
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/CompressTool.groovy
Mon May 12 21:00:50 2014
@@ -41,26 +41,24 @@ class CompressTool {
private File createTarGz(String classifier, File dataDir) {
def tarFile = new File(dataDir.parent, "${dataDir.name}.tar")
def gzFile = new File(dataDir.parent, "${tarFile.name}.gz")
- ant.with {
- tar(destfile: tarFile) {
- tarfileset(dir: dataDir, username: 'root', group: 'root',
prefix: './') {
- include(name: "**/*")
- exclude(name: "**/*.sh")
- exclude(name: "**/postinst")
- exclude(name: "**/prerm")
- exclude(name: "**/postrm")
- exclude(name: "**/init.d/${classifier}")
- }
- tarfileset(dir: dataDir, username: 'root', group: 'root',
filemode: '755', prefix: './') {
- include(name: "**/*.sh")
- include(name: "**/postinst")
- include(name: "**/prerm")
- include(name: "**/postrm")
- include(name: "**/init.d/${classifier}")
- }
+ ant.tar(destfile: tarFile, longfile: 'gnu') {
+ tarfileset(dir: dataDir, username: 'root', group: 'root', prefix:
'./') {
+ include(name: "**/*")
+ exclude(name: "**/*.sh")
+ exclude(name: "**/postinst")
+ exclude(name: "**/prerm")
+ exclude(name: "**/postrm")
+ exclude(name: "**/init.d/${classifier}")
+ }
+ tarfileset(dir: dataDir, username: 'root', group: 'root',
filemode: '755', prefix: './') {
+ include(name: "**/*.sh")
+ include(name: "**/postinst")
+ include(name: "**/prerm")
+ include(name: "**/postrm")
+ include(name: "**/init.d/${classifier}")
}
- gzip(src: tarFile, destfile: gzFile)
}
+ gz(tarFile.absolutePath, gzFile.absolutePath)
tarFile.delete()
gzFile
}
Modified:
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy?rev=1594092&r1=1594091&r2=1594092&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
(original)
+++
tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
Mon May 12 21:00:50 2014
@@ -35,11 +35,10 @@ class PackageBuilder {
private void createLibStructure(List<String> dependencyOrder) {
Set<String> previousJars = []
- Set<File> duplicatedJars = []
dependencyOrder.each { classifier ->
def recurse = { DataBuilder builder, String path, File file ->
if (previousJars.contains(file.name)) {
- duplicatedJars << file
+ file.delete()
} else {
previousJars << file.name
file.renameTo(new File(file.parentFile,
"libtomee-${classifier}-${file.name}"))
@@ -59,7 +58,6 @@ class PackageBuilder {
dataBuilder: builder
))
}
- duplicatedJars.each { it.delete() }
def writeTpl = { ControlBuilder me, String toPath, String tplPath,
String classifier ->
def params = [
classifier : classifier,
