Browse Source

Remove tools dir from proposal.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270338 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
72c0f5a385
8 changed files with 4 additions and 134 deletions
  1. +0
    -15
      proposal/myrmidon/build.sh
  2. +4
    -2
      proposal/myrmidon/build.xml
  3. +0
    -57
      proposal/myrmidon/tools/bin/ant
  4. +0
    -36
      proposal/myrmidon/tools/bin/ant.bat
  5. +0
    -13
      proposal/myrmidon/tools/bin/antRun
  6. +0
    -9
      proposal/myrmidon/tools/bin/antRun.bat
  7. +0
    -2
      proposal/myrmidon/tools/bin/lcp.bat
  8. BIN
      proposal/myrmidon/tools/lib/ant.jar

+ 0
- 15
proposal/myrmidon/build.sh View File

@@ -1,15 +0,0 @@
#!/bin/sh

echo
echo "Myrmidon Build System"
echo "---------------------"

export MYRMIDON_HOME=tools

chmod u+x $MYRMIDON_HOME/bin/antRun
chmod u+x $MYRMIDON_HOME/bin/ant

export ANT_HOME=
export CLASSPATH=lib/crimson.jar:lib/jaxp.jar

$MYRMIDON_HOME/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@

+ 4
- 2
proposal/myrmidon/build.xml View File

@@ -391,7 +391,7 @@ Legal:
<mkdir dir="${dist.lib}"/>
<mkdir dir="${dist.ext}"/>

<copy file="tools/lib/ant.jar" tofile="${dist.lib}/ant1-compat.jar" />
<copy file="${lib.dir}/ant.jar" tofile="${dist.lib}/ant1-compat.jar" />
<copy file="${build.lib}/myrmidon-launcher.jar" tofile="${dist.bin}/myrmidon-launcher.jar" />
<copy file="${build.lib}/myrmidon-container.jar" tofile="${dist.bin}/lib/myrmidon-container.jar" />

@@ -411,7 +411,9 @@ Legal:
</copy>

<copy todir="${dist.lib}">
<fileset dir="${lib.dir}"/>
<fileset dir="${lib.dir}">
<exclude name="ant.jar"/>
</fileset>
</copy>

<copy todir="${dist.bin}">


+ 0
- 57
proposal/myrmidon/tools/bin/ant View File

@@ -1,57 +0,0 @@
#! /bin/sh

if [ -f $HOME/.antrc ] ; then
. $HOME/.antrc
fi

if [ "$ANT_HOME" = "" ] ; then
# try to find ANT
if [ -d /opt/ant ] ; then
ANT_HOME=/opt/ant
fi

if [ -d ${HOME}/opt/ant ] ; then
ANT_HOME=${HOME}/opt/ant
fi

## resolve links - $0 may be a link to ant's home
PRG=$0
progname=`basename $0`
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '.*/.*' > /dev/null; then
PRG="$link"
else
PRG="`dirname $PRG`/$link"
fi
done
ANT_HOME=`dirname "$PRG"`/..

fi

# Allow .antrc to specifiy flags to java cmd
if [ "$JAVACMD" = "" ] ; then
JAVACMD=java
fi

LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`

if [ "$CLASSPATH" != "" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$CLASSPATH
fi

if [ "$JAVA_HOME" != "" ] ; then
if test -f $JAVA_HOME/lib/tools.jar ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
fi

if test -f $JAVA_HOME/lib/classes.zip ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
fi
fi

$JAVACMD -classpath $LOCALCLASSPATH -Dant.home=${ANT_HOME} $ANT_OPTS org.apache.tools.ant.Main $@


+ 0
- 36
proposal/myrmidon/tools/bin/ant.bat View File

@@ -1,36 +0,0 @@
@echo off
rem find ANT_HOME
if not "%ANT_HOME%"=="" goto checkJava

rem check for ant in Program Files on system drive
if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
set ANT_HOME=%SystemDrive%\Program Files\ant
goto checkJava

:checkSystemDrive
rem check for ant in root directory of system drive
if not exist "%SystemDrive%\ant" goto noAntHome
set ANT_HOME=%SystemDrive%\ant
goto checkJava

:noAntHome
echo ANT_HOME is not set and ant could not be located. Please set ANT_HOME.
goto end

:checkJava
if "%JAVACMD%" == "" set JAVACMD=java

set LOCALCLASSPATH=
for %%i in (%ANT_HOME%\lib\*.jar) do call %ANT_HOME%\bin\lcp.bat %%i
set LOCALCLASSPATH=%LOCALCLASSPATH%;%CLASSPATH%

if "%JAVA_HOME%" == "" goto runAnt
if exist %JAVA_HOME%\lib\tools.jar call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\tools.jar
if exist %JAVA_HOME%\lib\classes.zip call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\classes.zip

:runAnt
%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9

:end
set LOCALCLASSPATH=


+ 0
- 13
proposal/myrmidon/tools/bin/antRun View File

@@ -1,13 +0,0 @@
#! /bin/sh

# Args: DIR command
cd $1
CMD=$2
shift
shift

if test -f $CMD.sh; then
CMD="sh $CMD.sh"
fi

echo $CMD $@ | sh

+ 0
- 9
proposal/myrmidon/tools/bin/antRun.bat View File

@@ -1,9 +0,0 @@
@echo off

cd %1
set ANT_RUN_CMD=%2
shift
shift

%ANT_RUN_CMD% %1 %2 %3 %4 %5 %6 %7 %8 %9


+ 0
- 2
proposal/myrmidon/tools/bin/lcp.bat View File

@@ -1,2 +0,0 @@
set LOCALCLASSPATH=%LOCALCLASSPATH%;%1


BIN
proposal/myrmidon/tools/lib/ant.jar View File


Loading…
Cancel
Save