Author: tveronezi Date: Fri Mar 22 11:33:02 2013 New Revision: 1459731 URL: http://svn.apache.org/r1459731 Log: https://issues.apache.org/jira/browse/TOMEE-245 -removing unnecessary "original" files -add Makefile helper
pending issues: E: tomee: debian-changelog-file-missing W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-es.jar W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-fr.jar W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-ja.jar W: tomee: codeless-jar usr/share/tomee/lib/tomee-webapp-1.6.0-SNAPSHOT.jar Is there a way to create a debian changelog file from jira? Added: tomee/sandbox/tomee-deb/Makefile tomee/sandbox/tomee-deb/src/main/config/ Modified: tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy Added: tomee/sandbox/tomee-deb/Makefile URL: http://svn.apache.org/viewvc/tomee/sandbox/tomee-deb/Makefile?rev=1459731&view=auto ============================================================================== --- tomee/sandbox/tomee-deb/Makefile (added) +++ tomee/sandbox/tomee-deb/Makefile Fri Mar 22 11:33:02 2013 @@ -0,0 +1,22 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +deb: + mvn clean install -DskipTests=true && lintian target/apache-tomee-plus-1.6.0-SNAPSHOT.deb > target/out.txt + +unpack: + lintian -u target/apache-tomee-plus-1.6.0-SNAPSHOT.deb + +.PHONY: deb unpack + Modified: tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy URL: http://svn.apache.org/viewvc/tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy?rev=1459731&r1=1459730&r2=1459731&view=diff ============================================================================== --- tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy (original) +++ tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy Fri Mar 22 11:33:02 2013 @@ -37,11 +37,9 @@ class PackageBuilder { File parent = new File(this.targetDir, 'output') File outputDir = new File(parent, fileName) outputDir.mkdirs() - File tar = new File(parent, fileName + '.tar') TarArchiveInputStream input = new TarArchiveInputStream(new FileInputStream(tar)) TarArchiveEntry entry = null - while ((entry = (TarArchiveEntry) input.getNextEntry()) != null) { if (entry.isDirectory()) { new File(outputDir, entry.getName()).mkdirs() @@ -89,18 +87,22 @@ class PackageBuilder { } private def tarItem = { TarArchiveOutputStream output, File item, Integer startIndex, def dataholder -> - if (item.isFile() && item.name == 'LICENSE') { - // no-op the package has the license already. http://lintian.debian.org/tags/no-copyright-file.html - return + if (item.isFile()) { + if (item.name == 'LICENSE') { + // no-op the package has the license already. http://lintian.debian.org/tags/no-copyright-file.html + return + } + if (item.name.endsWith('.original')) { + // no-op -> skipping unused file. + return + } } String subPath = item.path.substring(startIndex).replaceAll("\\\\", "/"); if (item.isDirectory()) { subPath = subPath + '/' } - String root String path - if (subPath.startsWith('/webapps') || subPath.startsWith('/work')) { root = './var/lib/tomee' path = root + subPath @@ -123,15 +125,13 @@ class PackageBuilder { path = root + subPath } tarRoot('data', output, root) - TarArchiveEntry entry = new TarArchiveEntry(path, true) - entry.userName = 'root' entry.groupName = 'root' entry.setModTime(System.currentTimeMillis()) if (item.isFile()) { dataholder.checksum.append(getCheckSumLine(path, item)) - if (path.endsWith('.sh') || path.endsWith('.sh.original')) { + if (path.endsWith('.sh')) { entry.mode = 0100755 } @@ -143,9 +143,7 @@ class PackageBuilder { } else { output.putArchiveEntry(entry) } - output.closeArchiveEntry() - if (item.isDirectory()) { File[] children = item.listFiles() children.each { @@ -189,12 +187,10 @@ class PackageBuilder { checksum: new StringBuilder(), conffiles: new ArrayList<String>() ] - items.each { tarItem(output, it, startIndex, dataholder) } addCopyrightEntry(output, dataholder) - output.close() return [ tar: tar, @@ -251,16 +247,13 @@ Description: Apache TomEE addTextEntry(output, 'md5sums', checksum) } - private File createControlTar(File exploded, def data) { File tar = new File(exploded.parent, 'control.tar') TarArchiveOutputStream output = new TarArchiveOutputStream(new FileOutputStream(tar)) output.longFileMode = TarArchiveOutputStream.LONGFILE_POSIX - addControlEntry(output, (long) data.size) addConffilesEntry(output, (List<String>) data.conffiles) addChecksum(output, (String) data.checksum) - output.close() return tar } @@ -268,9 +261,7 @@ Description: Apache TomEE private def unzip(String fileName) { File outputDir = new File(this.targetDir, 'output') outputDir.mkdirs() - File gz = new File(this.targetDir, fileName + '.tar.gz') - InputStream input = new GZIPInputStream(new FileInputStream(gz)) OutputStream output = new FileOutputStream(new File(outputDir, fileName + '.tar')) output << input @@ -310,11 +301,9 @@ Description: Apache TomEE String packageName = "apache-tomee-${name}-${tomeeVersion}.deb" File ar = new File(data.parent, packageName) ArArchiveOutputStream output = new ArArchiveOutputStream(new FileOutputStream(ar)) - arDebianBinary(output) arItem(output, control) arItem(output, data) - output.close() return ar }