You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2020/04/26 13:26:05 UTC

svn commit: r1877023 - /manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml

Author: kwright
Date: Sun Apr 26 13:26:05 2020
New Revision: 1877023

URL: http://svn.apache.org/viewvc?rev=1877023&view=rev
Log:
Conditionally download the windows or unix version

Modified:
    manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml

Modified: manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml?rev=1877023&r1=1877022&r2=1877023&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml Sun Apr 26 13:26:05 2020
@@ -32,7 +32,14 @@
 
     <property name="elasticsearch.version" value="7.6.2"/>
     <property name="elasticsearch.mapper-attachments.version" value="3.1.2"/>
-    
+
+    <condition property="isWindows">
+        <os family="windows" />
+    </condition>
+    <condition property="isUnix">
+        <os family="unix" />
+    </condition>
+
     <target name="download-mapper-attachments">
         <property name="elasticsearch-package" value="org/elasticsearch"/>
         
@@ -47,19 +54,26 @@
             <param name="artifact-type" value="zip"/>
         </antcall>
 
-        <!--get src="https://github.com/elasticsearch/elasticsearch-mapper-attachments/archive/v2.0.0.RC1.zip" 
-            dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments.zip"/-->
-        
         <unzip src="test-materials/elasticsearch-${elasticsearch.version}/plugins/elasticsearch-mapper-attachments-${elasticsearch.mapper-attachments.version}.zip" dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
     </target>
 
-    <target name="download-elasticsearch">
+    <target name="download-elasticsearch-unix" if="isUnix">
         <mkdir dir="build/download"/>
         <get src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-linux-x86_64.tar.gz" 
             dest="build/download/elasticsearch.tar.gz"/>
         <gunzip src="build/download/elasticsearch.tar.gz"/>
         <untar src="build/download/elasticsearch.tar" dest="test-materials"/>
     </target>
+
+    <target name="download-elasticsearch-windows" if="isWindows">
+        <mkdir dir="build/download"/>
+        <get src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-windows-x86_64.tar.gz" 
+            dest="build/download/elasticsearch.zip"/>
+        <unzip src="build/download/elasticsearch.zip" dest="test-materials"/>
+    </target>
+
+    <target name="download-elasticsearch" depends="download-elasticsearch-unix,download-elasticsearch-windows">
+    </target>
     
     <target name="download-dependencies" depends="download-mapper-attachments,download-elasticsearch">
         <chmod dir="test-materials/elasticsearch-${elasticsearch.version}" perm="ugo+rxw">