Merge branch 'zhangmaike/native-client' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole into zhangmaike/native-client

This commit is contained in:
Michael Jumper
2010-12-05 17:12:03 -08:00

View File

@@ -40,9 +40,7 @@
depends="compile"> depends="compile">
<war destfile="${dist.dir}/guacamole.war" <war destfile="${dist.dir}/guacamole.war"
webxml="${build.dir}/WEB-INF/web.xml"> webxml="${build.dir}/WEB-INF/web.xml">
<fileset dir="${build.dir}"> <fileset dir="${build.dir}"/>
<exclude name="META-INF/**"/>
</fileset>
</war> </war>
</target> </target>
@@ -65,7 +63,7 @@
<delete dir="${tar.src.dir}"/> <delete dir="${tar.src.dir}"/>
<copy todir="${tar.dir}"> <copy todir="${tar.dir}">
<fileset file="${doc.dir}/example/guacamole.xml"/> <fileset file="${doc.dir}/example/guacamole.properties"/>
<fileset file="${doc.dir}/example/user-mapping.xml"/> <fileset file="${doc.dir}/example/user-mapping.xml"/>
<fileset file="${dist.dir}/guacamole.war"/> <fileset file="${dist.dir}/guacamole.war"/>
<fileset file="LICENSE.txt"/> <fileset file="LICENSE.txt"/>