manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1207279 - in /incubator/lcf/branches/CONNECTORS-287/connectors/alfresco: alfresco-ws-client/ build.xml
Date Mon, 28 Nov 2011 15:08:56 GMT
Author: kwright
Date: Mon Nov 28 15:08:56 2011
New Revision: 1207279

URL: http://svn.apache.org/viewvc?rev=1207279&view=rev
Log:
Make build conditional and remove automatic download dependency

Added:
    incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/alfresco-ws-client/
Modified:
    incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/build.xml

Modified: incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/build.xml?rev=1207279&r1=1207278&r2=1207279&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-287/connectors/alfresco/build.xml Mon Nov 28 15:08:56
2011
@@ -21,8 +21,19 @@
         <delete dir="build"/>
         <delete dir="dist"/>
     </target>
-    
-    <target name="doc">
+  
+      <target name="calculate-condition">
+        <available file="alfresco-ws-client/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
+        <condition property="canBuild">
+            <isset property="alfrescoStatus"/>
+        </condition>
+    </target>
+
+    <target name="precompile-check" depends="calculate-condition" unless="canBuild">
+        <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-3.4.e.jar"/>
+    </target>
+
+    <target name="doc" depends="precompile-check" if="canBuild">
         <mkdir dir="dist/doc"/>
         <javadoc destdir="dist/doc" source="1.5">
             <classpath>
@@ -32,7 +43,7 @@
         </javadoc>
     </target>
 
-    <target name="compile-connector" depends="download-dependencies">
+    <target name="compile-connector" depends="precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
         <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
@@ -41,7 +52,7 @@
         </javac>
     </target>
 
-    <target name="jar-connector" depends="compile-connector">
+    <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
         <mkdir dir="build/jar"/>
         <jar destfile="build/jar/mcf-alfresco-connector.jar">
         	<fileset dir="build/connector/classes"/>
@@ -49,24 +60,26 @@
         </jar>
     </target>
 
-    <target name="lib" depends="jar-connector">
+    <target name="lib" depends="jar-connector,precompile-check" if="canBuild">
         <copy todir="dist/lib">
             <fileset dir="build/jar">
                 <include name="mcf-alfresco-connector.jar"/>
             </fileset>
-            <fileset dir="lib">
+            <fileset dir="alfresco-ws-client">
                 <include name="alfresco-web-service-client*.jar"/>
+            </fileset>
+            <fileset dir="lib">
                 <include name="axis*.jar"/>	
                 <include name="commons-discovery*.jar"/>
                 <include name="commons-logging*.jar"/>
-            	  <include name="commong-lang*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="jaxrpc*.jar"/>
                 <include name="mail*.jar"/>
                 <include name="opensaml*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="wss4j*.jar"/>
                 <include name="xalan*.jar"/>
-            	  <include name="xercesImpl*.jar"/>
+                <include name="xercesImpl*.jar"/>
                 <include name="xmlsec*.jar"/>
             </fileset>
         </copy>
@@ -83,9 +96,10 @@
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-postgresql,run-tests-HSQLDB"/>
 	
     <target name="download-alfresco-ws-client">
-    	<mkdir dir="dist/lib"/>
-      <get src="http://maven.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar"
dest="lib"/>
+      <mkdir dir="dist/alfresco-ws-client"/>
+      <get src="http://maven.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar"
dest="alfresco-ws-client"/>
     </target>
 	
-	  <target name="download-dependencies" depends="download-alfresco-ws-client"/>
+    <target name="download-dependencies" depends="download-alfresco-ws-client"/>
+
 </project>



Mime
View raw message