svn commit: r933809 - /ofbiz/trunk/macros.xml

[doogie-3]

Author: doogie
Date: Tue Apr 13 23:01:36 2010
New Revision: 933809

URL: http://svn.apache.org/viewvc?rev=933809&view=rev
Log:
Fix groovy.class.path, and define groovyc taskdef and default-groovyc
presetdef.

Modified:
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=933809&r1=933808&r2=933809&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Tue Apr 13 23:01:36 2010
@@ -42,8 +42,10 @@ under the License.
  <patternset id="src.exc.set"/>
 
  <path id="groovy.class.path">
-  <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/>
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/commons/commons-cli-1.0.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-1.7-rc-2.jar"/>
  </path>
  <path id="ant.lib.class.path">
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
@@ -77,6 +79,17 @@ under the License.
   </javadoc>
  </presetdef>
 
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.class.path"/>
+
+ <presetdef name="default-groovyc">
+  <groovyc destdir="${build.dir}/classes" srcdir="${src.dir}">
+   <classpath>
+    <path refid="local.class.path"/>
+    <pathelement path="${build.dir}/classes"/>
+   </classpath>
+  </groovyc>
+ </presetdef>
+
  <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <macrodef name="ofbiz-javacc">