jvanzyl 2004/01/10 00:37:09
Modified: maven-core bootstrap.plugins bootstrap.sh
maven-core/src/java/org/apache/maven/jelly
MavenJellyContext.java
maven-core/src/java/org/apache/maven/jelly/tags/jeez
MavenJeezTagLibrary.java
Log:
o bootstrap should work for others now, no guarantees.
Revision Changes Path
1.2 +1 -4 maven-components/maven-core/bootstrap.plugins
Index: bootstrap.plugins
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.plugins,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap.plugins 8 Jan 2004 04:29:09 -0000 1.1
+++ bootstrap.plugins 10 Jan 2004 08:37:09 -0000 1.2
@@ -2,9 +2,6 @@
java
license
plugin
-test
+surefire
touchstone
touchstone-partner
-jdepend
-idea
-file-activity
1.3 +20 -1 maven-components/maven-core/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bootstrap.sh 8 Jan 2004 04:41:23 -0000 1.2
+++ bootstrap.sh 10 Jan 2004 08:37:09 -0000 1.3
@@ -27,6 +27,20 @@
# Build the plugins
+# We need to build and install the surefire-runner first.
+
+(
+ cd ../../maven-plugins/surefire/src/surefire-runner
+
+ mboot --leave-boot-files
+
+ repo=`cat bootstrap.repo`
+
+ cp target/*.jar $repo/maven/jars
+
+ rm bootstrap.*
+)
+
for plugin in `cat bootstrap.plugins`
do
@@ -34,7 +48,7 @@
echo " Building ${plugin} plugin ... "
echo "-----------------------------------------------------------------------"
- mboot -d ../../maven-plugins/${plugin}
+ mboot --dir ../../maven-plugins/${plugin}
cp ../../maven-plugins/${plugin}/target/maven-${plugin}-plugin*.jar
${DIST}/plugins
@@ -50,3 +64,8 @@
cp -r ${DIST}/bin ${MAVEN_HOME}
cp -r ${DIST}/lib ${MAVEN_HOME}
cp -r ${DIST}/plugins ${MAVEN_HOME}
+
+rm -f bootstrap.classpath > /dev/null 2>&1
+rm -f bootstrap.libs > /dev/null 2>&1
+rm -f bootstrap.resources > /dev/null 2>&1
+rm -f bootstrap.repo > /dev/null 2>&1
1.2 +4 -1
maven-components/maven-core/src/java/org/apache/maven/jelly/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/MavenJellyContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenJellyContext.java 8 Jan 2004 04:29:13 -0000 1.1
+++ MavenJellyContext.java 10 Jan 2004 08:37:09 -0000 1.2
@@ -63,6 +63,7 @@
import org.apache.maven.grant.GrantProject;
import org.apache.maven.jelly.tags.jeez.MavenJeezTagLibrary;
import org.apache.maven.jelly.tags.maven.MavenTagLibrary;
+import org.apache.maven.jelly.tags.ant.AntTagLibrary;
import org.apache.maven.project.Project;
import org.apache.maven.werkz.WerkzProject;
@@ -134,6 +135,8 @@
registerTagLibrary( "", jeezTagLib );
registerTagLibrary( "jelly:maven", new MavenTagLibrary() );
+
+ registerTagLibrary( "jelly:ant", new AntTagLibrary() );
}
/** Register a new tag library.
1.2 +2 -1
maven-components/maven-core/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java
Index: MavenJeezTagLibrary.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenJeezTagLibrary.java 8 Jan 2004 22:20:48 -0000 1.1
+++ MavenJeezTagLibrary.java 10 Jan 2004 08:37:09 -0000 1.2
@@ -57,6 +57,7 @@
}
TagScript script = werkzTagLib.createTagScript( name, attrs );
+
if ( script == null )
{
script = antTagLib.createCustomTagScript( name, attrs );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
