From: Owen S. Dunn <osd1000@tacitus.greenend.org.uk>
Date: Sun, 20 Dec 2009 14:43:37 +0000 (+0000)
Subject: Modify PCTB.xml
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-owen.git;a=commitdiff_plain;h=6d29ce8e9d7af22fac09ec482f9198fbdaa3637c

Modify PCTB.xml
---

diff --git a/src/PCTB.xml b/src/PCTB.xml
index 72a093b..4543b7d 100644
--- a/src/PCTB.xml
+++ b/src/PCTB.xml
@@ -1,8 +1,10 @@
-<project name="MarketUploader" default="jar">
+<project name="MarketUploader" default="all">
 	<property name="src" location="."/>
 	<property name="build" location="build"/>
 	<property name="rootdir" location="."/>
 	
+	<target name="all" depends="init,compile,jar,wininst" />
+
 	<target name="init">
 		<mkdir dir="${build}"/>
 	</target>
@@ -18,30 +20,24 @@
 	</target>
 	
 	<target name="jar" depends="compile">
-		<jar jarfile="${build}/PCTB-ControlPanel.jar">
+		<jar jarfile="${src}/../PCTB-ControlPanel.jar">
 			<manifest>
 				<attribute name="Main-Class" value="com.tedpearson.ypp.market.ControlPanel"/>
 			</manifest>
 			<fileset dir="${build}" includes="**/ControlPanel*"/>
 		</jar>
-		<jar jarfile="${build}/PCTB-Uploader.jar">
+		<jar jarfile="${src}/../PCTB-Uploader.jar">
 			<fileset dir="${src}" includes="com/sun/**" />
 			<fileset dir="${build}" includes="**/Market*.class"/>
 			<fileset dir="${build}" includes="com/myjavatools/**, com/tedpearson/util/update/*.class"/>
 		</jar>
-		<jar jarfile="${rootdir}/PCTB-Installer.jar">
-			<manifest>
-				<attribute name="Main-Class" value="com.tedpearson.ypp.market.Installer"/>
-			</manifest>
-			<fileset dir="${build}" includes="**/Installer*.class, *.jar" excludes="ControlPanel*"/>
-			<fileset dir="${build}" includes="com/tedpearson/util/update/*.class"/>
-			<zipfileset prefix="lib" dir="${src}" includes="elevate.*"/>
-			<zipfileset prefix="src" dir="${rootdir}" includes="com/tedpearson/ypp/market/*.java, com/tedpearson/util/update/*.java, com/myjavatools/web/*.java,  PCTB.xml"/>
-		</jar>
-
 	</target>
-	
-	<target name="run" depends="jar">
-		<java jar="${rootdir}/PCTB-Installer.jar" fork="true"/>
+
+	<target name="wininst" depends="jar">
+		<exec executable="makensis" dir="${src}/..">
+		      <arg value="-NOCD" />
+		      <arg value="${src}/winsetup.nsi" />
+		</exec>
 	</target>
+
 </project>