[gavia-ms-commit] r1288 - in branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise: . pkgdata

[commit at globus.org]

Author: andre
Date: 2009-07-30 15:31:16 -0500 (Thu, 30 Jul 2009)
New Revision: 1288

Modified:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/pkgdata/pkg_data_src.gpt.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
Log:
checkpoint commit to testing branch

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-30 19:00:47 UTC (rev 1287)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-30 20:31:16 UTC (rev 1288)
@@ -1,5 +1,5 @@
 AC_REVISION($Revision: 1.1.50.1 $)
-AC_INIT(globus-scheduler-provider-gavia.in)
+AC_INIT(gavia-resource-advertise.in)
 
 # checking for the GLOBUS_LOCATION
 
@@ -20,10 +20,11 @@
 AC_SUBST(GLOBUS_GID)
 
 # Extract the path of the gavia-resource-advertise given as argument.
-AC_ARG_WITH(gavia-resource-advertise-path,
-   [ --gavia-resource-advertise-path gavia-resource-advertise-path],
-   [GAVIA_RESOURCE_ADVERTISE_PATH=$withval],
-   [GAVIA_RESOURCE_ADVERTISE_PATH=''])
+AC_ARG_WITH(gavia-resource-advertise,
+            [ --with-gavia-resource-advertise=PATH],
+	    [GAVIA_RESOURCE_ADVERTISE_PATH=$withval],
+	    [GAVIA_RESOURCE_ADVERTISE_PATH=''])
+
 AC_SUBST(GAVIA_RESOURCE_ADVERTISE_PATH)
 
 # check for Condor
@@ -32,7 +33,7 @@
 if test "$CONDOR_STATUS" = "no" ; then
     AC_MSG_WARN("Cannot locate condor_status")
 fi
-CONDOR_LOCATION=dirname($CONDOR_STATUS)
+CONDOR_LOCATION=dirname $CONDOR_STATUS
 AC_SUBST(CONDOR_LOCATION)
 
 AC_ARG_WITH(condor-os,
@@ -152,7 +153,7 @@
     AC_MSG_ERROR("Cannot locate qsub")
 fi
 
-PBS_LOCATION=dirname($QSTAT)
+PBS_LOCATION=dirname $QSTAT
 AC_SUBST(PBS_LOCATION)
 
 AC_ARG_WITH(cluster,

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/pkgdata/pkg_data_src.gpt.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/pkgdata/pkg_data_src.gpt.in	2009-07-30 19:00:47 UTC (rev 1287)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/pkgdata/pkg_data_src.gpt.in	2009-07-30 20:31:16 UTC (rev 1288)
@@ -1,34 +1,35 @@
-<?xml   version= "1.0" encoding= "UTF-8" ?> 
-<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd" > 
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
 
-<gpt_package_metadata   Format_Version= "0.02" Name= "gavia_resource_advertise" > 
+<gpt_package_metadata Format_Version="0.02" Name="gavia_resource_advertise" >
 
-	<Aging_Version   Age= "0" Major= "0" Minor= "1" /> 
-	<Description >GAVIA Resource Advertise Component</Description> 
-	<Functional_Group >ResourceManagement</Functional_Group> 
-	<Version_Stability   Release= "Beta" /> 
-	<src_pkg > 
-	
-		<With_Flavors build= "no" /> 
-		 
-		 <Build_Environment > 
-		   <cflags >@GPT_CFLAGS@</cflags> 
-		   <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes> 
-		   <pkg_libs > </pkg_libs> 
-		   <external_libs >@GPT_EXTERNAL_LIBS@</external_libs> 
-		 </Build_Environment> 
-		 
-		 <Post_Install_Message > 
-		 </Post_Install_Message> 
-		 
-		 <Post_Install_Program > 
-		    setup-gavia-resource-advertise
-		 </Post_Install_Program> 
-		 
-		 <Setup   Name= "gavia_resource_advertise" > 
-		    <Aging_Version Age= "0" Major= "0" Minor= "1" /> 
-		 </Setup> 
-		 
-	</src_pkg> 
-	
-</gpt_package_metadata> 
+  <Aging_Version Age="0" Major="0" Minor="1" />
+  <Description >Gavia Resource Advertise Component</Description>
+  <Functional_Group >ResourceManagement</Functional_Group>
+  <Version_Stability Release="Beta" />
+
+  <src_pkg >
+
+    <With_Flavors build="no" />
+
+    <Build_Environment >
+      <cflags >@GPT_PKG_CFLAGS@</cflags>
+      <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>
+      <pkg_libs > </pkg_libs>
+      <external_libs >@GPT_EXTERNAL_LIBS@</external_libs>
+    </Build_Environment>
+
+    <Post_Install_Message >
+    </Post_Install_Message>
+
+    <Post_Install_Program >
+      setup-gavia-resource-advertise
+    </Post_Install_Program>
+
+    <Setup Name="gavia_resource_advertise" >
+      <Aging_Version Age="0" Major="0" Minor="1" />
+    </Setup>
+
+  </src_pkg>
+
+</gpt_package_metadata>

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-30 19:00:47 UTC (rev 1287)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-30 20:31:16 UTC (rev 1288)
@@ -27,7 +27,7 @@
 &usage if $help;
 
 my $metadata =
-    new Grid::GPT::Setup(package_name => "setup-gavia-resource-advertise");
+    new Grid::GPT::Setup(package_name => "gavia_resource_advertise");
 
 my $globusdir	= $ENV{GLOBUS_LOCATION};
 my $libexecdir	= "$globusdir/libexec";
@@ -44,7 +44,7 @@
     $c_opts .= " --with-condor-arch=$condor_arch";
 }
 
-$c_opts .= " --gavia-resource-advertise-path=$pgm_file";
+$c_opts .= " --with-gavia-resource-advertise=$pgm_file";
 
 print `./find-gavia-resource-advertise-tools $c_opts --cache-file=/dev/null`;