diff --git a/proposal/myrmidon/build.sh b/proposal/myrmidon/build.sh deleted file mode 100644 index aff1fe211..000000000 --- a/proposal/myrmidon/build.sh +++ /dev/null @@ -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 $@ diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index c21d07121..2c4e1df26 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -391,7 +391,7 @@ Legal: - + @@ -411,7 +411,9 @@ Legal: - + + + diff --git a/proposal/myrmidon/tools/bin/ant b/proposal/myrmidon/tools/bin/ant deleted file mode 100644 index 981f08427..000000000 --- a/proposal/myrmidon/tools/bin/ant +++ /dev/null @@ -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 $@ - diff --git a/proposal/myrmidon/tools/bin/ant.bat b/proposal/myrmidon/tools/bin/ant.bat deleted file mode 100755 index 597475a9d..000000000 --- a/proposal/myrmidon/tools/bin/ant.bat +++ /dev/null @@ -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= - diff --git a/proposal/myrmidon/tools/bin/antRun b/proposal/myrmidon/tools/bin/antRun deleted file mode 100644 index 4c38b1803..000000000 --- a/proposal/myrmidon/tools/bin/antRun +++ /dev/null @@ -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 diff --git a/proposal/myrmidon/tools/bin/antRun.bat b/proposal/myrmidon/tools/bin/antRun.bat deleted file mode 100755 index 08e03519c..000000000 --- a/proposal/myrmidon/tools/bin/antRun.bat +++ /dev/null @@ -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 - diff --git a/proposal/myrmidon/tools/bin/lcp.bat b/proposal/myrmidon/tools/bin/lcp.bat deleted file mode 100755 index 8feb0d0fe..000000000 --- a/proposal/myrmidon/tools/bin/lcp.bat +++ /dev/null @@ -1,2 +0,0 @@ -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 - diff --git a/proposal/myrmidon/tools/lib/ant.jar b/proposal/myrmidon/tools/lib/ant.jar deleted file mode 100644 index 434771752..000000000 Binary files a/proposal/myrmidon/tools/lib/ant.jar and /dev/null differ