[jboss-cvs] jboss-aop ...

[Kabir K. <kk...@jb...>]

  User: kkhan   
  Date: 06/07/10 15:07:48

  Modified:    jboss-aop  build-tests-jdk14.xml
  Log:
  Add jvm attribute to aopc task
  
  Revision  Changes    Path
  1.2       +11 -11    jboss-aop/build-tests-jdk14.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build-tests-jdk14.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk14.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- build-tests-jdk14.xml	10 Jul 2006 15:00:22 -0000	1.1
  +++ build-tests-jdk14.xml	10 Jul 2006 19:07:48 -0000	1.2
  @@ -14,7 +14,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build-tests-jdk14.xml,v 1.1 2006/07/10 15:00:22 kkhan Exp $ -->
  +<!-- $Id: build-tests-jdk14.xml,v 1.2 2006/07/10 19:07:48 kkhan Exp $ -->
   
   <project default="main" name="JBoss/AOP">
   
  @@ -228,10 +228,9 @@
      <!-- ================================================================== -->
   
      <!-- Clean up all build output -->
  -   <target name="clean"
  -      description="Cleans up most generated files."
  -      depends="_buildmagic:clean">
  +   <target name="clean" description="Cleans up most generated files." depends="init">
         <delete dir="${build.tests.classes}"/>
  +      <delete dir="${build.tests.retro}"/>
      </target>
   
      <target name="clean-tests" depends="init">
  @@ -267,19 +266,19 @@
      <!-- ==================================================================================== -->
      <target name="tests" depends="main">
   
  -      <delete dir="${build.tests.classes}"/>
  +      <antcall target="clean"/>
         <antcall target="bootclasspath-genadvisor-tests" inheritRefs="true"/>
         <antcall target="bootclasspath-tests" inheritRefs="true"/>
         <antcall target="system-classloader-test" inheritRefs="true"/>
         <antcall target="not-woven-tests" inheritRefs="true"/>
   
  -      <delete dir="${build.tests.classes}"/>
  +      <antcall target="clean"/>
         <antcall target="precompiled-tests" inheritRefs="true"/>
   
  -      <delete dir="${build.tests.classes}"/>
  +      <antcall target="clean"/>
         <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/>
   
  -      <delete dir="${build.tests.classes}"/>
  +      <antcall target="clean"/>
         <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
      </target>
   
  @@ -474,6 +473,7 @@
            <jvmarg value="${jboss.aop.class.path}"/>
            <jvmarg value="${jboss.aop.path}"/>
            <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
  +         <sysproperty key="jboss.aop.debug.classes" value="true"/>
         	<formatter type="plain" extension="-${caller}.txt"/>
            <formatter type="xml" extension="-${caller}.xml"/>
            <classpath>
  @@ -738,7 +738,7 @@
         <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
   
         <!-- aopc -->
  -      <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath">
  +      <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath" jvm="${java14}">
            <classpath refid="aop.task.classpath"/>
            <classpath refid="test.classpath"/>
            <classpath path="${build.tests.retro}"/>
  @@ -871,7 +871,7 @@
      	<echo message="aoppath=${aoppath}"/>
   
      	<!-- aopc -->
  -      <aopc compilerclasspathref="aop.task.classpath">
  +      <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}">
            <classpath refid="aop.task.classpath"/>
            <classpath refid="test.classpath"/>
            <classpath path="${build.tests.retro}"/>
  @@ -979,7 +979,7 @@
         <property name="testcase" value="org.jboss.test.aop.${test}.${case}"/>
   
   
  -      <aopc compilerclasspathref="aop.task.classpath">
  +      <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}">
            <classpath refid="aop.task.classpath"/>
            <classpath refid="test.classpath"/>
            <classpath path="${build.tests.retro}"/>