User: user57
Date: 01/07/30 22:32:27
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o compiling required ant extentions for testsuite module inside of
bootstrap target.
o moved ant extentions sources to src/tasks.
Revision Changes Path
No revision
No revision
1.1.2.5 +23 -4 jbosstest/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/build.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- build.xml 2001/07/31 02:29:12 1.1.2.4
+++ build.xml 2001/07/31 05:32:27 1.1.2.5
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.4 2001/07/31 02:29:12 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.5 2001/07/31 05:32:27 user57 Exp $ -->
<project default="main">
@@ -97,6 +97,28 @@
<target name="bootstrap"
depends="bootstrap-init"
unless="bootstraped-already">
+
+ <mkdir dir="${local.task.output}"/>
+ <javac destdir="${local.task.output}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="true"
+ includeJavaRuntime="true"
+ failonerror="${javac.fail.onerror}">
+ <src path="${local.task.source}"/>
+ <include name="**"/>
+ </javac>
+ <jar jarfile="${local.task.jar}">
+ <fileset dir="${local.task.output}">
+ <exclude name="*.jar"/>
+ <include name="**"/>
+ </fileset>
+ </jar>
+
<property name="bootstraped-already" value="true"/>
</target>
@@ -215,9 +237,6 @@
<classpath refid="javac.classpath"/>
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
-
- <!-- for now don't compile ant stuff -->
- <exclude name="org/jboss/ant/taskdefs/**"/>
</javac>
</target>
1.1.2.5 +11 -8 jbosstest/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/Attic/config.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- config.xml 2001/07/31 05:06:00 1.1.2.4
+++ config.xml 2001/07/31 05:32:27 1.1.2.5
@@ -7,7 +7,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.4 2001/07/31 05:06:00 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.5 2001/07/31 05:32:27 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -23,13 +23,12 @@
<!-- Tool Setup -->
<!-- ================================================================== -->
- <!-- Local Tasks (should move to a bootstrap) -->
- <property name="local.tasks.root" value="${module.root}"/>
- <property name="local.tasks.lib" value="${local.tasks.root}/lib"/>
+ <!-- Bootstrap Local Tasks -->
+ <property name="local.task.source" value="${module.source}/tasks"/>
+ <property name="local.task.output" value="${module.output}/tasks"/>
+ <property name="local.task.jar" value="${local.task.output}/tasks.jar"/>
<path id="local.task.classpath">
- <fileset dir="${local.tasks.lib}">
- <include name="**/*.jar"/>
- </fileset>
+ <pathelement path="${local.task.jar}"/>
</path>
@@ -147,7 +146,7 @@
<property name="jboss.naming.root" value="${project.root}/naming/output"/>
<property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
<path id="jboss.naming.classpath">
- <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
+ <pathelement path="${jboss.naming.lib}/jnp.jar"/>
</path>
<!-- Server -->
@@ -169,6 +168,7 @@
<property name="jboss.security.lib" value="${jboss.security.root}/lib"/>
<path id="jboss.security.classpath">
<pathelement path="${jboss.security.lib}/jbosssx.jar"/>
+ <pathelement path="${jboss.security.lib}/jbosssx-client.jar"/>
<pathelement path="${jboss.security.lib}/jboss-jaas.jar"/>
</path>
@@ -177,6 +177,7 @@
<property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
<path id="jboss.messaging.classpath">
<pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
+ <pathelement path="${jboss.messaging.lib}/jbossmq-client.jar"/>
</path>
<!-- The combined depedant module classpath -->
@@ -275,4 +276,6 @@
<!-- Executed at the end of the 'init' target -->
<target name="init-hook">
<!-- Execute custom initialization tasks here. -->
+ <taskdef name="catfiles" classpathref="local.task.classpath"
+ classname="org.jboss.ant.taskdefs.ConcatenateFiles"/>
</target>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
