Commit 7d1963bc authored by Quality Assurance's avatar Quality Assurance Committed by qa

Renamed jar target to wildfire

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5826 b35dd754-fafc-0310-a699-88a17e54d16e
parent fc758308
...@@ -194,9 +194,6 @@ ...@@ -194,9 +194,6 @@
<!-- TARGETs --> <!-- TARGETs -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- all =================================================================================== -->
<target name="wildfire" depends="jar" description="Compiles wildfire and generates target/wildfire folder"/>
<!-- init ================================================================================== --> <!-- init ================================================================================== -->
<target name="init"> <target name="init">
...@@ -272,7 +269,7 @@ ...@@ -272,7 +269,7 @@
<target name="plugins-dev"> <target name="plugins-dev">
<!-- Setup Wildfire --> <!-- Setup Wildfire -->
<ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="jar" inheritAll="false" inheritRefs="false"/> <ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="wildfire" inheritAll="false" inheritRefs="false"/>
<copy file="${java.home}/../lib/tools.jar" todir="${jar.dest.dir}"></copy> <copy file="${java.home}/../lib/tools.jar" todir="${jar.dest.dir}"></copy>
<copy file="${ant.home}/lib/ant.jar" todir="${jar.dest.dir}"></copy> <copy file="${ant.home}/lib/ant.jar" todir="${jar.dest.dir}"></copy>
...@@ -306,8 +303,8 @@ ...@@ -306,8 +303,8 @@
</target> </target>
<!-- jar =================================================================================== --> <!-- wildfire =================================================================================== -->
<target name="jar" depends="compile, jspc, -i18n" description="Produces Wildfires jars and sets up dependencies"> <target name="wildfire" depends="compile, jspc, -i18n" description="Compiles and generates runnable target/wildfire folder">
<mkdir dir="${jar.dest.dir}"/> <mkdir dir="${jar.dest.dir}"/>
<!-- Make main Wildfire jar --> <!-- Make main Wildfire jar -->
<jar jarfile="${jar.dest.dir}/${jar.name}" index="true" duplicate="preserve"> <jar jarfile="${jar.dest.dir}/${jar.name}" index="true" duplicate="preserve">
...@@ -389,7 +386,7 @@ ...@@ -389,7 +386,7 @@
</target> </target>
<!-- deployjar ============================================================================= --> <!-- deployjar ============================================================================= -->
<target name="deployjar" depends="jar" description="Pushes JARs to specified web location."> <target name="deployjar" depends="wildfire" description="Pushes JARs to specified web location.">
<copy todir="${deploy.jar.dir}" overwrite="${overwrite}"> <copy todir="${deploy.jar.dir}" overwrite="${overwrite}">
<fileset dir="${jar.dest.dir}" includes="*.jar"/> <fileset dir="${jar.dest.dir}" includes="*.jar"/>
</copy> </copy>
...@@ -500,7 +497,7 @@ ...@@ -500,7 +497,7 @@
</target> </target>
<!-- test ================================================================================== --> <!-- test ================================================================================== -->
<target name="test" depends="jar" description="Compiles and runs test cases"> <target name="test" depends="wildfire" description="Compiles and runs test cases">
<!-- Compile all test code --> <!-- Compile all test code -->
<mkdir dir="${test.classes.dest.dir}"/> <mkdir dir="${test.classes.dest.dir}"/>
<javac <javac
...@@ -918,7 +915,7 @@ ...@@ -918,7 +915,7 @@
<!-- Call jar task, can't do this is as a 'depends' call of this target because <!-- Call jar task, can't do this is as a 'depends' call of this target because
of the way class loading works for jspc calls. of the way class loading works for jspc calls.
--> -->
<antcall target="jar"> <antcall target="wildfire">
<param name="no.jspc" value="true"/> <param name="no.jspc" value="true"/>
<param name="wildfireHome.no.update" value="true"/> <param name="wildfireHome.no.update" value="true"/>
</antcall> </antcall>
...@@ -1257,7 +1254,7 @@ ...@@ -1257,7 +1254,7 @@
<delete file="${mac.dmg.file}" /> <delete file="${mac.dmg.file}" />
</target> </target>
<target name="mac.prepare" depends="mac.delete,jar"> <target name="mac.prepare" depends="mac.delete,wildfire">
<unzip src="${basedir}/build/osx/template.dmg.zip" dest="${basedir}/build/osx/" /> <unzip src="${basedir}/build/osx/template.dmg.zip" dest="${basedir}/build/osx/" />
<copy file="${mac.dmg.template}" tofile="${basedir}/tmp.dmg" /> <copy file="${mac.dmg.template}" tofile="${basedir}/tmp.dmg" />
<mkdir dir="${mac.dmg.dir}" /> <mkdir dir="${mac.dmg.dir}" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment