[gatewiki-commits] SF.net SVN: gatewiki:[1792] trunk/cow/build.xml

[ian_roberts]

Revision: 1792
          http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1792&view=rev
Author:   ian_roberts
Date:     2009-11-06 10:52:36 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
Changed grails-compile target to do "grails package" instead of "grails
compile", and made grails-test depend on grails-compile.  This allows ant test
to succeed when run from a clean ~/.grails/1.1.1/projects/cow.

Previously the tests would only pass if the application had been run at least
once since the last clean, as the yam translator expects to find the preamble
files on the classpath but they are only copied there in the grails "package"
phase, not by "grails compile".

Modified Paths:
--------------
    trunk/cow/build.xml

Modified: trunk/cow/build.xml
===================================================================
--- trunk/cow/build.xml 2009-11-05 15:24:09 UTC (rev 1791)
+++ trunk/cow/build.xml 2009-11-06 10:52:36 UTC (rev 1792)
@@ -43,6 +43,7 @@
   <property name="doc.api.dir" value="${doc.dir}/api" />
   <property name="java.src.dir" value="${src.dir}/java" />
   <property name="java.classes.dir" value="${grails.project.dir}/classes" />
+  <property name="java.resources.dir" value="${grails.project.dir}/resources" />
   <property name="java.test.dir" value="${test.dir}/unit" />
   <property name="java.test.classes.dir" value="${grails.project.dir}/test-classes" />
   <property name="java.test.log4j.dir" value="${grails.project.dir}/resources" />
@@ -93,12 +94,14 @@
     <fileset refid="grailslibs"/>
     <fileset refid="libs"/>
     <pathelement location="${java.classes.dir}" />
+    <pathelement location="${java.resources.dir}" />
   </path>
   <path id="test.class.path">
     <pathelement location="${java.test.log4j.dir}" />
     <fileset refid="grailslibs"/>
     <fileset refid="libs"/>
     <pathelement location="${java.classes.dir}" />
+    <pathelement location="${java.resources.dir}" />
     <pathelement location="${java.test.classes.dir}" />  
   </path>
   <path id="java.sources">
@@ -239,7 +242,7 @@
       srcdir="${java.src.dir}" destdir="${java.classes.dir}" source="1.5" target="1.5" encoding="UTF-8"
       debug="true" deprecation="true" debuglevel="lines,source" classpathref="build.class.path"
     />
-    <copy todir="${java.classes.dir}">
+    <copy todir="${java.resources.dir}">
       <fileset dir="${java.src.dir}" defaultexcludes="yes" excludes="**/package.html,**/*.java" />
     </copy>
   </target>
@@ -254,8 +257,8 @@
         <fileset dir="${java.test.dir}" defaultexcludes="yes" excludes="**/package.html,**/*.java" />
       </copy>
   </target>
-  <target name="grails-compile" description="Does a Grails compile">
-    <exec dir="." executable="${os.shell}" failonerror="true"> <arg line='${os.shell.switches} "${grails-base} compile"' /> </exec>
+  <target name="grails-compile" description="Does a Grails package">
+    <exec dir="." executable="${os.shell}" failonerror="true"> <arg line='${os.shell.switches} "${grails-base} package"' /> </exec>
   </target>
   <target name="gwt-compile" description="Does a GWT compile">
     <exec dir="." executable="${os.shell}" failonerror="true"> <arg line='${os.shell.switches} "${grails-base} compile-gwt-modules"' /> </exec>
@@ -268,7 +271,7 @@
   Use the separate test-selenium target for functional tests.
   -->
   <target name="test" depends="grails-test" description="Does all grails and unit" />
-  <target name="grails-test" depends="setup-grails" description="Does a grails test-app">
+  <target name="grails-test" depends="setup-grails, grails-compile" description="Does a grails test-app">
     <delete dir="${java.reports.dir}"/>
     <mkdir dir="${java.reports.dir}"/>
     <exec dir="." executable="${os.shell}" failonerror="${stop.build}"> <arg line='${grails} test-app"' /> </exec>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits