Return-Path: 
 <scm-return-14528-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 32484 invoked from network); 27 Aug 2006 03:25:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 27 Aug 2006 03:25:41 -0000
Received: (qmail 33608 invoked by uid 500); 27 Aug 2006 03:25:41 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 33579 invoked by uid 500); 27 Aug 2006 03:25:41 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 33567 invoked by uid 99); 27 Aug 2006 03:25:41 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Aug 2006 20:25:41 -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; Sat, 26 Aug 2006 20:25:40 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 372A81A981A; Sat, 26 Aug 2006 20:25:19 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r437291 - in /geronimo/server/trunk: bootstrap
 bootstrap.bat
 bootstrap.xml
Date: Sun, 27 Aug 2006 03:25:18 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060827032519.372A81A981A@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: Sat Aug 26 20:25:18 2006
New Revision: 437291

URL: http://svn.apache.org/viewvc?rev=437291&view=rev
Log:
Changed bootstrap to put external stuff into target/external instead of thirdparty
Reduced ant output using -emacs and logger

Modified:
    geronimo/server/trunk/bootstrap
    geronimo/server/trunk/bootstrap.bat
    geronimo/server/trunk/bootstrap.xml

Modified: geronimo/server/trunk/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/bootstrap?rev=437291&r1=437290&r2=437291&view=diff
==============================================================================
--- geronimo/server/trunk/bootstrap (original)
+++ geronimo/server/trunk/bootstrap Sat Aug 26 20:25:18 2006
@@ -19,5 +19,5 @@
     PWD=`cygpath --windows $PWD`
 fi
 
-ant $BUILD_OPTIONS -f bootstrap.xml "$@"
+ant $BUILD_OPTIONS -emacs -logger org.apache.tools.ant.NoBannerLogger -f bootstrap.xml "$@"
 

Modified: geronimo/server/trunk/bootstrap.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/bootstrap.bat?rev=437291&r1=437290&r2=437291&view=diff
==============================================================================
--- geronimo/server/trunk/bootstrap.bat (original)
+++ geronimo/server/trunk/bootstrap.bat Sat Aug 26 20:25:18 2006
@@ -10,7 +10,7 @@
 set PROGNAME=%~nx0%
 set ARGS=%*
 
-ant %BUILD_OPTIONS% -f bootstrap.xml %ARGS%
+ant %BUILD_OPTIONS% -emacs -logger org.apache.tools.ant.NoBannerLogger -f bootstrap.xml %ARGS%
 
 :END
 

Modified: geronimo/server/trunk/bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/bootstrap.xml?rev=437291&r1=437290&r2=437291&view=diff
==============================================================================
--- geronimo/server/trunk/bootstrap.xml (original)
+++ geronimo/server/trunk/bootstrap.xml Sat Aug 26 20:25:18 2006
@@ -14,19 +14,19 @@
         </sequential>
     </macrodef>
     
-    <macrodef name="build-thirdparty">
+    <macrodef name="build-external">
         <attribute name="url"/>
         <attribute name="name"/>
         <sequential>
-            <mkdir dir="${basedir}/thirdparty"/>
+            <mkdir dir="${basedir}/target/external"/>
             
-            <exec executable="svn" dir="${basedir}/thirdparty">
+            <exec executable="svn" dir="${basedir}/target/external">
                 <arg value="co"/>
                 <arg value="@{url}"/>
                 <arg value="@{name}"/>
             </exec>
             
-            <mvn goal="install" dir="${basedir}/thirdparty/@{name}"/>
+            <mvn goal="install" dir="${basedir}/target/external/@{name}"/>
         </sequential>
     </macrodef>
     
@@ -42,6 +42,7 @@
     
     <target name="init" depends="init:discover, init:windows, init:defaults">
         <record name="${basedir}/bootstrap.log"/>
+        
         <echo>Starting bootstrap build...</echo>
     </target>
     
@@ -88,14 +89,12 @@
     <!-- ======== -->
     
     <target name="clean" depends="clean:init, clean:minimal, clean:full">
-        <delete dir="${basedir}/thirdparty"/>
+        <delete dir="${basedir}/target"/>
         
         <mvn goal="clean"/>
     </target>
     
     <target name="clean:init" depends="init">
-        <echo>Cleaning...</echo>
-        
         <mkdir dir="${user.home}/.m2/repository"/>
     </target>
     
@@ -120,18 +119,18 @@
     </target>
     
     
-    <!-- ========== -->
-    <!-- Thirdparty -->
-    <!-- ========== -->
+    <!-- ========= -->
+    <!-- Externals -->
+    <!-- ========= -->
     
     <target name="specs" depends="init">
         <echo>Building Specs...</echo>
-        <build-thirdparty url="http://svn.apache.org/repos/asf/geronimo/specs/trunk" name="specs"/>
+        <build-external url="http://svn.apache.org/repos/asf/geronimo/specs/trunk" name="specs"/>
     </target>
     
     <target name="openejb2" depends="init">
         <echo>Building OpenEJB2...</echo>
-        <build-thirdparty url="http://svn.codehaus.org/openejb/trunk/openejb2" name="openejb2"/>
+        <build-external url="http://svn.codehaus.org/openejb/trunk/openejb2" name="openejb2"/>
     </target>
 
 </project>