Removed ant so that build file works more consistently (including in source release). (SMACK-197)

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7103 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Matt Tucker 2007-02-14 01:56:49 +00:00 committed by matt
parent 76087c3928
commit 858b84d912
5 changed files with 8 additions and 96 deletions

View File

@ -74,8 +74,7 @@ compile and make changes to the Smack source code.
<a href="http://www.jivesoftware.org/smack/">
http://www.jivesoftware.org/smack/</a>. The Smack build process is based on Ant. Visit the
<a href="http://jakarta.apache.org/ant/index.html">Ant website</a>
for more information. There is no need to download and install Ant - a version of it is included
in this distribution.
for more information and downloads.
<p>
This documentation is divided into two sections:
<ol>
@ -142,6 +141,12 @@ possible, instructions are provided for both Unix/Linux and Windows users.
</ul>
</ul>
<b><a name="antSetup">Configure Ant</a></b>
<ul>
Download the Ant build tool from the <a href="http://ant.apache.org">Ant website</a>. Follow
the setup instructions for your operating system.
</ul>
<p><b><a name="checkout">Test the Build Script</a></b><p>
<ul>
Navigate into the subdirectory of this distribution named "build" via the command-line.<p>

View File

@ -1,42 +0,0 @@
#! /bin/sh
# //--------------------------------------------------------------------------//
# // $RCSfile$
# // $Revision$
# // $Date$
# //
# // Standard Jive Software ant file. Do not change this file. If you do,
# // you will have seven years of bad luck and bad builds.
# //--------------------------------------------------------------------------//
# //--------------------------------------------------------------------------//
# // Uncomment the following lines if you wish to set JAVA_HOME in this script
# //--------------------------------------------------------------------------//
# JAVA_HOME=
# EXPORT JAVA_HOME
# //--------------------------------------------------------------------------//
# // Check for the JAVA_HOME environment variable //
# //--------------------------------------------------------------------------//
if [ "$JAVA_HOME" != "" ] ; then
# //----------------------------------------------------------------------//
# // Create Ant's classpath //
# //----------------------------------------------------------------------//
CP=$JAVA_HOME/lib/tools.jar:./ant.jar:./junit.jar
# //----------------------------------------------------------------------//
# // Run ant //
# //----------------------------------------------------------------------//
$JAVA_HOME/bin/java -classpath $CP -Dant.home=. org.apache.tools.ant.Main $@
else
# //----------------------------------------------------------------------//
# // No JAVA_HOME error message //
# //----------------------------------------------------------------------//
echo "Jive Forums Build Error:"
echo ""
echo "The JAVA_HOME environment variable is not set. JAVA_HOME should point"
echo "to your java directory, ie: /usr/local/bin/jdk1.3. You can set"
echo "this via the command line like so:"
echo " export JAVA_HOME=/usr/local/bin/jdk1.3"
fi

View File

@ -1,51 +0,0 @@
@echo off
rem //------------------------------------------------------------------------//
rem // $RCSfile$
rem // $Revision$
rem // $Date$
rem //
rem // Standard Jive Software ant.bat file. Do not change this file. If you do,
rem // you will have seven years of bad luck and bad builds.
rem //------------------------------------------------------------------------//
rem //------------------------------------------------------------------------//
rem // Uncomment the following if you wish to set JAVA_HOME in this bat file:
rem //------------------------------------------------------------------------//
rem SET JAVA_HOME=
rem //------------------------------------------------------------------------//
rem // Check for the JAVA_HOME environment variable
rem //------------------------------------------------------------------------//
if "%JAVA_HOME%" == "" goto noJavaHome
rem //------------------------------------------------------------------------//
rem // Make the correct classpath (should include the java jars and the
rem // Ant jars)
rem //------------------------------------------------------------------------//
SET CP="%JAVA_HOME%\lib\tools.jar;.\ant.jar;.\junit.jar"
rem //------------------------------------------------------------------------//
rem // Run Ant
rem // Note for Win 98/95 users: You need to change "%*" in the following
rem // line to be "%1 %2 %3 %4 %5 %6 %7 %8 %9"
rem //------------------------------------------------------------------------//
"%JAVA_HOME%\bin\java" -Xms32m -Xmx128m -classpath %CP% -Dant.home=. org.apache.tools.ant.Main %*
goto end
rem //------------------------------------------------------------------------//
rem // Error message for missing JAVA_HOME
rem //------------------------------------------------------------------------//
:noJavaHome
echo.
echo Jive Forums Build Error:
echo.
echo The JAVA_HOME environment variable is not set. JAVA_HOME should point to
echo your java directory, ie: c:\jdk1.3.1. You can set this via the command
echo line like so:
echo SET JAVA_HOME=c:\jdk1.3
echo.
goto end
:end

Binary file not shown.

View File

@ -28,7 +28,7 @@
<property name="version.major" value="3" />
<property name="version.minor" value="0" />
<property name="version.revision" value="0" />
<property name="version.extra" value="beta1" />
<property name="version.extra" value="beta2" />
<if>
<equals arg1="${version.extra}" arg2=""/>