From: Zdeněk Salvet <salvet@ics.muni.cz>
Date: Wed, 16 Mar 2005 10:02:52 +0000 (+0000)
Subject: proxy component added
X-Git-Tag: merge_rc1_dst_1~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=469bba2dd3632e089ba98e7044611694c363ba2d;p=jra1mw.git

proxy component added
---

diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index 2ded065..195a9a3 100755
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.28  2004/11/29 15:16:26  zsalvet
+	Add ws-interface to checkout/build machinery.
+	
 	Revision 1.27  2004/11/29 13:55:02  akrenek
 	added dependence on ws-interface
 	
@@ -360,6 +363,22 @@
 		</if>
 	</target>
 
+	<target name="proxy" unless="setenvonly" depends="envset,globus,expat,ares,client-interface,common,server">
+		<if>
+			<isset property="small.memory" />
+			<then>
+				<exec dir="${lb.subsystem.dir}.proxy" executable="${antExec}" failonerror="${failonerror}">
+					<arg line="${target} &quot;-Dsmall.memory=true&quot; &quot;-Dbootstrap=${bootstrap}&quot; &quot;-Dfailonerror=${failonerror}&quot; &quot;-Ddo.cvs.tag=${do.cvs.tag}&quot;"/>
+				</exec>
+			</then>
+			<else>
+				<ant dir="${lb.subsystem.dir}.proxy"
+	                    	     target="${target}"
+	                    	     inheritall="false" />
+			</else>
+		</if>
+	</target>
+
 	<target name="logger" unless="setenvonly" depends="envset, globus,expat,ares,client-interface,common">
 		<if>
 			<isset property="small.memory" />
diff --git a/org.glite.lb/project/dependencies.properties b/org.glite.lb/project/dependencies.properties
index 8757f10..57f5646 100644
--- a/org.glite.lb/project/dependencies.properties
+++ b/org.glite.lb/project/dependencies.properties
@@ -11,5 +11,6 @@ org.glite.lb.ws-interface.version 		= HEAD
 org.glite.lb.common.version 			= HEAD
 org.glite.lb.client.version 			= HEAD
 org.glite.lb.server.version 			= HEAD
+org.glite.lb.proxy.version 			= HEAD
 org.glite.lb.server-bones.version 		= HEAD
 org.glite.lb.logger.version 			= HEAD
diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml
index d78376b..77f8026 100644
--- a/org.glite.lb/project/glite.lb.csf.xml
+++ b/org.glite.lb/project/glite.lb.csf.xml
@@ -22,6 +22,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.11  2004/12/01 18:01:55  zsalvet
+	LB here, not R-GMA
+	
 	Revision 1.10  2004/11/29 16:01:21  zsalvet
 	Evaluate component.{head,tag} conditions before use of get.* targets.
 	
@@ -169,6 +172,10 @@
 			<equals arg1="${org.glite.lb.server.version}" arg2="HEAD" />
 		</condition>
 
+		<condition property="proxy.head">
+			<equals arg1="${org.glite.lb.proxy.version}" arg2="HEAD" />
+		</condition>
+
 		<condition property="logger.head">
 			<equals arg1="${org.glite.lb.logger.version}" arg2="HEAD" />
 		</condition>
@@ -295,6 +302,16 @@
 			tag="${org.glite.lb.server.version}" />
 	</target>
 
+	<!-- proxy -->
+ 	<target name="proxy" depends="evaluate.cvs.tags, get.proxy.head, get.proxy.tag"/>
+	<target name="get.proxy.head" if="proxy.head">
+		<cvs-co package="org.glite.lb.proxy" />
+	</target>
+	<target name="get.proxy.tag" unless="proxy.head">
+		<cvs-co package="org.glite.lb.proxy"
+			tag="${org.glite.lb.proxy.version}" />
+	</target>
+
 	<!-- logger -->
  	<target name="logger" depends="evaluate.cvs.tags, get.logger.head, get.logger.tag"/>
 	<target name="get.logger.head" if="logger.head">
@@ -312,6 +329,7 @@
  						server-bones,
  						client,
  						server,
+ 						proxy,
  						logger"/>