From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Thu, 29 Jul 2004 10:47:46 +0000 (+0000)
Subject: Added server and logger
X-Git-Tag: merge_gss2scm_dst~36
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1ab158dc8b42aa6365571aff4bf656bf5f6f3f8a;p=jra1mw.git

Added server and logger
---

diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index a995d3d..fcfb433 100755
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.7  2004/07/29 07:39:57  dimeglio
+	Removed local envinfo and envcheck target (must use common ones)
+	
 	Revision 1.6  2004/07/16 16:25:43  flammer
 	Added tags for automated adding of components.
 	
@@ -232,9 +235,23 @@
 		     inheritall="false" />
 	</target>
 
-		<!-- Main proxy -->
+	<target name="server" unless="setenvonly" depends="globus,expat,ares,mysql,client-interface,common">
+		<ant dir="${workspace.dir}/${subsystem.name}.server"
+		     target="${target}"
+		     inheritall="false" />
+	</target>
+
+	<target name="logger" unless="setenvonly" depends="globus,expat,ares,client-interface,common">
+		<ant dir="${workspace.dir}/${subsystem.name}.logger"
+		     target="${target}"
+		     inheritall="false" />
+	</target>
+
+	<!-- Main proxy -->
 	<target name="buildmodules" depends="client-interface,
 										 client,
-										 common"/>
+										 common,
+										 server,
+										 logger"/>
 
 </project>
diff --git a/org.glite.lb/project/dependencies.properties b/org.glite.lb/project/dependencies.properties
index 49d147a..bab4f4f 100644
--- a/org.glite.lb/project/dependencies.properties
+++ b/org.glite.lb/project/dependencies.properties
@@ -9,3 +9,5 @@ org.glite.lb.version 			= HEAD
 org.glite.lb.client-interface.version 	= HEAD
 org.glite.lb.common.version 		= HEAD
 org.glite.lb.client.version 		= HEAD
+org.glite.lb.server.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 de9e16a..019d76a 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.3  2004/07/16 16:25:43  flammer
+	Added tags for automated adding of components.
+	
 	Revision 1.2  2004/06/23 00:22:11  dimeglio
 	Added client and client-interface components
 	
@@ -133,6 +136,14 @@
 			<equals arg1="${org.glite.lb.client.version}" arg2="HEAD" />
 		</condition>
 
+		<condition property="server.head">
+			<equals arg1="${org.glite.lb.server.version}" arg2="HEAD" />
+		</condition>
+
+		<condition property="logger.head">
+			<equals arg1="${org.glite.lb.logger.version}" arg2="HEAD" />
+		</condition>
+
     	</target>
 
     	<presetdef name="cvs-co">
@@ -223,10 +234,32 @@
 			tag="${org.glite.lb.client.version}" />
 	</target>
 
+	<!-- server -->
+ 	<target name="server" depends="get.server.head, get.server.tag"/>
+	<target name="get.server.head" if="server.head">
+		<cvs-co package="org.glite.lb.server" />
+	</target>
+	<target name="get.server.tag" unless="server.head">
+		<cvs-co package="org.glite.lb.server"
+			tag="${org.glite.lb.server.version}" />
+	</target>
+
+	<!-- logger -->
+ 	<target name="logger" depends="get.logger.head, get.logger.tag"/>
+	<target name="get.logger.head" if="logger.head">
+		<cvs-co package="org.glite.lb.logger" />
+	</target>
+	<target name="get.logger.tag" unless="logger.head">
+		<cvs-co package="org.glite.lb.logger"
+			tag="${org.glite.lb.logger.version}" />
+	</target>
+
 	<!-- All project modules -->
  	<target name="project" depends="common,
  						client-interface,
- 						client"/>
+ 						client,
+ 						server,
+ 						logger"/>
 
 
 	<!-- ====================================================