From 3ed9eab5f602114d0a161d5e901ffe15c0e26e44 Mon Sep 17 00:00:00 2001
From: Joachim Flammer <joachim.flammer@cern.ch>
Date: Tue, 6 Jul 2004 17:51:37 +0000
Subject: [PATCH] Update of classpath definitions, targets & configure file.

---
 org.glite.lb.client-interface/build.xml            | 30 ++++++-----
 ...figure-options.xml => configure.properties.xml} |  3 ++
 org.glite.lb.client/build.xml                      | 30 ++++++-----
 .../project/configure.properties.xml               | 54 +++++++++++++++++++
 org.glite.lb.common/build.xml                      | 33 ++++++------
 .../project/configure.properties.xml               | 60 ++++++++++++++++++++++
 org.glite.lb/build.xml                             | 23 ++++++---
 7 files changed, 182 insertions(+), 51 deletions(-)
 rename org.glite.lb.client-interface/project/{configure-options.xml => configure.properties.xml} (94%)
 create mode 100644 org.glite.lb.client/project/configure.properties.xml
 create mode 100644 org.glite.lb.common/project/configure.properties.xml

diff --git a/org.glite.lb.client-interface/build.xml b/org.glite.lb.client-interface/build.xml
index 14298ea..302dcd7 100755
--- a/org.glite.lb.client-interface/build.xml
+++ b/org.glite.lb.client-interface/build.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.3  2004/06/22 15:51:36  dimeglio
+	Added handling of *.T, *.pm and at3
+	
 	Revision 1.2  2004/06/21 16:02:16  dimeglio
 	Modified to search support files in module project directory
 	
@@ -29,11 +32,11 @@
 	
 	<!-- =========================================
 		 Builds the GLite LB Client Interface Module
-		 ========================================= -->
+	     ========================================= -->
 	
 	<!-- =========================================
 	     Import properties (order is important)
-		 ========================================= -->
+	     ========================================= -->
 
 	<!-- import baseline & user properties -->
 	<import file="../org.glite/project/baseline.properties.xml" />
