Package: mauve-aligner / 2.4.0+4736-3

no_ext_dir_at_all.patch Patch series | download
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
Author: Andreas Tille <tille@debian.org>
Last-Updated: Fri, 17 Apr 2015 15:38:22 +0200
Description: Some remainings of mentioning ext/ in build.xml were breaking
 the build.  Just removed everything which is possibly a bit brute force
 but works.

--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,6 @@
 	<property name="src" location="src"/>
 	<property name="build" location="bin"/>
 	<property name="dist"  location="dist"/>
-	<property name="ext" location="ext"/>
         <property name="deblib" location="/usr/share/java" />
  	<property name="support" location="/usr/share/java"/>
 
@@ -104,18 +103,6 @@
 	</target>
 	
 	<target name="jar" depends="rmic">
-		<!-- Make list of external dependencies -->
-		<fileset dir="${ext}" id="ext.jars">
-			<include name="**/*.jar"/>
-		</fileset>
-		<pathconvert pathsep=" " property="ext.path" refid="ext.jars">
-			<mapper>
-				<chainedmapper>
-					<mapper type="flatten" />
-					<mapper type="glob" from="*.jar" to="ext/*.jar"/>
-				</chainedmapper>
-			</mapper>
-		</pathconvert>
 		
 	    <!-- Put everything in ${build} into the Mauve.jar file -->
 		<delete file="Mauve.jar"/>
@@ -126,7 +113,6 @@
 			<manifest>
 				<attribute name="Main-Class" value="org.gel.mauve.gui.Mauve"/>
 				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Class-Path" value="${ext.path}" />
 				<section name="common">
 					<attribute name="Specification-Title" value="Mauve"/>
 					<attribute name="Specification-Version" value="${version}"/>
@@ -161,14 +147,6 @@
 		<signjar jar="mauveApplet.jar" alias="${key.alias}" storepass="${key.password}" keystore="${key.keystore}" />
 	</target>
 	
-	<target name="signextjars" depends="checkkeyprops">
-		<signjar alias="${key.alias}" storepass="${key.password}" keystore="${key.keystore}">
-			<fileset dir="./ext">
-				<include name="*.jar" />
-			</fileset>
-		</signjar>
-	</target>
-	
 	<target name="testdist" depends="signjars">
 		<copy todir="C:\htdocs" file="Mauve.jar" />
 		<copy todir="C:\htdocs" file="mauveApplet.jar" />
@@ -205,7 +183,6 @@
 				<include name="mauveAligner" />
 				<include name="progressiveMauve" />
 			</tarfileset>
-			<tarfileset dir="${ext}" prefix="/mauve_${release.version}/ext" includes="*.jar" />
 		</tar>
 	</target>
 
@@ -238,11 +215,6 @@
 	
 	<target name="asapResources">
 		<pathconvert property="asap.resources" pathsep=" ">
-			<path>
-				<fileset dir="./ext">
-					<include name="*.jar" />
-				</fileset>
-			</path>
 			<mapper>			
 		        <chainedmapper>
 		    		<mapper type="flatten" />