mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Building "release" and "installer.install4j" had the wrong build order. First build windows-plugins, then build spark and pack the installer

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12073 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Holger Bergunde
2011-03-08 16:55:52 +00:00
committed by holger.bergunde
parent 68f49397a0
commit 6d4be2fdd1
1 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build/build.xml
View File

@ -325,7 +325,7 @@
<target name="release" depends="jar, windows-plugins"> <target name="release" depends="windows-plugins, jar">
<if> <if>
<equals arg1="${pack200.enabled}" arg2="true"/> <equals arg1="${pack200.enabled}" arg2="true"/>
<then> <then>
@ -363,57 +363,30 @@
<target name="windows-plugins"> <target name="windows-plugins">
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/fastpath/" includes="*/build.xml" /> <fileset dir="./src/plugins/fastpath/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/flashing/" includes="*/build.xml" /> <fileset dir="./src/plugins/flashing/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/google/" includes="*/build.xml" /> <fileset dir="./src/plugins/google/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/jingle/" includes="*/build.xml" /> <fileset dir="./src/plugins/jingle/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/reversi/" includes="*/build.xml" /> <fileset dir="./src/plugins/reversi/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/sip/" includes="*/build.xml" /> <fileset dir="./src/plugins/sip/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/spelling/" includes="*/build.xml" /> <fileset dir="./src/plugins/spelling/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/transferguard/" includes="*/build.xml" /> <fileset dir="./src/plugins/transferguard/" includes="*/build.xml" />
</subant> </subant>
<subant target=""> <subant target="">
<propertyset>
<propertyref prefix="toplevel" />
</propertyset>
<fileset dir="./src/plugins/translator/" includes="*/build.xml" /> <fileset dir="./src/plugins/translator/" includes="*/build.xml" />
</subant> </subant>
</target> </target>
@ -558,7 +531,7 @@
<!-- installers ============================================================================= --> <!-- installers ============================================================================= -->
<target name="installer.install4j" depends="jar, windows-plugins" <target name="installer.install4j" depends="windows-plugins, jar"
description="build Install4J release executable and docs dirs for Windows"> description="build Install4J release executable and docs dirs for Windows">
<condition property="install4j.not.ok" value="true"> <condition property="install4j.not.ok" value="true">