# HG changeset patch
# User nolith
# Date 1181598588 -7200
# Branch trunk
# Node ID c78f6d17dbe0111e65b9a0c3928db52a3614e246
# Parent  776821e4f4ba1d16ab1fc7c4611bd1be43fd8c93
[svn] A minimal deployment is supported now via ant

diff -r 776821e4f4ba1d16ab1fc7c4611bd1be43fd8c93 -r c78f6d17dbe0111e65b9a0c3928db52a3614e246 build.xml
--- a/build.xml	Mon Jun 11 16:15:38 2007 +0200
+++ b/build.xml	Mon Jun 11 23:49:48 2007 +0200
@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <!-- build file for PortableNotary program -->
-<!-- Created by: Alessio Caiazza &lt;ac@abisso.org&gt;  -->
+<!-- Created by: Alessio Caiazza &lt;ac@abisso.org&gt;	-->
 
 <project name="PortableNotary" default="run" basedir=".">
-  <property name="src" value="./src"/>
-  <property name="src.right" value="./source"/>
-  <property name="build" value="./bin"/>
-  <property name="libs" value="./libs"/>
-  <property name="itext" value="${libs}/itext-2.0.4.jar"/>
-  <property name="commons-cli" value="${libs}/commons-cli-1.0.jar"/>
-  <property name="bcprov" value="${libs}/bcprov-jdk16-136.jar"/>
-  <property name="compile.debug"       value="true"/>
-<!-- trick for legacy JVM -->
+	<property name="src" value="./src"/>
+	<property name="src.right" value="./source"/>
+	<property name="build" value="./bin"/>
+	<property name="libs" value="./libs"/>
+	<property name="main.class" value="org.abisso.PortableNotary.PortableNotary"/>
+	<property name="out.jar" value="./PortableNotary.jar"/>
+	<property name="itext" value="${libs}/itext-2.0.4.jar"/>
+	<property name="commons-cli" value="${libs}/commons-cli-1.0.jar"/>
+	<property name="bcprov" value="${libs}/bcprov-jdk16-136.jar"/>
+	<property name="compile.debug"			 value="true"/>
+	<!-- trick for legacy JVM -->
 	<condition property="source.version" value="1.5" else="1.6">
 		<equals arg1="${java6}" arg2="false"/>
 	</condition>
@@ -21,100 +23,140 @@
 	<condition property="enddef.token" value="*/" else="">
 		<equals arg1="${java6}" arg2="false"/>
 	</condition>
-<!-- If not set already make sure that they are defined but empty 
-<property name="ifdef.token" value=""/>
-<property name="enddef.token" value=""/> -->
+	
+	<taskdef name="jarbundler" 
+	         classname="net.sourceforge.jarbundler.JarBundler" />
+	<property name="launch4j.dir" location="/Developer/Java/launch4j" />
+	<taskdef name="launch4j"
+	    classname="net.sf.launch4j.ant.Launch4jTask"
+	    classpath="${launch4j.dir}/launch4j.jar
+	        :${launch4j.dir}/lib/xstream.jar" />
 
 
-  <path id="classpath">
-    <pathelement location="${itext}"/>
-  	<pathelement location="${bcprov}"/>
-  	<pathelement location="${commons-cli}"/>
-  	<!-- <pathelement location="${junit.jar}"/> -->
-  </path>
+	<path id="classpath">
+		<pathelement location="${itext}"/>
+		<pathelement location="${bcprov}"/>
+		<pathelement location="${commons-cli}"/>
+		<!-- <pathelement location="${junit.jar}"/> -->
+	</path>
 
-<!-- 
-Build all Java source files into destdir.  This is common in Java
-projects: the compile target is trivial, since it just says to build
-everything.  Fancier compiler targets are easy if you want to build
-just one file at a time.
- -->
-    <target name="build" depends="init">
-        <javac srcdir="${src.right}" 
-               destdir="${build}"
-               debug="${compile.debug}"
-               source="${source.version}">
-           <classpath refid="classpath"/>
-        </javac>
-    	<copy todir="${build}">
-    	    <fileset dir="${src}" excludes="**/*.java"/>
-    	</copy>
-    </target>
+	<!-- 
+		Build all Java source files into destdir.	 This is common in Java
+		projects: the compile target is trivial, since it just says to build
+		everything.	 Fancier compiler targets are easy if you want to build
+		just one file at a time.
+	-->
+	<target name="build" depends="init">
+		<javac srcdir="${src.right}" 
+			destdir="${build}"
+			debug="${compile.debug}"
+			source="${source.version}">
+			<classpath refid="classpath"/>
+		</javac>
+		<copy todir="${build}">
+			<fileset dir="${src}" excludes="**/*.java"/>
+		</copy>
+	</target>
 
