Package: mauve-aligner / 2.4.0+4736-1

build_xml.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
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
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
Author: Andreas Tille <tille@debian.org>
Last-Updated: Fri, 17 Apr 2015 15:38:22 +0200
Description: Drop OSX specific things from build.xml,
 Prevent build from calling home at build time

--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,6 @@
 	-->
 	<!-- deployment locations for standalone releases -->
 	<property name="deploy.address" value="darlini8@darlinglab.org" />
-	<property name="deploy.bareaddress" value="darlinglab.org" />
 	<property name="deploy.username" value="darlini8" />
 	<property name="deploy.win32.keyfile" value="C:\Documents and Settings\koadman\plonk.ppk" />
 	<property name="deploy.serverdir" value="/home3/darlini8/www/mauve/downloads" />
@@ -44,14 +43,6 @@
 	<!-- get any environment variables -->	
 	<property environment="env" />
 
-	<!-- osxant.jar creates Mac OS X disk images -->
-	<taskdef name="dmg" classname="com.amberarcher.ant.osx.DmgTask">
-		<classpath>
-			<pathelement path="${support}/osxant.jar"/>
-		</classpath>
-	</taskdef>
-	<!-- maverick-ant.jar supports secure FTP for deployment -->
-    <taskdef name="ssh" classname="com.sshtools.ant.Ssh" classpath="${support}/maverick-ant.jar"/>
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
 		<classpath>
 			<pathelement path="${support}/ant-contrib-1.0b3.jar"/>
@@ -189,7 +180,7 @@
 		<copy todir="C:\htdocs" file="./jws/mauve.jnlp" />
 	</target>
 		
-	<target name="dist" depends="jar,getChangeLog" description="generate the distribution" >
+	<target name="dist" depends="jar" description="generate the distribution" >
 		<!-- Create the distribution directory -->
 		<mkdir dir="${dist}" />
 		
@@ -221,146 +212,6 @@
 		</tar>
 	</target>
 
