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">