[jboss-cvs] JBossAS SVN: r78793 - in projects/aop/trunk: build and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2008-09-23 15:09:56 -0400 (Tue, 23 Sep 2008)
New Revision: 78793

Modified:
   projects/aop/trunk/aop/pom.xml
   projects/aop/trunk/build/build.xml
Log:
Improve handling of jrockit.home

Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml	2008-09-23 16:38:17 UTC (rev 78792)
+++ projects/aop/trunk/aop/pom.xml	2008-09-23 19:09:56 UTC (rev 78793)
@@ -277,7 +277,7 @@
       <id>jrockit-build</id>
       <activation>
         <property>
-          <name>JROCKIT_HOME</name>
+          <name>jrockit.home</name>
         </property>
       </activation>
       <build>
@@ -295,10 +295,10 @@
                 <phase>compile</phase>
                 <configuration>
                   <tasks>
-                    <echo message="${JROCKIT_HOME}"/>
+                    <echo message="jrockit.home=${jrockit.home}"/>
                     <!-- in older versions of jrockit the weaving stuff lives in managementapi.jar, in newer in management-agent.jar -->
-                    <available file="${JROCKIT_HOME}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar"/>
-                    <available file="${JROCKIT_HOME}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar"/>
+                    <available file="${jrockit.home}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar"/>
+                    <available file="${jrockit.home}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar"/>
                     <condition property="JROCKIT_API_AVAILABLE" value="${OLD_JROCKIT}">
                       <and>
                         <isset property="OLD_JROCKIT"/>
@@ -317,7 +317,7 @@
                     </condition>
                     <path id="javac.jrockit.classpath">
                       <path refid="maven.compile.classpath"/>
-                      <path path="${JROCKIT_HOME}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
+                      <path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
                     </path>
     
                     <property name="build.compiler" value="extJavac"/>

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-09-23 16:38:17 UTC (rev 78792)
+++ projects/aop/trunk/build/build.xml	2008-09-23 19:09:56 UTC (rev 78793)
@@ -40,6 +40,7 @@
    -->
 
   <target name="init" unless="init.disable" depends="_buildmagic:init">
+    <property file="local.properties"/>
   </target>
 
 
@@ -269,7 +270,7 @@
   <target name="main" depends="most"
 	  description="Executes the default target (most)."/>
 
-  <target name="most" depends="createthirdparty, maven-build-install, modules-most, install"
+  <target name="most" depends="init, createthirdparty, maven-build-install, modules-most, install"
 	  description="Executes all modules and builds most everything."/>
 
   <target name="help" depends="_buildmagic:help:build"
@@ -325,12 +326,13 @@
    </target>
 
    <!-- Run the maven part of the build -->
-   <target name="maven-build-install" depends="createthirdparty">
+   <target name="maven-build-install" depends="createthirdparty, set-jrockit">
      
       <property name="maven.dir" value="${basedir}/../tools/maven"/>
       <property name="build.maven.opts" value=""/>
+      <property name="jrockit.build.param" value=""/>
       
-      <maven basedir="${basedir}/../" options="${build.maven.opts}" goal="install"/>
+      <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="install"/>
       
       <fail message="Unable to build maven modules.  See maven output for details.">
         <condition>
@@ -341,6 +343,10 @@
       </fail>
       
    </target>
+  
+   <target name="set-jrockit" if="jrockit.home">
+     <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
+   </target>
 
    <!-- Clean the maven part of the build -->
    <target name="maven-build-clean" depends="createthirdparty">