Added config.xml file for use by OSCAR.

Makefile.am

@@ -29,7 +29,7 @@ pkginclude_HEADERS =		\
 	slurm/slurm_errno.h
 
 MAINTAINERCLEANFILES = 					\
-	aclocal.m4 config.guess 			\
+	aclocal.m4 config.guess config.xml		\
 	config.h.in config.sub configure install-sh 	\
 	ltconfig ltmain.sh missing mkinstalldirs 	\
 	slurm/slurm.h					\

NEWS

@@ -5,6 +5,7 @@ documents those changes that are of interest to users and admins.
 =============================
  -- Added etc/slurm.epilog.clean to kill processes initiated outside of 
     slurm when a user's last job on a node terminates.
+ -- Added config.xml file for use by OSCAR.
 
 * Changes in SLURM 0.6.0-pre3
 =============================

auxdir/slurm.m4

@@ -146,13 +146,13 @@ VERSION="`perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' $srcdir/META`"
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the project's version.])
 AC_SUBST(VERSION)
 
-MAJOR="`perl -ne 'print,exit if s/^\s*MAJOR:\s*(\S*).*/\1/i' $srcdir/META`"
-MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`"
-MICRO="`perl -ne 'print,exit if s/^\s*MICRO:\s*(\S*).*/\1/i' $srcdir/META`"
+SLURM_MAJOR="`perl -ne 'print,exit if s/^\s*MAJOR:\s*(\S*).*/\1/i' $srcdir/META`"
+SLURM_MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`"
+SLURM_MICRO="`perl -ne 'print,exit if s/^\s*MICRO:\s*(\S*).*/\1/i' $srcdir/META`"
 RELEASE="`perl -ne 'print,exit if s/^\s*RELEASE:\s*(\S*).*/\1/i' $srcdir/META`"
 
-if test "$MAJOR.$MINOR.$MICRO" != "$VERSION"; then
-    AC_MSG_ERROR([META information is inconsistent: $VERSION != $MAJOR.$MINOR.$MICRO!])
+if test "$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO" != "$VERSION"; then
+    AC_MSG_ERROR([META information is inconsistent: $VERSION != $SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO!])
 fi
 
 # Check to see if we're on an unstable branch (no prereleases yet)
@@ -163,17 +163,17 @@ if echo "$RELEASE" | grep -e "pre0" -e "UNSTABLE"; then
       DATE=`echo $RELEASE | cut -d. -f3`
    fi
    SLURM_RELEASE="unstable cvs build $DATE" 
-   SLURM_VERSION="$MAJOR.$MINOR ($SLURM_RELEASE)"
+   SLURM_VERSION="$SLURM_MAJOR.$SLURM_MINOR ($SLURM_RELEASE)"
 else
    SLURM_RELEASE="`echo $RELEASE | sed 's/^.*\.//'`"
-   SLURM_VERSION="$MAJOR.$MINOR.$MICRO"
+   SLURM_VERSION="$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO"
    test $RELEASE = "1" || SLURM_VERSION="$SLURM_VERSION-$SLURM_RELEASE"
 fi
-AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$MAJOR", 
+AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$SLURM_MAJOR", 
                    [Define the project's major version.])
-AC_DEFINE_UNQUOTED(SLURM_MINOR, "$MINOR",
+AC_DEFINE_UNQUOTED(SLURM_MINOR, "$SLURM_MINOR",
                    [Define the project's minor version.])
-AC_DEFINE_UNQUOTED(SLURM_MICRO, "$MICRO",
+AC_DEFINE_UNQUOTED(SLURM_MICRO, "$SLURM_MICRO",
                    [Define the project's micro version.])
 AC_DEFINE_UNQUOTED(RELEASE, "$RELEASE", [Define the project's release.])
 AC_DEFINE_UNQUOTED(SLURM_VERSION, "$SLURM_VERSION",

config.xml.in

+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE package SYSTEM "../package.dtd">
+<!--
+SLURM configuration file for use with OSCAR distribution
+http://oscar.openclusergroup.org/
+
+Copyright (C) 2005 The Regents of the University of California.
+Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+$Id$
+-->
+<oscar>
+  <name>SLURM: Simple Linux Utility for  Resource Management</name>
+
+  <version>
+    <major>@SLURM_MAJOR@</major>
+    <minor>@SLURM_MINOR@</minor>
+    <subversion>@SLURM_MICRO@</subversion>
+    <release>@RELEASE@</release>
+    <epoch>1</epoch>
+  </version>
+
+  <class>included</class>
+
+  <summary>SLURM: Simple Linux Utility for  Resource Management</summary>
+  <license>GNU General Public License</license>
+  <group>Applications/batch</group>
+  <packager>
+    <name>Morris Jette</name>
+    <email>jette1@llnl.gov</email>
+  </packager>
+
+  <description>The Simple Linux Utility for Resource Management (SLURM) is an 
+  open source, fault-tolerant, and highly scalable cluster management and job 
+  scheduling system for large and small Linux clusters. SLURM requires no 
+  kernel modifications for its operation and is relatively self-contained. 
+  As a cluster resource manager, SLURM has three key functions. First, it 
+  allocates exclusive and/or non-exclusive access to resources (compute nodes) 
+  to users for some duration of time so they can perform work. Second, it 
+  provides a framework for starting, executing, and monitoring work (normally 
+  a parallel job) on the set of allocated nodes. Finally, it arbitrates 
+  conflicting requests for resources by managing a queue of pending work.
+  </description>
+
+  <url>http://www.llnl.gov/linux/slurm</url>
+  <rpmlist>
+      <rpm>slurm</rpm>
+      <rpm>slurm-devel</rpm>
+      <rpm>slurm-auth-none</rpm>
+      <rpm>slurm-auth-munge</rpm>
+      <rpm>slurm-sched-wiki</rpm>
+      <rpm>slurm-switch-elan</rpm>
+  </rpmlist>
+
+<conflicts>
+  <name>torque</name>
+  <name>pbs</name>
+  <type>package</type>
+</conflicts>
+</oscar>

configure.ac

@@ -180,7 +180,8 @@ AC_DEFINE(WITH_LSD_NOMEM_ERROR_FUNC, 1, [Have definition of lsd_nomem_error()])
 
 dnl All slurm Makefiles:
 
-AC_CONFIG_FILES([Makefile 
+AC_CONFIG_FILES([Makefile
+		 config.xml 
 		 auxdir/Makefile
 		 src/Makefile 
 		 src/api/Makefile