svn commit: r708775 - /ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy

[do...@apache.org]

Author: doogie
Date: Tue Oct 28 21:49:39 2008
New Revision: 708775

URL: http://svn.apache.org/viewvc?rev=708775&view=rev
Log:
Whoops; this didn't work when it was used from a parent build.xml,
and recursed into a sub build.xml.

Modified:
    ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy

Modified: ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy?rev=708775&r1=708774&r2=708775&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy (original)
+++ ofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy Tue Oct 28 21:49:39 2008
@@ -39,15 +39,16 @@
     return uptodateTask.eval()
 }
 
+def basedir = project.baseDir
 def ant = new AntBuilder(self)
-def javacchome = resolveFile('${ofbiz.home.dir}/framework/base/lib/javacc', null)
+def javacchome = resolveFile('${ofbiz.home.dir}/framework/base/lib/javacc', basedir)
 def src = getAttribute('src', 'src')
-def dir = getAttribute('dir', null)
-def file = getAttribute('file', null)
-def srcfile = resolveFile("$src/$dir/${file}.jjt", null)
+def dir = getAttribute('dir', basedir)
+def file = getAttribute('file', basedir)
+def srcfile = resolveFile("$src/$dir/${file}.jjt", basedir)
 def srcpaths = [
-    jjtree:     resolveFile(getAttribute('gendir', '${build.dir}/gen-src') + '/jjtree/', null),
-    javacc:     resolveFile(getAttribute('gendir', '${build.dir}/gen-src') + '/javacc/', null),
+    jjtree:     resolveFile(getAttribute('gendir', '${build.dir}/gen-src') + '/jjtree/', basedir),
+    javacc:     resolveFile(getAttribute('gendir', '${build.dir}/gen-src') + '/javacc/', basedir),
 ]
 def dirs = [
     jjtree:     resolveFile(dir, srcpaths.jjtree),
@@ -87,5 +88,5 @@
         javacchome:         javacchome,
         outputdirectory:    dirs.javacc,
     )
-    ant.delete(dir:resolveFile('${build.classes}/' + dir, null))
+    ant.delete(dir:resolveFile('${build.classes}/' + dir, basedir))
 }