Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 37609 invoked from network); 4 Mar 2004 07:33:08 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 4 Mar 2004 07:33:08 -0000 Received: (qmail 82358 invoked by uid 500); 4 Mar 2004 07:32:45 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 82313 invoked by uid 500); 4 Mar 2004 07:32:45 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 82302 invoked by uid 500); 4 Mar 2004 07:32:45 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 82298 invoked from network); 4 Mar 2004 07:32:45 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 4 Mar 2004 07:32:45 -0000 Received: (qmail 37583 invoked by uid 1746); 4 Mar 2004 07:33:07 -0000 Date: 4 Mar 2004 07:33:07 -0000 Message-ID: <20040304073307.37582.qmail@minotaur.apache.org> From: antonio@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1 build.sh X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N antonio 2004/03/03 23:33:07 Modified: . build.sh Log: Don't copy endorsed jars to lib/tools Revision Changes Path 1.4 +19 -11 cocoon-2.1/build.sh Index: build.sh =================================================================== RCS file: /home/cvs//cocoon-2.1/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.sh 30 Apr 2003 14:11:56 -0000 1.3 +++ build.sh 4 Mar 2004 07:33:07 -0000 1.4 @@ -1,26 +1,34 @@ #!/bin/sh -echo -echo "Apache Cocoon Build System" -echo "--------------------------" - -cp ./lib/*/xalan*.jar ./tools/lib -cp ./lib/*/xerces*.jar ./tools/lib -cp ./lib/*/xml-api*.jar ./tools/lib - chmod u+x ./tools/bin/antRun chmod u+x ./tools/bin/ant +# ----- Verify and Set Required Environment Variables ------------------------- + +if [ "$TERM" = "cygwin" ] ; then + S=';' +else + S=':' +fi + +# ----- Set Up The Runtime Classpath ------------------------------------------ + +OLD_ANT_HOME="$ANT_HOME" unset ANT_HOME CP=$CLASSPATH export CP unset CLASSPATH -ANT_OPTS=-Djava.endorsed.dirs=lib/endorsed -export ANT_OPTS +CLASSPATH="`echo ./lib/endorsed/*.jar | tr ' ' $S`" +export CLASSPATH + +echo Using classpath: \"$CLASSPATH\" +"$PWD/tools/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs $@ -$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@ +unset CLASSPATH CLASSPATH=$CP export CLASSPATH +ANT_HOME=OLD_ANT_HOME +export ANT_HOME