Modified to use myproxy from the repository if available

diff --git a/org.glite.security.proxyrenewal/Makefile b/org.glite.security.proxyrenewal/Makefile
index 6a386fe..422111c 100644 (file)
--- a/org.glite.security.proxyrenewal/Makefile
+++ b/org.glite.security.proxyrenewal/Makefile
@@ -1,3 +1,26 @@
+#
+# 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
+#
+# Top Makefile file for the GLite Security Proxyrenewal module
+#
+# Authors: Ales Krenek <ljocha@ics.muni.cz>
+# Version info: $Id$
+# Release: $Name$
+#
+# Revision history:
+# $Log
+#
+
 # defaults
 top_srcdir=.
 builddir=build
@@ -10,11 +33,12 @@ package=glite-security-proxyrenewal
 version=0.0.0
 PREFIX=/opt/glite
 
-glite_location=/opt/glite
+glite_location=$PREFIX
 globus_prefix=/opt/globus
+voms_prefix=/opt/glite
 nothrflavour=gcc32
 thrflavour=gcc32pthr
-myproxy_prefix=/software/myproxy-0.4
+myproxy_prefix=$globus_prefix
 
 -include Makefile.inc
 
@@ -26,6 +50,8 @@ GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour} \
 GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour} \
        -I${globus_prefix}/include/${thrflavour}/openssl
 
+MYPROXYINC:= -I${myproxy_prefix}/include/${nothrflavour}
+MYPROXYTHRINC:= -I${myproxy_prefix}/include/${thrflavour}
 
 DEBUG:=-g -O0
 
@@ -33,18 +59,18 @@ DEBUG:=-g -O0
 CFLAGS:= -DNOVOMS \
        ${DEBUG} \
        -DVOMS_INSTALL_PATH=\"${voms_prefix}\"\
-       -I${myproxy_prefix}/include \
+       ${MYPROXYINC} \
        -I${top_srcdir}/src -I${top_srcdir}/interface \
-       -I${stagedir}/include
+       -I${glite_location}/include
 
 GLOBUS_LIBS:=-L${globus_prefix}/lib \
        -lglobus_common_${nothrflavour} \
        -lssl_${nothrflavour}
 
-SSL_UTILS_LIB:=-L${stagedir}/lib -lglobus_ssl_utils
-MYPROXY_LIB:=-L${myproxy_prefix}/lib -lmyproxy
+SSL_UTILS_LIB:=-L${glite_location}/lib -lglobus_ssl_utils
+MYPROXY_LIB:=-L${myproxy_prefix}/lib -lmyproxy_${nothrflavour}
 
-JOBIDLIB:=-L${stagedir}/lib -lglite_wms_cjobid
+JOBIDLIB:=-L${glite_location}/lib -lglite_wms_cjobid
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} ${LDFLAGS}

diff --git a/org.glite.security.proxyrenewal/build.xml b/org.glite.security.proxyrenewal/build.xml
index caef0ba..4d75145 100755 (executable)
--- a/org.glite.security.proxyrenewal/build.xml
+++ b/org.glite.security.proxyrenewal/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.1.1.1  2004/07/09 10:16:25  akrenek
+       initial import
+       
        Revision 1.2  2004/07/07 09:24:57  akrenek
        thr/nonthr flavours used correctly
        
@@ -90,7 +93,7 @@
        
        <target name="localinit"
                description="Module specific initialization tasks">
-               <antcall target="lbmakefiles" />
+               <antcall target="secmakefiles" />
        </target>
                
        <target name="localcompile"

diff --git a/org.glite.security.proxyrenewal/project/configure.properties.xml b/org.glite.security.proxyrenewal/project/configure.properties.xml
index 53d3297..4122b9d 100644 (file)
--- a/org.glite.security.proxyrenewal/project/configure.properties.xml
+++ b/org.glite.security.proxyrenewal/project/configure.properties.xml
@@ -12,17 +12,22 @@
        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
+       Configuration options for the GLite Security Proxyrenewal module
        
        Authors: Ales Krenek <ljocha@ics.muni.cz>
+    Version info: $Id$
+    Release: $Name$
+
+    Revision history:
+    $Log$
 -->
 
        <!-- ======================================================
          Define extra properties here ...
          ====================================================== -->
         
-       <project name="LB Client configuration options">                                                                        
-               <target name="lbmakefiles">
+       <project name="Security Proxyrenewal configuration options">                                                                        
+               <target name="secmakefiles">
                        <exec executable="ln" failonerror="true">
                                <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
                        </exec>
@@ -39,6 +44,8 @@ glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
 thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}
+myproxy_prefix=${with.myproxy.prefix}
+voms_prefix=${with.glite.location}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.security.proxyrenewal/project/properties.xml b/org.glite.security.proxyrenewal/project/properties.xml
index aef3360..8823680 100755 (executable)
--- a/org.glite.security.proxyrenewal/project/properties.xml
+++ b/org.glite.security.proxyrenewal/project/properties.xml
@@ -1,12 +1,59 @@
 <?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
 
-<project name="Proxy renewal">
+       Common build properties file for the Glite Security Proxyrenewal component
+       
+       Authors: Ales Krenek <ljocha@ics.muni.cz>
+       Version info: $Id$
+       Release: $Name$ 
+       
+       Revision history:
+       $Log$
+-->
 
+<project name="Security Proxyrenewal component common properties">
+
+       <!-- Include build properties to allow overwriting 
+            of properties for subsystem                    -->
        <property file="build.properties" />    
+
+       <!-- ======================================================
+          Define corresponding subsystem properties
+                ====================================================== -->
+
+       <!-- Subsystem name -->
        <property name="subsystem.name" value="${security.subsystem.name}"/>
+               
+       <!-- Subsystem prefix -->
        <property name="subsystem.prefix" value="${security.subsystem.prefix}"/>
-       <property name="component.prefix" value="proxyrenewal" />
 
+       <!-- ======================================================
+          Define component properties
+                ====================================================== -->
+                               
+       <!-- Component name prefix -->
+       <property name="component.prefix" value="proxyrenewal" />
+                       
+       <!-- ======================================================
+          Define general component properties
+                ====================================================== -->
+       
        <import file="${component.general.properties.file}" />
-
-</project>
+                                               
+       <!-- ======================================================
+                Define extra properties here ...
+                ====================================================== -->
+                
+                                                               
+</project>
\ No newline at end of file