-	  <target name="download_deps">
-	  	<mkdir dir="${libs}"/>
-	  	<get src="http://www.bouncycastle.org/download/bcprov-jdk16-136.jar"
-	  		dest="${bcprov}" verbose="on" usetimestamp="on" />
-	  	<get src="http://prdownloads.sourceforge.net/itext/itext-2.0.4.jar"
-	  	  		dest="${itext}" verbose="on" usetimestamp="on" />
-	  	<get src="http://apache.markoer.org/jakarta/commons/cli/binaries/cli-1.0.tar.gz"
-	  		 	dest="${libs}/cli-1.0.tar.gz" verbose="on" usetimestamp="on" />
-	  	<gunzip src="${libs}/cli-1.0.tar.gz" />
-	  	<untar src="${libs}/cli-1.0.tar" dest="${libs}">
-	  		<patternset>
-	  			<include name="commons-cli-1.0/commons-cli-1.0.jar"/>
-	  		</patternset>
-	  	</untar>
-	  	<move file="${libs}/commons-cli-1.0/commons-cli-1.0.jar" todir="${libs}" />
-	  	<delete file="${libs}/cli-1.0.tar" />
-	  	<delete dir="${libs}/commons-cli-1.0" />
-	  	</target>
-<!--
-init is a target that sets things up for the build.  Since we use the
-built-in ant function mkdir, it will only make the directory if it
-does not already exist.
--->
-  <target name="init">
-    <mkdir dir="${build}"/>
-	<mkdir dir="${src.right}"/>
-	<copy todir="${src.right}">
-		<fileset dir="${src}">
-			<include name="**/*.java"/>
-		</fileset>
-		<filterset begintoken="//[" endtoken="]">
-			<filter token="ifdef" value="${ifdef.token}"/>
-			<filter token="enddef" value="${enddef.token}"/>
-		</filterset>
-	</copy>
-  </target>
+	<target name="download_deps">
+		<mkdir dir="${libs}"/>
+		<get src="http://www.bouncycastle.org/download/bcprov-jdk16-136.jar" dest="${bcprov}" verbose="on" usetimestamp="on" />
+		<get src="http://prdownloads.sourceforge.net/itext/itext-2.0.4.jar" dest="${itext}" verbose="on" usetimestamp="on" />
+		<get src="http://apache.markoer.org/jakarta/commons/cli/binaries/cli-1.0.tar.gz" dest="${libs}/cli-1.0.tar.gz" verbose="on" usetimestamp="on" />
+		<gunzip src="${libs}/cli-1.0.tar.gz" />
+		<untar src="${libs}/cli-1.0.tar" dest="${libs}">
+			<patternset>
+				<include name="commons-cli-1.0/commons-cli-1.0.jar"/>
+			</patternset>
+		</untar>
+		<move file="${libs}/commons-cli-1.0/commons-cli-1.0.jar" todir="${libs}" />
+		<delete file="${libs}/cli-1.0.tar" />
+		<delete dir="${libs}/commons-cli-1.0" />
+	</target>
+	<!--
+		init is a target that sets things up for the build.	 Since we use the
+		built-in ant function mkdir, it will only make the directory if it
+		does not already exist.
+	-->
+	<target name="init">
+		<mkdir dir="./release"/>
+		<mkdir dir="${build}"/>
+		<mkdir dir="${src.right}"/>
+		<copy todir="${src.right}">
+			<fileset dir="${src}">
+				<include name="**/*.java"/>
+			</fileset>
+			<filterset begintoken="//[" endtoken="]">
+				<filter token="ifdef" value="${ifdef.token}"/>
+				<filter token="enddef" value="${enddef.token}"/>
+			</filterset>
+		</copy>
+	</target>
 
 
-  <target name="run" depends="build">
-    <java classname="org.abisso.PortableNotary.PortableNotary"  
-        fork="true" 
-        dir="${build}" 
-        classpath="${build}" 
-        maxmemory="500m">
-    	<classpath refid="classpath"/>
-    	<arg value="-g"/>
-    </java>
-    </target>
-<!--
-Always include a clean target to get rid of all the extra files
-created by the build process, so you can save storage safely, without
-thinking.  Also: sometimes you'll want to do a completely fresh build,
-such as when changing to a new version of the JDK.
--->
-  <target name="clean" description="Removes previous build">
-    <delete verbose="true">
-      <fileset dir="${build}"/>
-		<fileset dir="${src.right}"/>
-    </delete>
-  </target>
+	<target name="run" depends="build">
+		<java classname="${main.class}"	
+			fork="true" 
+			dir="${build}" 
+			classpath="${build}" 
+			maxmemory="500m">
+			<classpath refid="classpath"/>
+			<arg value="-g"/>
+		</java>
+	</target>
+	<!--
+		Always include a clean target to get rid of all the extra files
+		created by the build process, so you can save storage safely, without
+		thinking.	 Also: sometimes you'll want to do a completely fresh build,
+		such as when changing to a new version of the JDK.
+	-->
+	<target name="clean" description="Removes previous build">
+		<delete verbose="true">
+			<fileset dir="${build}"/>
+			<fileset dir="${src.right}"/>
+			<fileset dir="release"/>
+		</delete>
+	</target>
 
 
 
