File: remove_bnd.diff

package info (click to toggle)
asm 5.1-1
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 19,780 kB
  • sloc: java: 41,697; xml: 1,918; makefile: 16; sh: 10
file content (201 lines) | stat: -rw-r--r-- 9,610 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
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@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}"/>