added lb.utils

diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index 8735cce..429dd44 100755 (executable)
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.35  2005/10/14 17:19:08  akrenek
+       build also lb.utils
+       
        Revision 1.34  2005/10/14 11:02:06  akrenek
        depends on jp.primary
        
@@ -425,7 +428,7 @@
                </if>
        </target>
 
-       <target name="client" unless="setenvonly" depends="envset, globus,expat,ares,client-interface,common">
+       <target name="client" unless="setenvonly" depends="envset, globus, expat, ares, client-interface, common">
                <if>
                        <isset property="small.memory" />
                        <then>
@@ -457,56 +460,57 @@
                </if>
        </target>
 
-       <target name="utils" unless="setenvonly" depends="envset, globus, expat, ares, common, server">
+       <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}.utils" executable="${antExec}" failonerror="${failonerror}">
+                               <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}.utils"
-                                    target="${target}"
-                                    inheritall="false" />
+                               <ant dir="${lb.subsystem.dir}.proxy"
+                                    target="${target}"
+                                    inheritall="false" />
                        </else>
                </if>
        </target>
 
-       <target name="proxy" unless="setenvonly" depends="envset,globus,expat,ares,client-interface,common,server">
+       <target name="logger" unless="setenvonly" depends="envset, globus, expat, ares, client-interface, common">
                <if>
                        <isset property="small.memory" />
                        <then>
-                               <exec dir="${lb.subsystem.dir}.proxy" executable="${antExec}" failonerror="${failonerror}">
+                               <exec dir="${lb.subsystem.dir}.logger" 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"
+                               <ant dir="${lb.subsystem.dir}.logger"
                                     target="${target}"
                                     inheritall="false" />
                        </else>
                </if>
        </target>
 
-       <target name="logger" unless="setenvonly" depends="envset, globus,expat,ares,client-interface,common">
+       <target name="utils" unless="setenvonly" depends="envset, globus, expat, ares, client-interface, common, server">
                <if>
-                       <isset property="small.memory" />
+                       <isset property="small.memory"/>
                        <then>
-                               <exec dir="${lb.subsystem.dir}.logger" 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 dir="${lb.subsystem.dir}.utils" executable="${antExec}" failonerror="${failonerror}">
+                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
                                </exec>
                        </then>
                        <else>
-                               <ant dir="${lb.subsystem.dir}.logger"
-                                    target="${target}"
-                                    inheritall="false" />
+                               <ant dir="${lb.subsystem.dir}.utils"
+                                       target="${target}"
+                                       inheritall="false" />
                        </else>
                </if>
-       </target>
+       </target>
 
        <!-- Main proxy -->
-       <target name="buildmodules" depends="envset, 
+       <target name="buildmodules" depends="envset,
+                                            utils, 
                                             client-interface,
                                             ws-interface,
                                             client,

diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml
index 77f8026..96511ac 100644 (file)
--- 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.12  2005/03/16 10:02:52  zsalvet
+       proxy component added
+       
        Revision 1.11  2004/12/01 18:01:55  zsalvet
        LB here, not R-GMA
        
@@ -148,6 +151,10 @@
        
                <!-- condition property tag = do not remove = -->
 
+               <condition property="utils.head">
+                       <equals arg1="${org.glite.lb.utils.version}" arg2="HEAD" />
+               </condition>
+
                <condition property="common.head">
                        <equals arg1="${org.glite.lb.common.version}" arg2="HEAD" />
                </condition>
@@ -241,6 +248,17 @@
                 ===================================================== -->
 
        <!-- component targets tag = do not remove = -->
+
+       <!-- utils component -->
+       <target name="utils" depends="get.utils.head, get.utils.tag"/>
+       <target name="get.utils.head" if="utils.head">
+               <cvs-co package="org.glite.lb.utils" />
+        </target>
+
+       <target name="get.utils.tag" unless="utils.head">
+               <cvs-co package="org.glite.lb.utils"
+                       tag="${org.glite.lb.utils.version}" />
+       </target>
        
        <!-- common -->
        <target name="common" depends="evaluate.cvs.tags, get.common.head, get.common.tag"/>
@@ -322,15 +340,26 @@
                        tag="${org.glite.lb.logger.version}" />
        </target>
 
+       <!-- utils -->
+       <target name="utils" depends="evaluate.cvs.tags, get.utils.head, get.utils.tag"/>
+       <target name="get.utils.head" if="utils.head">
+               <cvs-co package="org.glite.lb.utils" />
+       </target>
+       <target name="get.utils.tag" unless="utils.head">
+               <cvs-co package="org.glite.lb.utils"
+                       tag="${org.glite.lb.utils.version}" />
+       </target>
+
        <!-- All project modules -->
-       <target name="project" depends="client-interface,
-                                               ws-interface,
-                                               common,
-                                               server-bones,
-                                               client,
-                                               server,
-                                               proxy,
-                                               logger"/>
+       <target name="project" depends="utils,
+                                       client-interface,
+                                       ws-interface,
+                                       common,
+                                       server-bones,
+                                       client,
+                                       server,
+                                       proxy,
+                                       logger"/>
 
 
        <!-- ====================================================