-	<taskdef name="bundleapp"
-		classname="com.oracle.appbundler.AppBundlerTask"   
-		classpath="build_support/appbundler-1.0.jar" />
-
-<!-- Create a DMG - This only works on MacOSX (requires hdiutil) -->
-<target name="dmg" depends="macdist" description="Create a DMG package for MacOSX (only works on MacOSX)">
-    
-    <!-- Set this property value to your application name -->
-    <property name="app.name" value="Mauve-${release.version}"/>
-    
-    <!-- Set this property value to a directory where you can
-     mount temporarily your images, for example /tmp -->
-    <property name="mountdir"  value="/tmp"/>
-    
-    <!-- Delete previously created DMG -->
-    <delete file="${dist}/${app.name}.dmg" quiet="yes" failonerror="false"/>
-    
-    <!-- Create a temporary Disk Image -->
-    <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
-        <arg value="create"/>
-        <arg value="-srcfolder"/>
-        <arg value="staging"/>
-        <arg value="-volname"/>
-        <arg value="${app.name}"/>
-        <arg value="-ov"/>
-        <arg value="${dist}/${app.name}-tmp.dmg"/>
-        <arg value="-format"/>
-        <arg value="UDRW"/>
-    </exec>
-    
-    <!-- Attach the temporary image -->
-    <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
-        <arg value="attach"/>
-        <arg value="${dist}/${app.name}-tmp.dmg"/>
-        <arg value="-mountroot"/>
-        <arg value="${mountdir}/"/>
-    </exec>
-    
-    <!-- Copy the background, the volume icon and DS_Store files -->
-    <mkdir dir="${mountdir}/${app.name}/.background"/>
-    <copy file="osx/background.png" tofile="${mountdir}/${app.name}/.background/background.png" overwrite="true"/>
-    <copy file="osx/mauve.icns" tofile="${mountdir}/${app.name}/.VolumeIcon.icns" overwrite="true"/>
-    <copy file="osx/DS_Store" tofile="${mountdir}/${app.name}/.DS_Store" overwrite="true"/>
-
-
-    <!-- Indicate that we want a custom icon -->
-    <exec executable="SetFile" os="Mac OS X">
-        <arg value="-a"/>
-        <arg value="C"/>
-        <arg value="${mountdir}/${app.name}"/>
-    </exec>
-    
-    <!-- Add a symbolic link to the Applications directory -->
-    <symlink link="${mountdir}/${app.name}" resource="/Applications"/>
-
-
-
-    <!-- Detach the temporary image -->
-    <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
-        <arg value="detach"/>
-        <arg value="${mountdir}/${app.name}"/>
-    </exec>
-    
-    <!-- Compress it to a new image -->
-    <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
-        <arg value="convert"/>
-        <arg value="${dist}/${app.name}-tmp.dmg"/>
-        <arg value="-format"/>
-        <arg value="UDZO"/>
-        <arg value="-o"/>
-        <arg value="${dist}/${app.name}.dmg"/>
-    </exec>
-    
-    <!-- Delete the temporary image -->
-    <delete file="${dist}/${app.name}-tmp.dmg" quiet="yes" failonerror="false"/>
-</target>
-
-
-	<!-- Create an OS X application and disk image -->
-	<target name="macdist" depends="jar,getChangeLog" description="Generate a Mac OS X disk image" >
-		<!-- Create the distribution directory -->
-		<mkdir dir="${dist}" />
-		<delete dir="${dist}/Mauve.app"/>
-
-        <!-- get the java home -->
-        <exec executable="/usr/libexec/java_home" os="Mac OS X" failonerror="true" outputproperty="osx.java.home"/>
-		<bundleapp outputdirectory="${dist}"
-			name="Mauve"
-			displayname="Mauve ${release.version}"
-			identifier="components.Mauve"
-			icon="osx/mauve.icns"
-			shortversion="${release.version}"
-			copyright="(c) 2003-2015  http://darlinglab.org/mauve"
-			mainclassname="org.gel.mauve.gui.Mauve">
-			<classpath file="Mauve.jar" />
-			<classpath file="ext/*.jar" />
-			<librarypath file="osx/progressiveMauve" />
-			<librarypath file="osx/mauveAligner" />
-            <runtime dir="${osx.java.home}" />
-            <option value="-Dapple.laf.useScreenMenuBar=false"/>
-            <option value="-Xmx500m"/>
-		</bundleapp>
-		
-		<!-- Create a staging directory for the Disk Image filesystem -->
-		<mkdir dir="staging"/>
-        <exec executable="ditto" failonerror="true">
-                <arg value="-v"/>
-                <arg value="${dist}/Mauve.app"/>
-                <arg value="staging/Mauve.app"/>
-        </exec>
-		<copy todir="staging">
-			<fileset dir="${basedir}">
-				<include name="ChangeLog.html"/>
-			</fileset>
-		</copy>
-		
-		<!-- copy text files to the staging directory, adding .txt
-		     to their filename -->
-		<copy todir="staging">
-			<fileset dir="${basedir}">
-				<include name="COPYING"/>
-			</fileset>
-			<mapper type="glob" from="*" to="*.txt"/>
-		</copy>
-		<chmod file="staging/Mauve.app/Contents/MacOS/JavaAppLauncher" perm="755"/>
-		<chmod file="staging/Mauve.app/Contents/MacOS/mauveAligner" perm="755"/>
-		<chmod file="staging/Mauve.app/Contents/MacOS/progressiveMauve" perm="755"/>
-
-<!-- sign the app -->
-<exec executable="/usr/bin/codesign" os="Mac OS X" failonerror="true">
-    <arg value="-s"/>
-    <arg value="Developer ID Application: Aaron Darling"/>
-    <arg value="--deep"/>
-    <arg value="staging/Mauve.app"/>
-</exec>
-<!---->
-
-<!--        <dmg destfile="${dist}/Mauve-${release.version}.dmg" name="Mauve ${release.version}" srcdir="staging" compressed="true"/> -->
-	</target>
-
 	<target name="srcdist" depends="init" description="package a source distribution">
 		<tar destfile="${dist}/mauve_source_${datestamp}.tar.gz" compression="gzip">
 			<!-- Copy support files into the dist directory-->
