[asm] 01/04: Build the jar files with bnd
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jan 18 11:29:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository asm.
commit 8fdcc1410495e2ba4b4e4db3f60f7c2283c2c9a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jan 18 09:55:37 2017 +0100
Build the jar files with bnd
---
debian/changelog | 8 ++
debian/control | 2 +-
debian/osgi/asm-all.osgi | 29 ------
debian/osgi/asm-analysis.osgi | 18 ----
debian/osgi/asm-commons.osgi | 19 ----
debian/osgi/asm-debug-all.osgi | 29 ------
debian/osgi/asm-tree.osgi | 17 ----
debian/osgi/asm-util.osgi | 20 ----
debian/osgi/asm-xml.osgi | 23 -----
debian/osgi/asm.osgi | 16 ----
debian/patches/remove_bnd.diff | 201 -----------------------------------------
debian/patches/series | 1 -
debian/rules | 3 +
13 files changed, 12 insertions(+), 374 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e4adc2..dca0f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+asm (5.2-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build the jar files with bnd to always have up to date OSGi metadata
+ and ensure their contents match with upstream binaries.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 18 Jan 2017 09:51:33 +0100
+
asm (5.2-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index c045813..eb498bf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Aditya Vaidya <kroq.gar78 at gmail.com>,
Emmanuel Bourg <ebourg at apache.org>,
Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper (>= 10), default-jdk
-Build-Depends-Indep: ant, maven-repo-helper
+Build-Depends-Indep: ant, bnd, maven-repo-helper
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/asm.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/asm.git
diff --git a/debian/osgi/asm-all.osgi b/debian/osgi/asm-all.osgi
deleted file mode 100644
index 327e96d..0000000
--- a/debian/osgi/asm-all.osgi
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185056835
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM all classes with debug info
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.all
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.signature;version="5.1",org.objectweb.
- asm.commons;uses:="org.objectweb.asm,org.objectweb.asm.tree,org.objectw
- eb.asm.signature";version="5.1",org.objectweb.asm.util;uses:="org.objec
- tweb.asm,org.objectweb.asm.tree.analysis,org.objectweb.asm.tree,org.obj
- ectweb.asm.signature";version="5.1",org.objectweb.asm.tree.analysis;use
- s:="org.objectweb.asm,org.objectweb.asm.tree";version="5.1",org.objectw
- eb.asm;version="5.1",org.objectweb.asm.xml;uses:="org.xml.sax,org.objec
- tweb.asm,org.xml.sax.helpers,org.xml.sax.ext,javax.xml.transform.sax,ja
- vax.xml.transform,javax.xml.transform.stream,org.objectweb.asm.util";ve
- rsion="5.1",org.objectweb.asm.tree;uses:="org.objectweb.asm";version="5
- .1"
-Implementation-Title: ASM all classes
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: javax.xml.transform;resolution:=optional,javax.xml.trans
- form.sax;resolution:=optional,javax.xml.transform.stream;resolution:=op
- tional,org.xml.sax;resolution:=optional,org.xml.sax.ext;resolution:=opt
- ional,org.xml.sax.helpers;resolution:=optional
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-analysis.osgi b/debian/osgi/asm-analysis.osgi
deleted file mode 100644
index dbc04a2..0000000
--- a/debian/osgi/asm-analysis.osgi
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185057334
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM static code analysis framework
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.analysis
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.tree.analysis;uses:="org.objectweb.asm
- ,org.objectweb.asm.tree";version="5.1"
-Implementation-Title: ASM static code analysis framework
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: org.objectweb.asm;version="[5.1,5.1]",org.objectweb.asm.
- tree;version="[5.1,5.1]"
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-commons.osgi b/debian/osgi/asm-commons.osgi
deleted file mode 100644
index d91fab2..0000000
--- a/debian/osgi/asm-commons.osgi
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185057787
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM commons classes
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.commons
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.commons;uses:="org.objectweb.asm,org.o
- bjectweb.asm.tree,org.objectweb.asm.signature";version="5.1"
-Implementation-Title: ASM commons classes
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: org.objectweb.asm;version="[5.1,5.1]",org.objectweb.asm.
- signature;version="[5.1,5.1]",org.objectweb.asm.tree;version="[5.1,5.1]
- "
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-debug-all.osgi b/debian/osgi/asm-debug-all.osgi
deleted file mode 100644
index e4f6c78..0000000
--- a/debian/osgi/asm-debug-all.osgi
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185058723
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM all classes with debug info
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-SymbolicName: org.objectweb.asm.all.debug
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.signature;uses:="org.objectweb.asm";ve
- rsion="5.1",org.objectweb.asm.commons;uses:="org.objectweb.asm,org.obje
- ctweb.asm.tree,org.objectweb.asm.signature";version="5.1",org.objectweb
- .asm.util;uses:="org.objectweb.asm,org.objectweb.asm.tree.analysis,org.
- objectweb.asm.tree,org.objectweb.asm.signature";version="5.1",org.objec
- tweb.asm.tree.analysis;uses:="org.objectweb.asm,org.objectweb.asm.tree"
- ;version="5.1",org.objectweb.asm;version="5.1",org.objectweb.asm.xml;us
- es:="org.xml.sax,org.objectweb.asm,org.xml.sax.helpers,org.xml.sax.ext,
- javax.xml.transform.sax,javax.xml.transform,javax.xml.transform.stream,
- org.objectweb.asm.util";version="5.1",org.objectweb.asm.tree;uses:="org
- .objectweb.asm";version="5.1"
-Implementation-Title: ASM all classes with debug info
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: javax.xml.transform;resolution:=optional,javax.xml.trans
- form.sax;resolution:=optional,javax.xml.transform.stream;resolution:=op
- tional,org.xml.sax;resolution:=optional,org.xml.sax.ext;resolution:=opt
- ional,org.xml.sax.helpers;resolution:=optional
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-tree.osgi b/debian/osgi/asm-tree.osgi
deleted file mode 100644
index 388c72f..0000000
--- a/debian/osgi/asm-tree.osgi
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185059284
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM Tree class visitor
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.tree
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.tree;uses:="org.objectweb.asm";version
- ="5.1"
-Implementation-Title: ASM Tree class visitor
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: org.objectweb.asm;version="[5.1,5.1]"
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-util.osgi b/debian/osgi/asm-util.osgi
deleted file mode 100644
index c283175..0000000
--- a/debian/osgi/asm-util.osgi
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185059877
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM Utilities
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.util
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.util;uses:="org.objectweb.asm,org.obje
- ctweb.asm.tree.analysis,org.objectweb.asm.tree,org.objectweb.asm.signat
- ure";version="5.1"
-Implementation-Title: ASM Utilities
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Import-Package: org.objectweb.asm;version="[5.1,5.1]",org.objectweb.asm.
- signature;version="[5.1,5.1]",org.objectweb.asm.tree;version="[5.1,5.1]
- ",org.objectweb.asm.tree.analysis;version="[5.1,5.1]"
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm-xml.osgi b/debian/osgi/asm-xml.osgi
deleted file mode 100644
index 7a5a956..0000000
--- a/debian/osgi/asm-xml.osgi
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185060548
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM xml classes
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm.xml
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Class-Path: asm-5.1.jar asm-util-5.1.jar
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm.xml;uses:="org.xml.sax,org.xml.sax.hel
- pers,org.xml.sax.ext,javax.xml.transform.sax,javax.xml.transform,javax.
- xml.transform.stream";version="5.1"
-Implementation-Title: ASM XML classes
-Implementation-Vendor: Eugene Kuleshov
-Implementation-Version: 5.1
-Import-Package: javax.xml.transform;resolution:=optional,javax.xml.trans
- form.sax;resolution:=optional,javax.xml.transform.stream;resolution:=op
- tional,org.xml.sax;resolution:=optional,org.xml.sax.ext;resolution:=opt
- ional,org.xml.sax.helpers;resolution:=optional
-Main-Class: org.objectweb.asm.xml.Processor
-Tool: Bnd-1.50.0
diff --git a/debian/osgi/asm.osgi b/debian/osgi/asm.osgi
deleted file mode 100644
index 4c2e218..0000000
--- a/debian/osgi/asm.osgi
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1457185055805
-Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
-Bundle-Name: ASM
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm
-Bundle-Vendor: France Telecom R&D
-Bundle-Version: 5.1
-Created-By: 1.8.0 (Oracle Corporation)
-Export-Package: org.objectweb.asm;version="5.1",org.objectweb.asm.signat
- ure;version="5.1"
-Implementation-Title: ASM
-Implementation-Vendor: France Telecom R&D
-Implementation-Version: 5.1
-Tool: Bnd-1.50.0
diff --git a/debian/patches/remove_bnd.diff b/debian/patches/remove_bnd.diff
deleted file mode 100644
index 1e8a0c1..0000000
--- a/debian/patches/remove_bnd.diff
+++ /dev/null
@@ -1,201 +0,0 @@
-Description: Don't use BND to create OSGi metadata to avoid dependencies hell.
- Use simple ant <jar/> tasks with pre-generated OSGi metadata.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2013-01-08
-Forwarded: not-needed
---- a/archive/asm-all.xml
-+++ b/archive/asm-all.xml
-@@ -34,6 +34,7 @@
-
- <target name="build-jar">
- <mkdir dir="${out.dist.lib}/all"/>
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -42,7 +43,10 @@
- exceptions="true"
- files="archive/asm-all.bnd"
- output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ excludes="tmp/**,org/objectweb/asm/optimizer**"/>
- <copy file="${archive}/asm-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
-@@ -59,4 +63,4 @@
- <echo file="${out.dist.lib}/all/${ant.project.name}-snapshot-version" message="${product.build.time}"/>
- </target>
-
--</project>
-\ No newline at end of file
-+</project>
---- a/archive/asm-analysis.xml
-+++ b/archive/asm-analysis.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm-analysis.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/tree/analysis/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm-analysis.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
---- a/archive/asm-commons.xml
-+++ b/archive/asm-commons.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm-commons.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/commons/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm-commons.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
---- a/archive/asm-debug-all.xml
-+++ b/archive/asm-debug-all.xml
-@@ -34,6 +34,7 @@
-
- <target name="build-jar">
- <mkdir dir="${out.dist.lib}/all"/>
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}/tmp"
-@@ -42,7 +43,10 @@
- exceptions="true"
- files="archive/asm-debug-all.bnd"
- output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ excludes="tmp/**,org/objectweb/asm/optimizer**"/>
- <copy file="${archive}/asm-debug-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
-@@ -59,4 +63,4 @@
- <echo file="${out.dist.lib}/all/${ant.project.name}-snapshot-version" message="${product.build.time}"/>
- </target>
-
--</project>
-\ No newline at end of file
-+</project>
---- a/archive/asm-tree.xml
-+++ b/archive/asm-tree.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm-tree.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/tree/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm-tree.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
---- a/archive/asm-util.xml
-+++ b/archive/asm-util.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm-util.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/util/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm-util.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
---- a/archive/asm-xml.xml
-+++ b/archive/asm-xml.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm-xml.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/xml/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm-xml.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
---- a/archive/asm.xml
-+++ b/archive/asm.xml
-@@ -33,6 +33,7 @@
- <target name="dist" depends="build-jar,build-snapshot"/>
-
- <target name="build-jar">
-+<!--
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
- <bnd
- classpath="${out.build}"
-@@ -41,7 +42,11 @@
- exceptions="true"
- files="archive/asm.bnd"
- output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
--
-+-->
-+ <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
-+ basedir="${out.build}" manifest="debian/osgi/${ant.project.name}.osgi"
-+ includes="org/objectweb/asm/*,org/objectweb/asm/signature/*"
-+ excludes="tmp/**"/>
- <copy file="${archive}/asm.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
- <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
diff --git a/debian/patches/series b/debian/patches/series
index d965c0e..5871ade 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
encoding.patch
-remove_bnd.diff
reproducible-javadoc.diff
diff --git a/debian/rules b/debian/rules
index ed59b80..454dc64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,13 @@
VERSION ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
+export CLASSPATH=/usr/share/java/bnd.jar:/usr/share/java/bndlib.jar
+
%:
dh $@ --with maven-repo-helper
override_dh_auto_build:
+ mkdir -p output/eclipse
dh_auto_build -- -Dproduct.noshrink=true jar jdoc examples
override_mh_install:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/asm.git
More information about the pkg-java-commits
mailing list