Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 45886 invoked from network); 23 Aug 2006 01:55:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Aug 2006 01:55:03 -0000 Received: (qmail 85680 invoked by uid 500); 23 Aug 2006 01:55:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85558 invoked by uid 500); 23 Aug 2006 01:55:02 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 85547 invoked by uid 99); 23 Aug 2006 01:55:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 18:55:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 18:55:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 14E211A981D; Tue, 22 Aug 2006 18:54:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433827 - in /geronimo/trunk: BUILDING.txt bootstrap bootstrap.bat bootstrap.xml Date: Wed, 23 Aug 2006 01:54:40 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060823015441.14E211A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Tue Aug 22 18:54:39 2006 New Revision: 433827 URL: http://svn.apache.org/viewvc?rev=433827&view=rev Log: Changed the bootstrapping to be handled by Ant for cross platform compatibility Added: geronimo/trunk/bootstrap.bat (with props) geronimo/trunk/bootstrap.xml (with props) Modified: geronimo/trunk/BUILDING.txt geronimo/trunk/bootstrap Modified: geronimo/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/geronimo/trunk/BUILDING.txt?rev=433827&r1=433826&r2=433827&view=diff ============================================================================== --- geronimo/trunk/BUILDING.txt (original) +++ geronimo/trunk/BUILDING.txt Tue Aug 22 18:54:39 2006 @@ -6,6 +6,7 @@ * J2SE SDK 1.4.2+ (http://java.sun.com/j2se/1.4.2) * Maven 2.0.4+ (http://maven.apache.org) + * Ant 1.6.5+ (http://ant.apache.org) - Used only to bootstrap NOTE: If you use JDK 1.5 you may run into unexpected errors, so stick to 1.4. @@ -21,11 +22,11 @@ clean your local Maven 2 repository, download some sources and build them and kick off the Geronimo build. +You will need Ant installed and available in the search path of your shell. + To start the bootstrap build simply: ./bootstrap - -NOTE: Windows users will need Cygwin to execute this script. The end result will be a set of functional distributions in m2-assemblies/*/target which you can unpack and startup, as in: Modified: geronimo/trunk/bootstrap URL: http://svn.apache.org/viewvc/geronimo/trunk/bootstrap?rev=433827&r1=433826&r2=433827&view=diff ============================================================================== --- geronimo/trunk/bootstrap (original) +++ geronimo/trunk/bootstrap Tue Aug 22 18:54:39 2006 @@ -1,140 +1,23 @@ #!/bin/sh ## -## $Id$ +## $Rev$ $Date$ ## PROGNAME=`basename "$0"` DIRNAME=`dirname "$0"` -warn() { - echo "${PROGNAME}: $*" -} +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# Translate PWD into a Windows path for better compatibility +if $cygwin ; then + PWD=`cygpath --windows $PWD` +fi -die() { - warn "$*" - exit 1 -} - -now() { - date +'%H:%M:%S %Z %Y' -} - -begin() { - warn "Starting bootstrap build..." -} - -abort() { - die "Aborted ($startdate to `now`)" -} - -complete() { - if [ "$1" == "0" ]; then - warn "Completed ($startdate to `now`)" - else - die "Failed ($startdate to `now`)" - fi -} - -clean() { - echo "Cleaning..." - - if [ "x$BOOTSTRAP_NOCLEAN_REPO" = "x" ]; then - echo "Deep cleaning ~/.m2/repository" - - rm -rf ~/.m2/repository - else - echo "Shallow cleaning ~/.m2/repository/org/apache/geronimo" - - rm -rf ~/.m2/repository/org/apache/geronimo/modules - rm -rf ~/.m2/repository/org/apache/geronimo/configs - rm -rf ~/.m2/repository/org/apache/geronimo/applications - rm -rf ~/.m2/repository/org/apache/geronimo/assemblies - rm -rf ~/.m2/repository/org/apache/geronimo/plugins - fi - - rm -rf "$DIRNAME/thirdparty" - - for x in `find "$DIRNAME" -name target -type d`; do - rm -rf "$x" - done - - mvn clean -} - -stage() { - echo "Starting stage: $1" - - mvn -Dstage=$1 - - if [ "$?" != "0" ]; then - die "Bootstrap failed in stage $1" - fi -} - -specs() { - echo "Building Specs..." - - ( - mkdir -p "$DIRNAME/thirdparty" - cd "$DIRNAME/thirdparty" - - svn co http://svn.apache.org/repos/asf/geronimo/specs/trunk specs - ( - cd specs - mvn install - - if [ "$?" != "0" ]; then - die "Bootstrap failed building Specs" - fi - ) - ) -} - -openejb2() { - echo "Building OpenEJB2..." - - ( - mkdir -p "$DIRNAME/thirdparty" - cd "$DIRNAME/thirdparty" - - svn co http://svn.codehaus.org/openejb/trunk/openejb2 - ( - cd openejb2 - mvn -Dmaven.test.skip=true install - - if [ "$?" != "0" ]; then - die "Bootstrap failed building OpenEJB" - fi - ) - ) -} - -minimal() { - BOOTSTRAP_NOCLEAN_REPO=true - - begin && ( - clean - mvn - ) && complete $? -} - -main() { - startdate=`now` - - trap abort STOP KILL INT ABRT - - if [ "x$1" != "x" ]; then - $* - else - begin && ( - clean - specs && \ - stage "bootstrap" && \ - openejb2 && \ - stage "assemble" - ) && complete $? - fi -} - -main "$@" | 2>&1 tee bootstrap.log +ant $BUILD_OPTIONS -f bootstrap.xml "$@" Added: geronimo/trunk/bootstrap.bat URL: http://svn.apache.org/viewvc/geronimo/trunk/bootstrap.bat?rev=433827&view=auto ============================================================================== --- geronimo/trunk/bootstrap.bat (added) +++ geronimo/trunk/bootstrap.bat Tue Aug 22 18:54:39 2006 @@ -0,0 +1,21 @@ +@echo off +rem +rem $Rev$ $Date$ +rem + +if not "%ECHO%" == "" echo %ECHO% + +setlocal +set DIRNAME=%~dp0% +set PROGNAME=%~nx0% +set ARGS=%* + +ant %BUILD_OPTIONS% -f bootstrap.xml %ARGS% + +:END + +endlocal + +if not "%PAUSE%" == "" pause + +:END_NO_PAUSE Propchange: geronimo/trunk/bootstrap.bat ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: geronimo/trunk/bootstrap.bat ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/trunk/bootstrap.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/bootstrap.xml?rev=433827&view=auto ============================================================================== --- geronimo/trunk/bootstrap.xml (added) +++ geronimo/trunk/bootstrap.xml Tue Aug 22 18:54:39 2006 @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Starting bootstrap build... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cleaning... + + + + + + Cleaning (minimal)... + + + + + + + + + + + + + + Cleaning (full)... + + + + + + + + + + + Building Specs... + + + + + Building OpenEJB2... + + + + Propchange: geronimo/trunk/bootstrap.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/trunk/bootstrap.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/trunk/bootstrap.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml