jra1.vdt.build.gridsite: new targets build-lib and install-lib

diff --git a/org.glite.lb/lb4vdt/patches/org.gridsite.core.patch b/org.glite.lb/lb4vdt/patches/org.gridsite.core.patch
index 545180b..610f91a 100644 (file)
--- a/org.glite.lb/lb4vdt/patches/org.gridsite.core.patch
+++ b/org.glite.lb/lb4vdt/patches/org.gridsite.core.patch
@@ -1,38 +1,75 @@
 Index: org.gridsite.core/src/Makefile
 ===================================================================
 RCS file: /cvs/jra1mw/org.gridsite.core/src/Makefile,v
-retrieving revision 1.48
-diff -u -r1.48 Makefile
---- org.gridsite.core/src/Makefile     18 Apr 2006 10:59:01 -0000      1.48
-+++ org.gridsite.core/src/Makefile     21 Apr 2006 14:14:53 -0000
-@@ -56,9 +56,9 @@
- # Build
- #
- 
--build: apidoc \
--       libgridsite.so.$(VERSION) libgridsite.a htcp mod_gridsite.so \
--       urlencode findproxyfile real-gridsite-admin.cgi gsexec \
-+build: \
-+       libgridsite.so.$(VERSION) libgridsite.a htcp \
-+       urlencode findproxyfile real-gridsite-admin.cgi \
+retrieving revision 1.53
+diff -u -r1.53 Makefile
+--- org.gridsite.core/src/Makefile     31 May 2006 11:25:33 -0000      1.53
++++ org.gridsite.core/src/Makefile     8 Jun 2006 15:42:50 -0000
+@@ -61,7 +61,7 @@
+        urlencode findproxyfile real-gridsite-admin.cgi gsexec \
         gridsite-copy.cgi
  
- build: libgridsite_globus.so.$(VERSION) libgridsite_globus.a
-@@ -226,7 +226,7 @@
+-build: libgridsite_globus.so.$(VERSION) libgridsite_globus.a
++build-lib: libgridsite_globus.so.$(VERSION) libgridsite_globus.a
+ 
+ # First, normal versions using system OpenSSL rather than Globus OpenSSL
+ 
+@@ -233,7 +233,8 @@
  # Install
  #
  
 -install: apidoc
-+install: 
++
++install: apidoc install-lib
        mkdir -p $(prefix)/include \
                   $(prefix)/lib \
                   $(prefix)/bin \
-@@ -273,8 +273,6 @@
-       ln -sf htcp $(prefix)/bin/htmv
-       ln -sf htcp $(prefix)/bin/htping
-       ln -sf htcp $(prefix)/bin/htfind
--      cp -f gsexec $(prefix)/sbin
--      cp -f mod_gridsite.so $(prefix)/lib/httpd/modules
+@@ -248,22 +249,6 @@
+       cp -f findproxyfile $(prefix)/bin
+       cp -f real-gridsite-admin.cgi $(prefix)/sbin
+       cp -f gridsite-copy.cgi $(prefix)/sbin
+-      cp -f  libgridsite.a $(prefix)/lib
+-      cp -f  libgridsite.so.$(PATCH_VERSION) $(prefix)/lib
+-      ln -sf libgridsite.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite.so
+-      ln -sf libgridsite.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite.so.$(MAJOR_VERSION)
+-      ln -sf libgridsite.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite.so.$(MINOR_VERSION)
+-      cp -f  libgridsite_globus.a $(prefix)/lib
+-      cp -f  libgridsite_globus.so.$(PATCH_VERSION) $(prefix)/lib
+-      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite_globus.so
+-      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite_globus.so.$(MAJOR_VERSION)
+-      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
+-                                 $(prefix)/lib/libgridsite_globus.so.$(MINOR_VERSION)
+       cp -f ../CHANGES ../README ../INSTALL ../LICENSE ../VERSION \
+                $(prefix)/share/doc/gridsite-$(PATCH_VERSION)
+       cp -f ../doc/*.html ../doc/*.conf ../doc/*.1 ../doc/*.8 ../doc/*.sh \
+@@ -284,6 +269,25 @@
+       cp -f gsexec $(prefix)/sbin
+       cp -f mod_gridsite.so $(prefix)/lib/httpd/modules
  
- #
- # Distributions
++install-lib:
++      mkdir -p $(prefix)/lib
++      cp -f  libgridsite.a $(prefix)/lib
++      cp -f  libgridsite.so.$(PATCH_VERSION) $(prefix)/lib
++      ln -sf libgridsite.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite.so
++      ln -sf libgridsite.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite.so.$(MAJOR_VERSION)
++      ln -sf libgridsite.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite.so.$(MINOR_VERSION)
++      cp -f  libgridsite_globus.a $(prefix)/lib
++      cp -f  libgridsite_globus.so.$(PATCH_VERSION) $(prefix)/lib
++      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite_globus.so
++      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite_globus.so.$(MAJOR_VERSION)
++      ln -sf libgridsite_globus.so.$(PATCH_VERSION) \
++                                 $(prefix)/lib/libgridsite_globus.so.$(MINOR_VERSION)
++
+ install-slashgrid: slashgrid
+       cp -f slashgrid $(prefix)/sbin
+       cp -f slashgrid.init $(RPM_BUILD_ROOT)/etc/rc.d/init.d/slashgrid

diff --git a/org.glite.lb/lb4vdt/scripts/org.gridsite.core.build b/org.glite.lb/lb4vdt/scripts/org.gridsite.core.build
index 060ada5..38258c5 100644 (file)
--- a/org.glite.lb/lb4vdt/scripts/org.gridsite.core.build
+++ b/org.glite.lb/lb4vdt/scripts/org.gridsite.core.build
@@ -5,7 +5,7 @@ set -e
 TOPDIR=${PWD}
 source ${LB4VDTDIR}/Makefile.inc
 cd org.gridsite.core/src
-make build OPENSSL_FLAGS=-I${globus_prefix}/include/gcc32 OPENSSL_LIBS=-L${globus_prefix}/lib FLAVOR_EXT=_gcc32
-make install prefix=${STAGEDIR} 
+make build-lib OPENSSL_FLAGS=-I${globus_prefix}/include/${nothrflavour} OPENSSL_LIBS=-L${globus_prefix}/lib FLAVOR_EXT=_${nothrflavour}
+make install-lib prefix=${STAGEDIR} 
 cd ${TOPDIR}