Jason,
I'm not sure if this was intended or not ... but having these thirdparty
items under target results in the source being purged when doing an mvn
clean. This is unfortunate for those of us that are hitting the
failures on the openejb tests. My memory may not be correct but I
thought that prior to this change I could do the following:
- "bootstrap" (with the change to use the jspc 1.4.5-SNAPSHOT to avoid
the jspc problem).
- watch it fail to build openejb due to the test failures.
- run "mvn clean install -Dmaven.test.skip=true"
However, now that openejb is under target the clean deletes the source
and before it attempts to build and the result is that I still don't get
the openejb jar created in my local repo. Now I think I have to do the
following:
- "bootstrap" (with the change to use the jspc 1.4.5-SNAPSHOT to avoid
the jspc problem).
- watch it fail to build openejb due to the test failures.
- cd to target\external\openejb2
- run "mvn -Dmaven.test.skip=true"
- run "mvn clean install"
Am I doing something wrong?
Thanks,
Joe
[EMAIL PROTECTED] wrote:
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>
