From: jreichen <jre...@us...> - 2010-11-06 20:53:53
|
Update of /cvsroot/sageplugins/MediaStreaming In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3853 Modified Files: build.xml Log Message: Fix JettyStarter build.xml location for Hudson builds Index: build.xml =================================================================== RCS file: /cvsroot/sageplugins/MediaStreaming/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 3 Nov 2010 03:42:29 -0000 1.1 --- build.xml 6 Nov 2010 20:53:45 -0000 1.2 *************** *** 47,55 **** <echo message="Hudson home directory ${hudson.home.dir}"/> <!-- build JettyStarter for dependencies --> ! <ant dir="../JettyStarter" target="hudson" inheritAll="false" /> <!-- call the default target of this file --> <ant antfile="build.xml" inheritall="false"> <!-- The jar with the SageTV APIs is placed in the Hudson home directory --> <property name="sage.lib.dir" value="${hudson.home.dir}"/> <property name="build.number" value="${env.BUILD_NUMBER}"/> </ant> --- 47,56 ---- <echo message="Hudson home directory ${hudson.home.dir}"/> <!-- build JettyStarter for dependencies --> ! <ant dir="../JettyStarter/workspace/" target="hudson" inheritAll="false" /> <!-- call the default target of this file --> <ant antfile="build.xml" inheritall="false"> <!-- The jar with the SageTV APIs is placed in the Hudson home directory --> <property name="sage.lib.dir" value="${hudson.home.dir}"/> + <property name="jetty.lib.dir" location="../../JettyStarter/workspace/build/zip/JARs/"/> <property name="build.number" value="${env.BUILD_NUMBER}"/> </ant> |