@@ -54,38 +57,37 @@
 		
 	<!-- =========================================
 		 Load dependency property files (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${user.dependencies.file}"/>
 	<property file="${component.dependencies.file}" />
 	<property file="${subsystem.dependencies.file}" />
 	<property file="${global.dependencies.file}"/>
+
+	<!-- =========================================
+		 Load configure options (order is important)
+	     ========================================= -->
+	<import file="${global.configure.options.file}"/>
+	<import file="${component.configure.options.file}"/>
 	
 	<!-- =========================================
 		 Import task definitions (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<import file="${subsystem.taskdefs.file}" />
 	<import file="${global.taskdefs.file}" />
 			
 	<!-- =========================================
-		 Load configure options
-		 ========================================= -->
-	<property file="${global.configure.options.file}"/>
-
-	<!-- =========================================
 		 Load common targets
-		 ========================================= -->
-	<import file="${global.targets-external-dependencies.file}"/>	
+	     ========================================= -->
 	<import file="${global.targets-simple_make.file}" />
-	<import file="${component.configure.options.file}"/>
 
 	<!-- =========================================
 		 Load version file 
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${module.version.file}"/>
 		
 	<!-- ==============================================
 		 Local private targets
-		 ============================================== -->
+	     ============================================== -->
 	
 	<target name="localinit"
 		description="Module specific initialization tasks">
diff --git a/org.glite.lb.client-interface/project/configure-options.xml b/org.glite.lb.client-interface/project/configure.properties.xml
similarity index 94%
rename from org.glite.lb.client-interface/project/configure-options.xml
rename to org.glite.lb.client-interface/project/configure.properties.xml
index 1441f61..d23218e 100644
--- a/org.glite.lb.client-interface/project/configure-options.xml
+++ b/org.glite.lb.client-interface/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.3  2004/06/23 00:16:08  dimeglio
+	Added globalprefix and lbprefix parameters
+	
 	Revision 1.2  2004/06/22 15:49:56  dimeglio
 	Added configuration options
 	
diff --git a/org.glite.lb.client/build.xml b/org.glite.lb.client/build.xml
index 1d27b21..1be1b1b 100755
--- a/org.glite.lb.client/build.xml
+++ b/org.glite.lb.client/build.xml
@@ -20,17 +20,20 @@
 
 	Revision history:
 	$Log$
+	Revision 1.2  2004/06/23 00:29:33  dimeglio
+	Added standard comments and handling of support files
+	
 -->
 
 <project name="client" default="compile">
 	
 	<!-- =========================================
 		 Builds the GLite LB Client Module
-		 ========================================= -->
+	     ========================================= -->
 	
 	<!-- =========================================
 	     Import properties (order is important)
-		 ========================================= -->
+	     ========================================= -->
 
 	<!-- import baseline & user properties -->
 	<import file="../org.glite/project/baseline.properties.xml" />
@@ -51,38 +54,37 @@
 		
 	<!-- =========================================
 		 Load dependency property files (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${user.dependencies.file}"/>
 	<property file="${component.dependencies.file}" />
 	<property file="${subsystem.dependencies.file}" />
 	<property file="${global.dependencies.file}"/>
 	
 	<!-- =========================================
+		 Load configure options (order is important)
+	     ========================================= -->
+	<import file="${global.configure.options.file}"/>
+	<import file="${component.configure.options.file}"/>
+
+	<!-- =========================================
 		 Import task definitions (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<import file="${subsystem.taskdefs.file}" />
 	<import file="${global.taskdefs.file}" />
 			
 	<!-- =========================================
-		 Load configure options
-		 ========================================= -->
-	<property file="${global.configure.options.file}"/>
-
-	<!-- =========================================
 		 Load common targets
-		 ========================================= -->
-	<import file="${global.targets-external-dependencies.file}"/>	
+	     ========================================= -->
 	<import file="${global.targets-simple_make.file}" />
-	<import file="${component.configure.options.file}"/>
 
 	<!-- =========================================
 		 Load version file 
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${module.version.file}"/>
 		
 	<!-- ==============================================
 		 Local private targets
-		 ============================================== -->
+	     ============================================== -->
 	
 	<target name="localinit"
 		description="Module specific initialization tasks">
diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
new file mode 100644
index 0000000..0baa2d6
--- /dev/null
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+	Copyright (c) 2004 on behalf of the EU EGEE Project: 
+	The European Organization for Nuclear Research (CERN), 
+	Istituto Nazionale di Fisica Nucleare (INFN), Italy
+	Datamat Spa, Italy
+	Centre National de la Recherche Scientifique (CNRS), France
+	CS Systeme d'Information (CSSI), France
+	Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
+	Universiteit van Amsterdam (UvA), Netherlands
+	University of Helsinki (UH.HIP), Finland
+	University of Bergen (UiB), Norway
+	Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
+
+	Configuration options for the GLite LB Client module
+	
+	Authors: Ales Krenek <ljocha@ics.muni.cz>
+	Version info: $Id$
+	Release: $Name$
+
+	Revision history:
+	$Log$
+	Revision 1.1  2004/06/23 02:08:44  dimeglio
+	First version of this file
+	
+-->
+
+	<!-- ======================================================
+         Define extra properties here ...
+         ====================================================== -->
+        
+	<project name="LB Client configuration options">                                                                        
+		<target name="lbmakefiles">
+			<exec executable="ln" failonerror="true">
+				<arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
+			</exec>
+			<echo file="${module.build.dir}/Makefile.inc">
+top_srcdir=..
+builddir=build
+stagedir=${stage.abs.dir}
+distdir=${dist.dir}
+globalprefix=${global.prefix}
+lbprefix=${subsystem.prefix}
+package=${module.package.name}
+PREFIX=${install.dir}
+version=${module.version}
+glite_location=${with.glite.location}
+globus_prefix=${with.globus.prefix}
+globusflavour=${with.globus.dbg.nothr.flavor}
+expat_prefix=${with.expat.prefix}
+ares_prefix=${with.ares.prefix}
+			</echo>
+	    </target>
+	</project>
diff --git a/org.glite.lb.common/build.xml b/org.glite.lb.common/build.xml
index 2d72ad0..6e54c77 100755
--- a/org.glite.lb.common/build.xml
+++ b/org.glite.lb.common/build.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.3  2004/06/22 22:49:46  dimeglio
+	Removed debug comments
+	
 	Revision 1.2  2004/06/22 22:06:52  dimeglio
 	Added standard comments
 	
@@ -29,11 +32,11 @@
 	
 	<!-- =========================================
 		 Builds the GLite LB Common Module
-		 ========================================= -->
+	     ========================================= -->
 	
 	<!-- =========================================
 	     Import properties (order is important)
-		 ========================================= -->
+	     ========================================= -->
 
 	<!-- import baseline & user properties -->
 	<import file="../org.glite/project/baseline.properties.xml" />
@@ -54,42 +57,42 @@
 		
 	<!-- =========================================
 		 Load dependency property files (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${user.dependencies.file}"/>
 	<property file="${component.dependencies.file}" />
 	<property file="${subsystem.dependencies.file}" />
 	<property file="${global.dependencies.file}"/>
 	
 	<!-- =========================================
+                 Load configure options (order is important)
+             ========================================= -->
+        <import file="${global.configure.options.file}"/>
+        <import file="${component.configure.options.file}"/>
+	
+	<!-- =========================================
 		 Import task definitions (order is important)
-		 ========================================= -->
+	     ========================================= -->
 	<import file="${subsystem.taskdefs.file}" />
 	<import file="${global.taskdefs.file}" />
 			
 	<!-- =========================================
-		 Load configure options
-		 ========================================= -->
-	<property file="${global.configure.options.file}"/>
-
-	<!-- =========================================
 		 Load common targets
-		 ========================================= -->
-	<import file="${global.targets-external-dependencies.file}"/>	
+	     ========================================= -->
 	<import file="${global.targets-simple_make.file}" />
-	<import file="${component.configure.options.file}"/>
 
 	<!-- =========================================
 		 Load version file 
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${module.version.file}"/>
 		
 	<!-- ==============================================
 		 Local private targets
-		 ============================================== -->
+	     ============================================== -->
 	
 	<target name="localinit"
 		description="Module specific initialization tasks">
-        <!-- Copy support files from the subsystem project to the component project-->
+
+        	<!-- Copy support files from the subsystem project to the component project-->
 		<copy toDir="${module.project.dir}">
 			<fileset dir="${subsystem.project.dir}">
 				<include name="at3" />
diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml
new file mode 100644
index 0000000..2cd4ebd
--- /dev/null
+++ b/org.glite.lb.common/project/configure.properties.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+	Copyright (c) 2004 on behalf of the EU EGEE Project: 
+	The European Organization for Nuclear Research (CERN), 
+	Istituto Nazionale di Fisica Nucleare (INFN), Italy
+	Datamat Spa, Italy
+	Centre National de la Recherche Scientifique (CNRS), France
+	CS Systeme d'Information (CSSI), France
+	Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
+	Universiteit van Amsterdam (UvA), Netherlands
+	University of Helsinki (UH.HIP), Finland
+	University of Bergen (UiB), Norway
+	Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
+
+	Configuration options for the GLite LB Common module
+	
+	Authors: Ales Krenek <ljocha@ics.muni.cz>
+	Version info: $Id$
+	Release: $Name$
+
+	Revision history:
+	$Log$
+	Revision 1.3  2004/06/23 00:33:21  dimeglio
+	Added globalprefix and lbprefix
+	
+	Revision 1.2  2004/06/22 22:49:08  dimeglio
+	Use of stage.abs.dir is required by -rpath
+	
+	Revision 1.1  2004/06/22 22:04:55  dimeglio
+	First version of this file
+	
+-->
+
+	<!-- ======================================================
+         Define extra properties here ...
+         ====================================================== -->
+        
+	<project name="LB Common configuration options">                                                                        
+		<target name="lbmakefiles">
+			<exec executable="ln" failonerror="true">
+				<arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
+			</exec>
+			<echo file="${module.build.dir}/Makefile.inc">
+top_srcdir=..
+builddir=build
+stagedir=${stage.abs.dir}
+distdir=${dist.dir}
+globalprefix=${global.prefix}
+lbprefix=${subsystem.prefix}
+package=${module.package.name}
+PREFIX=${install.dir}
+version=${module.version}
+glite_location=${with.glite.location}
+globus_prefix=${with.globus.prefix}
+globusflavour=${with.globus.dbg.nothr.flavor}
+expat_prefix=${with.expat.prefix}
+ares_prefix=${with.ares.prefix}
+			</echo>
+	    </target>
+	</project>
diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml
index b9ca4f1..4f56857 100755
--- a/org.glite.lb/build.xml
+++ b/org.glite.lb/build.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.4  2004/06/23 00:24:03  dimeglio
+	Added common and client modules
+	
 	Revision 1.3  2004/06/22 18:24:35  dimeglio
 	Added client interface module
 	
@@ -36,7 +39,7 @@
 		
 	<!-- =========================================
 		 Builds the GLite LB subsystem
-		 ========================================= -->
+	     ========================================= -->
 
 	<!-- Import baseline & user properties -->
 	<import file="../org.glite/project/baseline.properties.xml" />
@@ -51,14 +54,19 @@
 				
 	<!-- =========================================
 		 Load dependencies properties files (order is important) 
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${user.dependencies.file}"/>
 	<property file="${subsystem.dependencies.file}"/>
 	<property file="${global.dependencies.file}"/>	
+
+	<!-- =========================================
+                 Load configure options
+             ========================================= -->
+        <import file="${global.configure.options.file}"/>
 			
 	<!-- =========================================
 		 Import global task definitions
-		 ========================================= -->
+	     ========================================= -->
 	<import file="${global.taskdefs.file}" />
 	
 	<!-- =========================================
@@ -68,19 +76,18 @@
 		
 	<!-- =========================================
 		 Import targets 
-		 ========================================= -->
-	<import file="${global.targets-external-dependencies.file}"/>
-	<import file="${global.targets-envchecks.file}" />
+	     ========================================= -->
+	<import file="${global.targets-common.file}"/>
 	
 	<!-- =========================================
 		 Load version file 
-		 ========================================= -->
+	     ========================================= -->
 	<property file="${module.version.file}"/>
 		
 	
 	<!-- ===============================================
 		  Public common targets
-	  	 =============================================== -->
+	     =============================================== -->
 
 	<target name="envinfo">
 		<!-- Workspace paths -->
-- 
1.8.2.3