Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed dependency on (what i guess is) gigaspaces internal mounted dri…

…ves which broke ant build
  • Loading branch information...
commit 2cee2c2be17eb9e765de57ff53a8549d23c28d78 1 parent f341382
ahgittin authored May 07, 2012

Showing 1 changed file with 7 additions and 8 deletions. Show diff stats Hide diff stats

  1. 15  cloudify/build.xml
15  cloudify/build.xml
@@ -12,13 +12,10 @@
12 12
 
13 13
 <project name="Cloudify-Assembly" default="usage" basedir=".">
14 14
 	
15  
-	<condition property="build.repository.path" value="\\tarzan\builds">
16  
-		<os family="windows" />
17  
-	</condition>
18  
-
19  
-	<condition property="build.repository.path" value="/export/builds">
20  
-		<os family="unix" />
21  
-	</condition>
  15
+	<available file="\\tarzan\builds" property="build.repository.path" value="\\tarzan\builds"/>
  16
+	<available file="/export/builds" property="build.repository.path" value="/export/builds"/>
  17
+	<!-- by default it is downloaded to here -->
  18
+	<property name="build.repository.path" value="target/build-repository"/>
22 19
 
23 20
 	<condition property="mvn.executable" value="mvn.bat">
24 21
             <os family="windows" />
@@ -39,7 +36,6 @@
39 36
 	<property name="xap.zip.full.path" value="${build.repository.path}/${gs.version}/build_${gs.build.number}/xap-premium/1.5/${xap.zip.name}" />
40 37
 	<property name="cloudify.installation.dir" value="gigaspaces-cloudify-${cloudify.version}-${cloudify.milestone}" />
41 38
 	<property name="cloudify.zip.name" value="${cloudify.installation.dir}-b${cloudify.build.number}.zip" />
42  
-	<property name="xap.zip.full.path" value="${build.repository.path}/cloudify/${cloudify.version}/build_${cloudify.build.number}/product/${xap.zip.name}" />
43 39
 	<property name="CLOUDIFY" value="Cloudify" />
44 40
 	<property name="cloudify" value="cloudify" />
45 41
 	<property name="gs.runtime.jar" value="gs-runtime.jar" />
@@ -539,6 +535,9 @@
539 535
 		
540 536
 		<available file="${xap.files.tmp.dir}/${xap.zip.name}" property="appropriate.xap.zip.present"/>
541 537
 		<ant target="download.zip" />
  538
+
  539
+		<!-- part of the build assumes this is available (perhaps it shouldn't but for now this fixes failures) -->
  540
+		<copy file="${xap.files.tmp.dir}/${xap.zip.name}" tofile="${xap.zip.full.path}"/>
542 541
 			
543 542
 		<unzip src="${xap.files.tmp.dir}/${xap.zip.name}" dest="${tmp.dir}" />	
544 543
 		<move file="${tmp.dir}/${xap.installation.dir}" tofile="${tmp.dir}/${cloudify.installation.dir}" />

0 notes on commit 2cee2c2

Itai Frenkel

Are you sure this line was meant to be deleted?

ahgittin

It will have no effect as the same property is already set to a different value three lines above, no?

Please sign in to comment.
Something went wrong with that request. Please try again.