Modify PCTB.xml

diff --git a/src/PCTB.xml b/src/PCTB.xml
index 72a093b626bed58426e505ba12cc49b2e53f2f59..4543b7dd9fe7ade9bcdbab4a0b78bcda8df1da85 100644 (file)
--- 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="."/>
        
        <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>
        <target name="init">
                <mkdir dir="${build}"/>
        </target>


@@ -18,30 +20,24 @@
        </target>
        
        <target name="jar" depends="compile">
        </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>
                        <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>
                        <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>

-       
-       <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>
        </target>

+

 </project>
 </project>