+	<target name="jar" depends="build">
+		<jar jarfile="${out.jar}">
+			<fileset dir="${build}"/>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="${main.class}"/>
+				<attribute name="Class-Path" value=". ${itext} ${bcprov} ${commons-cli}"/>
+			</manifest>
+		</jar>
+	</target>
+	
+	
+	<target name="deploy-generic" depends="jar">
+		<zip destfile="release/PortableNotary.zip" >
+			<zipfileset dir="." includes="*.jar" />
+			<zipfileset dir="images" includes="*.png" prefix="images"/>
+			<zipfileset dir="libs" includes="*.jar" prefix="libs"/>	
+		</zip>	
+	</target>
 
+	<target name="deploy-osx" depends="jar">
+		<jarbundler dir="release"
+		            name="PortableNotary"
+		            mainclass="${main.class}"
+			bundleid="org.abisso.PortableNotary"
+			icon="./images/Icon.icns"
+			jvmversion="1.6+" version="0.1" 
+			workingdirectory="$APP_PACKAGE/Contents/Resources" >
+			<jarfileset dir="." includes="**/*.jar" />
+			<resourcefileset dir="." includes="images/**">
+				<exclude name="**/*.svg"/>
+				<exclude name="**/*.icns"/>
+			</resourcefileset>
+		</jarbundler>
+	</target>
+	
+	<target name="deploy" depends="deploy-osx" />
 
 </project>
 
diff -r 776821e4f4ba1d16ab1fc7c4611bd1be43fd8c93 -r c78f6d17dbe0111e65b9a0c3928db52a3614e246 images/Icon.icns
Binary file images/Icon.icns has changed
diff -r 776821e4f4ba1d16ab1fc7c4611bd1be43fd8c93 -r c78f6d17dbe0111e65b9a0c3928db52a3614e246 src/org/abisso/PortableNotary/GUI/MainFrame.java
--- a/src/org/abisso/PortableNotary/GUI/MainFrame.java	Mon Jun 11 16:15:38 2007 +0200
+++ b/src/org/abisso/PortableNotary/GUI/MainFrame.java	Mon Jun 11 23:49:48 2007 +0200
@@ -7,11 +7,10 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
+import net.iharder.dnd.FileDrop;
+
 import org.abisso.PortableNotary.Notary;
 
-
-import net.iharder.dnd.FileDrop;
-
 public class MainFrame extends JFrame {
 
 	private static final long serialVersionUID = 1L;
@@ -78,7 +77,7 @@
 	 */
 	private JPanel getImage() {
 		if (Image == null) {
-			Image = new ImagePanel("images/Icon.jpg");
+			Image = new ImagePanel("images/Icon.png");
 			Image.setLayout(new GridBagLayout());
 			Image.setToolTipText("Drag Here your PDF file");
 		}
diff -r 776821e4f4ba1d16ab1fc7c4611bd1be43fd8c93 -r c78f6d17dbe0111e65b9a0c3928db52a3614e246 src/org/abisso/PortableNotary/PortableNotary.java
--- a/src/org/abisso/PortableNotary/PortableNotary.java	Mon Jun 11 16:15:38 2007 +0200
+++ b/src/org/abisso/PortableNotary/PortableNotary.java	Mon Jun 11 23:49:48 2007 +0200
@@ -1,5 +1,6 @@
 package org.abisso.PortableNotary;
 
+
 import org.abisso.PortableNotary.GUI.MainFrame;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -27,8 +28,7 @@
 	 * @param args
 	 */
 	@SuppressWarnings("static-access") //$NON-NLS-1$
-	public static void main(String[] args) {
-		
+	public static void main(String[] args) {		
 //		 create the command line parser
 		CommandLineParser parser = new PosixParser();