# HG changeset patch
# User nolith
# Date 1181934919 -7200
# Branch trunk
# Node ID 21f1c36b28300881965a32231ddfefbc011e1de1
# Parent  4581103ec2ba103796c10c7decff5c92e9062207
[svn] Now should build generic, win and mac application fron any system....maybe... :D

diff -r 4581103ec2ba103796c10c7decff5c92e9062207 -r 21f1c36b28300881965a32231ddfefbc011e1de1 ant/JavaApplicationStub
Binary file ant/JavaApplicationStub has changed
diff -r 4581103ec2ba103796c10c7decff5c92e9062207 -r 21f1c36b28300881965a32231ddfefbc011e1de1 ant/one-jar-ant-task.xml
--- a/ant/one-jar-ant-task.xml	Fri Jun 15 16:22:15 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<project name="one-jar" >
-<target name="one-jar" depends="build">
-        <!-- Construct the One-JAR file -->   
-        <one-jar destfile="hello.jar" manifest="hello.mf">
-            <main>
-                <!-- Construct main.jar from classes and source code -->
-                <fileset dir="${build}"/>
-            </main>
-            <lib>
-                <fileset dir="${libs}" includes="*.jar"/>
-            </lib>
-        </one-jar>
-        <echo>
-          Now you can run the Hello One-JAR example using 
-          $ java -jar hello.jar
-        </echo>   
-           
- </target>
- </project>
\ No newline at end of file
diff -r 4581103ec2ba103796c10c7decff5c92e9062207 -r 21f1c36b28300881965a32231ddfefbc011e1de1 build.xml
--- a/build.xml	Fri Jun 15 16:22:15 2007 +0200
+++ b/build.xml	Fri Jun 15 21:15:19 2007 +0200
@@ -122,7 +122,7 @@
 
 
 
-	<target name="jar" depends="build">
+<!--	<target name="jar" depends="build">
 		<jar jarfile="${out.jar}">
 			<fileset dir="${build}"/>
 			<manifest>
@@ -131,7 +131,7 @@
 				<attribute name="Class-Path" value=". ${itext} ${bcprov} ${commons-cli}"/>
 			</manifest>
 		</jar>
-	</target>
+	</target> -->
 	
 	
   <target name="deploy-generic" depends="build">
@@ -147,28 +147,32 @@
       </fatjar.build>
   </target>
 
-	<target name="deploy-osx" depends="jar">
+	<target name="deploy-osx" depends="deploy-generic">
 		<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" />
+			jvmversion="1.5+" version="0.1" 
+			workingdirectory="$APP_PACKAGE/Contents/Resources" 
+	    stubfile="./ant/JavaApplicationStub">
+			<jarfileset dir="${release}" includes="*.jar" />
+	    <jarfileset dir="." includes="libs/*.jar"/>
 			<javaproperty name="apple.laf.useScreenMenuBar" value="true"/>
-			<resourcefileset dir="." includes="images/**">
+			<!--<resourcefileset dir="." includes="images/**">
 				<exclude name="**/*.svg"/>
 				<exclude name="**/*.icns"/>
-			</resourcefileset>
+			</resourcefileset> -->
 		</jarbundler>
 	</target>
 	
 	<target name="deploy-win" depends="deploy-generic">
-		<launch4j configFile="./ant/launch4j.xml" jarPath="../${out.fatjar}" outfile="../${release}/PortableNotary.exe" />
+		<launch4j configFile="./ant/launch4j.xml" 
+				jarPath="../${out.fatjar}" 
+				outfile="../${release}/PortableNotary.exe" />
 	</target>
 	
-	<target name="deploy" depends="deploy-osx, deploy-generic" />
+	<target name="deploy" depends="deploy-generic, deploy-osx, deploy-win" />
 
 </project>