@@ -384,27 +235,6 @@
 		</tar>
 	</target>
 
-	<target name="getChangeLog" >
-		<get src="http://darlinglab.org/mauve/user-guide/versions.html" dest="ChangeLog.html" usetimestamp="true"/>
-		<copy file="ChangeLog.html" tofile="ChangeLog"/>
-	</target>
-
-	<target name="nsicompile" depends="jar,getChangeLog" description="make windows installer" >
-
-		<!-- create output directory -->
-		<mkdir dir="${dist}" />
-
-		<!-- Make timestamp and timestampdash for installer making -->
-		<property environment="env" />
-		<echo message="Program files: ${env.ProgramFiles}"/>
-		<exec executable="C:\Program Files (x86)\NSIS\makensis.exe" dir=".">
-			<arg line="/V2 /NOCD win32\mauve.nsi" />
-			<env key="release_version" value="${release.version}" />
-			<env key="datestamp" value="${datestamp}" />
-		</exec>
-	</target>
-		
-	
 	<target name="run" depends="jar" description="run Mauve">
 		<java jar="Mauve.jar" fork="true" />
 	</target>
@@ -439,68 +269,8 @@
 			</filterset>
 		</copy>
 
-		<!-- copy unmodified files to the server -->
-		<ssh host="${deploy.bareaddress}"
-			username="${deploy.username}"
-			version="2"
-			keyfile="${deploy.win32.keyfile}">
-			<sftp action="put" remotedir="${deploy.asapdir}" verbose="true" newer="true">
-				<fileset dir=".">
-					<include name="Mauve.jar" />
-					<include name="mauveApplet.jar" />
-				</fileset>
-				<fileset dir="./ext">
-					<include name="*.jar"/>
-				</fileset>
-				<fileset dir="./src/images">
-					<include name="mauve_icon.gif" />
-					<include name="mauve_logo.png" />
-				</fileset>
-				<fileset dir="${dist}">
-					<include name="mauve.jnlp"/>
-				</fileset>
-			</sftp>
-			<!-- set the permissions so others in the group can modify them -->
-			<exec cmd="chgrp annotation ${deploy.asapdir}/*"/>
-			<exec cmd="chmod 664 ${deploy.asapdir}/*"/>
-			<!-- jar files should have the execute bit set -->
-			<exec cmd="chmod 775 ${deploy.asapdir}/*.jar"/>
-		</ssh>
-	</target>
-	
-	<!-- assumes that an ssh key has been registered with the web server -->
-	<target name="deployWin32" depends="nsicompile">
-		<echo file="${dist}\latest" message="${datestamp}"/>
-		<echo file="${dist}\latest.windows" message="${datestamp}"/>
-		<ssh host="${deploy.bareaddress}"
-			username="${deploy.username}"
-			version="2"
-			keyfile="${deploy.win32.keyfile}">
-
-			<sftp action="put" remotedir="${deploy.serverdir}" verbose="true">
-				<fileset dir="${dist}">
-					<include name="mauve_installer_${release.version}.exe"/>
-					<include name="${dist}\latest"/>
-					<include name="${dist}\latest.windows"/>
-				</fileset>
-			</sftp>
-			<exec cmd="cp ${deploy.serverdir}/mauve_installer_${release.version}.exe ${deploy.serverdir}/mauve_installer_${datestamp}.exe"/>
-		</ssh>
 	</target>
-
-	<!-- assumes that passwordless ssh authentication has been configured to the web server -->
-	<target name="deployMacOSX" depends="dmg">
-		<exec executable="scp">
-			<arg value="${dist}/Mauve-${release.version}.dmg" />
-			<arg value="${deploy.address}:${deploy.serverdir}" />
-		</exec>
-		<echo file="${dist}/latest.mac" message="${datestamp}"/>
-		<exec executable="scp">
-			<arg value="${dist}/latest.mac" />
-			<arg value="${deploy.address}:${deploy.serverdir}" />
-		</exec>
-	</target>
-
+	
 	<!-- assumes that passwordless ssh authentication has been configured to the web server -->
 	<target name="deployLinux" depends="dist">
 		<exec executable="scp">