svn commit: r1417617 - /manifoldcf/trunk/connectors/livelink/build.xml

[kw...@apache.org]

Author: kwright
Date: Wed Dec  5 20:06:02 2012
New Revision: 1417617

URL: http://svn.apache.org/viewvc?rev=1417617&view=rev
Log:
Blew the commit, somehow, for CONNECTORS-575 - repeating

Modified:
    manifoldcf/trunk/connectors/livelink/build.xml

Modified: manifoldcf/trunk/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/build.xml?rev=1417617&r1=1417616&r2=1417617&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/build.xml (original)
+++ manifoldcf/trunk/connectors/livelink/build.xml Wed Dec  5 20:06:02 2012
@@ -19,13 +19,24 @@
 
     <import file="../connector-build.xml"/>
 
-    <target name="calculate-run-condition">
+    <path id="connector-classpath">
+        <path refid="mcf-connector-build.connector-classpath"/>
+        <fileset dir="lib-proprietary" includes="*.jar"/>
+    </path>
+
+    <target name="has-proprietary-materials-check">
         <available file="lib-proprietary/lapi.jar" property="lapiStatus"/>
-        <condition property="libs-present">
+        <condition property="proprietaryMaterialsAvailable">
             <isset property="lapiStatus"/>
         </condition>
     </target>
     
+    <target name="calculate-run-condition" depends="has-proprietary-materials-check">
+        <condition property="libs-present">
+            <isset property="proprietaryMaterialsAvailable"/>
+        </condition>
+    </target>
+    
     <target name="prerun-warn" depends="calculate-run-condition" unless="libs-present">
         <echo message="LiveLink connector requires lapi.jar to be runnable"/>
     </target>