You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/04/12 04:17:57 UTC
svn commit: r764272 - in /incubator/pivot/trunk: build.xml
wtk-test/lib/js-engine.jar wtk-test/lib/js.jar wtk-test/src/
wtk/lib/js-engine.jar wtk/lib/js.jar wtk/test/
Author: tvolkert
Date: Sun Apr 12 02:17:56 2009
New Revision: 764272
URL: http://svn.apache.org/viewvc?rev=764272&view=rev
Log:
PIVOT-51 :: Migrated wtk-test to wtk/test
Added:
incubator/pivot/trunk/wtk/lib/js-engine.jar (props changed)
- copied unchanged from r764269, incubator/pivot/trunk/wtk-test/lib/js-engine.jar
incubator/pivot/trunk/wtk/lib/js.jar (props changed)
- copied unchanged from r764269, incubator/pivot/trunk/wtk-test/lib/js.jar
incubator/pivot/trunk/wtk/test/ (props changed)
- copied from r764269, incubator/pivot/trunk/wtk-test/src/
Removed:
incubator/pivot/trunk/wtk-test/lib/js-engine.jar
incubator/pivot/trunk/wtk-test/lib/js.jar
incubator/pivot/trunk/wtk-test/src/
Modified:
incubator/pivot/trunk/build.xml
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=764272&r1=764271&r2=764272&view=diff
==============================================================================
--- incubator/pivot/trunk/build.xml (original)
+++ incubator/pivot/trunk/build.xml Sun Apr 12 02:17:56 2009
@@ -45,10 +45,10 @@
depends="charts, charts-test, core, core-test, web, web-test, wtk, wtk-test, demos, tutorials, tools"/>
<target name="package"
- depends="charts-package, charts-test-package, core-package, core-test-package, web-package, web-test-package, wtk-package, wtk-test-package, demos-package, tutorials-package, tools-package"/>
+ depends="charts-package, charts-test-package, core-package, core-test-package, web-package, web-test-package, wtk-package, demos-package, tutorials-package, tools-package"/>
<target name="clean" description="Removes all build artifacts"
- depends="charts-clean, charts-test-clean, core-clean, core-test-clean, web-clean, web-test-clean, wtk-clean, wtk-test-clean, demos-clean, tutorials-clean, tools-clean">
+ depends="charts-clean, charts-test-clean, core-clean, core-test-clean, web-clean, web-test-clean, wtk-clean, demos-clean, tutorials-clean, tools-clean">
<delete dir="${folder.dist}"/>
<delete dir="${folder.deploy}"/>
<delete dir="${folder.doc}"/>
@@ -480,9 +480,9 @@
<!-- WTK Test -->
<target name="wtk-test" depends="core, wtk">
- <mkdir dir="wtk-test/${folder.bin}"/>
- <javac srcdir="wtk-test/src"
- destDir="wtk-test/${folder.bin}"
+ <mkdir dir="wtk/${folder.bin}"/>
+ <javac srcdir="wtk/test"
+ destDir="wtk/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -496,22 +496,6 @@
</javac>
</target>
- <target name="wtk-test-package" depends="wtk-test">
- <mkdir dir="${folder.lib}"/>
- <jar jarfile="${folder.lib}/${ant.project.name}-wtk.test.jar">
- <fileset dir="wtk-test/${folder.bin}"/>
- <fileset dir="wtk-test/src">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </jar>
- </target>
-
- <target name="wtk-test-clean">
- <delete dir="wtk-test/${folder.bin}"/>
- <delete file="${folder.lib}/${ant.project.name}-wtk.test.jar"/>
- </target>
-
<!-- Demos -->
<target name="demos" depends="core, web, wtk">
<mkdir dir="demos/${folder.bin}"/>
@@ -695,7 +679,7 @@
<!-- Exclude scripting engines -->
<exclude name="demos/lib/js*.jar"/>
<exclude name="demos/lib/groovy*.jar"/>
- <exclude name="wtk-test/lib/js*.jar"/>
+ <exclude name="wtk/lib/js*.jar"/>
</fileset>
</copy>
Propchange: incubator/pivot/trunk/wtk/lib/js-engine.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/pivot/trunk/wtk/lib/js-engine.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/pivot/trunk/wtk/lib/js.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/pivot/trunk/wtk/lib/js.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/pivot/trunk/wtk/test/
------------------------------------------------------------------------------
svn:mergeinfo =