From: <raj...@us...> - 2006-06-10 17:30:00
|
Revision: 6426 Author: rajarshi Date: 2006-06-10 10:29:55 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/cdk/?rev=6426&view=rev Log Message: ----------- Removed the check for rJava as we don't strictly need it. Also added a propety to access env var's to check for R_HOME and LD_LIBRARY_PATH during testing Modified Paths: -------------- trunk/cdk/build.xml Modified: trunk/cdk/build.xml =================================================================== --- trunk/cdk/build.xml 2006-06-10 16:58:59 UTC (rev 6425) +++ trunk/cdk/build.xml 2006-06-10 17:29:55 UTC (rev 6426) @@ -36,8 +36,10 @@ <property name="arg2" value="" /> <property name="arg3" value="" /> <property name="arg4" value="" /> - - <target id="info" name="info" depends="check"> + + <property environment="env" /> + + <target id="info" name="info" depends="check"> <!-- Gives information about the building process. --> <echo message="Platform:" /> <echo message=" OS: ${os.name}" /> @@ -84,7 +86,7 @@ <echo message=" debug: ${debug}" /> <echo message=" deprecation: ${deprecation}" /> <echo message=" optimization: ${optimization}" /> - <echo message=" skipDoclet: ${doSkipDoclet}" /> + <echo message=" skipDoclet: ${doSkipDoclet}" /> </target> <target id="checkPlatforms" name="checkPlatforms"> @@ -174,11 +176,6 @@ <available file="/usr/bin/R" /> <available file="/usr/local/bin/R"/> </or> - <or> - <available file="/usr/lib/R/library/rJava/" /> - <available file="/usr/local/lib/R/library/rJava/" /> - <available file="/usr/local/lib/R/site-library/rJava/" /> - </or> </and> </condition> <condition property="xindice.present"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |