Author: rwhitcomb
Date: Tue Sep 15 19:32:49 2015
New Revision: 1703277
URL: http://svn.apache.org/r1703277
Log:
Code cleanup: Reorganize the "build.xml" so that the tests are compiled after
everything else, in case there are new methods that the tests depend on that
won't compile until the core/wtk .jar files are built.
Add a copy of .bxml, .json and .png files in both the tests and tutorials
directories, so you can just change to the xxxx/ant-bin directory and run
tests with "java org.apache.pivot....." (that is the class name of the
test or tutorial). All the resources will be in place to do that now.
This is a merge of revision 1703276 from branches/2.0.x to trunk.
Modified:
pivot/trunk/ (props changed)
pivot/trunk/build.xml
Propchange: pivot/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 19:32:49 2015
@@ -1 +1 @@
-/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233,1692157
+/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233,1692157,1703276
Modified: pivot/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1703277&r1=1703276&r2=1703277&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Tue Sep 15 19:32:49 2015
@@ -392,10 +392,13 @@ limitations under the License.
</target>
- <!-- Compile all classes (tests included) -->
+ <!-- Compile all classes (not including tests, because they depend on
packaged .jar files) -->
<target name="compile" description="Compiles all projects"
- depends="environment-info, charts, core, demos, demos-server, tests,
tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
+ depends="environment-info, charts, core, demos, demos-server,
tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
+ <!-- Compile all classes (tests included) -->
+ <target name="compile-tests" description="Compiles tests after compiling
everything else"
+ depends="compile, tests"/>
<!-- Package JAR files -->
<target name="package" description="Packages all projects into JAR files"
depends="compile">
@@ -412,7 +415,7 @@ limitations under the License.
</target>
<!-- Package JAR file for tests, note that this could be needed only for
interactive GUI Tests -->
- <target name="package-tests" description="Packages only tests project into
JAR files" depends="compile">
+ <target name="package-tests" description="Packages only tests project into
JAR files" depends="compile-tests">
<package project="tests" jarFile="${jar.tests}" title="Tests"/>
</target>
@@ -439,7 +442,7 @@ limitations under the License.
</target>
<!-- Run unit tests -->
- <target name="test" description="Executes unit tests" depends="compile">
+ <target name="test" description="Executes unit tests"
depends="compile-tests">
<test project="charts"/>
<test project="core"/>
<test project="demos"/>
@@ -522,12 +525,19 @@ limitations under the License.
<fileset dir="wtk" includes="lib/**/*.jar"/>
</compile>
<copy todir="tests/${folder.bin}">
+ <fileset dir="tests/src" includes="**/*.bxml"/>
<fileset dir="tests/src" includes="**/*.png"/>
+ <fileset dir="tests/src" includes="**/*.json"/>
</copy>
</target>
<target name="tutorials" depends="core, wtk, web">
<compile project="tutorials"/>
+ <copy todir="tutorials/${folder.bin}">
+ <fileset dir="tutorials/src" includes="**/*.bxml"/>
+ <fileset dir="tutorials/src" includes="**/*.png"/>
+ <fileset dir="tutorials/src" includes="**/*.json"/>
+ </copy>
</target>
<target name="tutorials-server" depends="core, web, web-server">
