Repository: thrift Updated Branches: refs/heads/master bd2fce6fa -> 5057b4cb5
THRIFT-2750: makes targets for get explicit Client: Java and JavaScript Libs Patch: Randy Abernethy This fixes the build.xml for the Java server used to test JavaScript. Older ants fail when get is used with a target directory and not an explicit file name. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5057b4cb Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5057b4cb Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5057b4cb Branch: refs/heads/master Commit: 5057b4cb5ad13c1e9637e7ed58e2c7acd855a216 Parents: bd2fce6 Author: Randy Abernethy <[email protected]> Authored: Tue Sep 30 17:34:44 2014 -0700 Committer: Randy Abernethy <[email protected]> Committed: Tue Sep 30 17:34:44 2014 -0700 ---------------------------------------------------------------------- lib/js/test/build.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/5057b4cb/lib/js/test/build.xml ---------------------------------------------------------------------- diff --git a/lib/js/test/build.xml b/lib/js/test/build.xml index e302ea0..74ac0c4 100755 --- a/lib/js/test/build.xml +++ b/lib/js/test/build.xml @@ -93,14 +93,14 @@ </target> <target name="jslibs" depends="init, proxy"> - <get src="http://code.jquery.com/jquery-1.7.2.js"; dest="${build}/js/lib" usetimestamp="true"/> - <get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/equiv.js"; dest="${build}/js/lib" usetimestamp="true"/> - <get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/QUnitAdapter.js"; dest="${build}/js/lib" usetimestamp="true"/> + <get src="http://code.jquery.com/jquery-1.7.2.js"; dest="${build}/js/lib/jquery-1.7.2.js" usetimestamp="true"/> + <get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/equiv.js"; dest="${build}/js/lib/equiv.js" usetimestamp="true"/> + <get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/QUnitAdapter.js"; dest="${build}/js/lib/QUnitAdapter.js" usetimestamp="true"/> <get src="http://code.jquery.com/qunit/qunit-1.5.0.js"; dest="${build}/js/lib/qunit.js" usetimestamp="true"/> <get src="http://code.jquery.com/qunit/qunit-1.5.0.css"; dest="${build}/js/lib/qunit.css" usetimestamp="true"/> <!-- js-test-driver has issues with relative path...so we need a copy --> - <copy file="../src/thrift.js" todir="${build}/js/"/> + <copy file="../src/thrift.js" todir="${build}/js/thrift.js"/> </target> <target name="compile" description="compile the test suite" depends="init, generate, resolve">
