From 9a5a914694636ddfd76a82d0ea35f3b5fd657620 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Fri, 31 Jan 2003 21:43:28 +0000
Subject: [PATCH] o more changes for "make rpm" target support. report
version as major.minor.micro(release)
---
META | 9 +++++----
Makefile.am | 18 +++++++++---------
configure.ac | 24 ++++++++++++++++++------
src/api/Makefile.am | 10 ++++++----
src/scancel/opt.c | 4 ++--
src/scontrol/scontrol.c | 2 +-
src/srun/opt.c | 2 +-
7 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/META b/META
index fcf7f4dd9a5..1e13d1a30e1 100644
--- a/META
+++ b/META
@@ -5,7 +5,8 @@
##
Meta: 1
Name: slurm
- Major: 0
- Minor: 1
- Version: 0.1
- Release: 1
+ Major: 0
+ Minor: 1
+ Micro: 0
+ Version: 0.1.0
+ Release: 0.pre1
diff --git a/Makefile.am b/Makefile.am
index c58ffe987de..70803c80fd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,16 @@ SUBDIRS = src testsuite doc
EXTRA_DIST = \
etc/slurm.conf.example \
etc/init.d.slurm \
- autogen.sh \
- Make-rpm.mk \
- slurm.spec \
- README \
- DISCLAIMER \
- COPYING \
- META \
- slurm
+ autogen.sh \
+ Make-rpm.mk \
+ slurm.spec \
+ README \
+ DISCLAIMER \
+ COPYING \
+ META
-nobase_include_HEADERS = \
+slurmincludedir=$(includedir)/slurm
+slurminclude_HEADERS = \
slurm/slurm.h \
slurm/slurm_errno.h
diff --git a/configure.ac b/configure.ac
index 9bdb4ad5968..b718689de25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+# $Id$
# This file is to be processed with autoconf to generate a configure script
dnl Prologue
@@ -25,23 +26,34 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the project's version.])
AC_SUBST(VERSION)
SLURM_MAJOR="`perl -ne 'print,exit if s/^\s*MAJOR:\s*(\S*).*/\1/i' $srcdir/META`"
-AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$SLURM_MAJOR", [Define the project's major version.])
+AC_DEFINE_UNQUOTED(SLURM_MAJOR, "$SLURM_MAJOR",
+ [Define the project's major version.])
AC_SUBST(SLURM_MAJOR)
SLURM_MINOR="`perl -ne 'print,exit if s/^\s*MINOR:\s*(\S*).*/\1/i' $srcdir/META`"
-AC_DEFINE_UNQUOTED(SLURM_MINOR, "$SLURM_MINOR", [Define the project's minor version.])
+AC_DEFINE_UNQUOTED(SLURM_MINOR, "$SLURM_MINOR",
+ [Define the project's minor version.])
AC_SUBST(SLURM_MINOR)
-#SLURM_VERSION="$SLURM_MAJOR.$SLURM_MINOR"
+SLURM_MICRO="`perl -ne 'print,exit if s/^\s*MICRO:\s*(\S*).*/\1/i' $srcdir/META`"
+AC_DEFINE_UNQUOTED(SLURM_MINOR, "$SLURM_MICRO",
+ [Define the project's minor version.])
+AC_SUBST(SLURM_MINOR)
-#VERSION=$SLURM_VERSION
-#AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define the project's version.])
-#AC_SUBST(VERSION)
RELEASE="`perl -ne 'print,exit if s/^\s*RELEASE:\s*(\S*).*/\1/i' $srcdir/META`"
AC_DEFINE_UNQUOTED(RELEASE, "$RELEASE", [Define the project's release.])
AC_SUBST(RELEASE)
+SLURM_RELEASE="`echo $RELEASE | sed -n 's/^.*\.//p'`"
+
+# Define the version string
+SLURM_VERSION="$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO$SLURM_RELEASE"
+AC_DEFINE_UNQUOTED(SLURM_VERSION, "$SLURM_VERSION",
+ [Define the project's version string.])
+AC_SUBST(SLURM_VERSION)
+
+
dnl Initialize Automake
dnl
AM_INIT_AUTOMAKE(slurm, $VERSION)
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 1493ef21378..a3fcb524cbb 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -45,10 +45,12 @@ libslurm_la_SOURCES = \
common_dir = $(top_builddir)/src/common
-libslurm_la_LIBADD = $(common_dir)/libcommon.la
-libslurm_la_LDFLAGS = -export-symbols $(srcdir)/libslurm.sym \
- -version-info $(current):$(rev):$(age)
-libslurm_la_DEPENDENCIES = $(srcdir)/libslurm.sym $(libslurm_la_LIBADD)
+libslurm_la_LIBADD = $(common_dir)/libcommon.la -lpthread
+
+libslurm_la_LDFLAGS = -export-symbols $(srcdir)/libslurm.sym \
+ -version-info $(current):$(rev):$(age)
+
+libslurm_la_DEPENDENCIES = $(srcdir)/libslurm.sym $(common_dir)/libcommon.la
force:
$(libslurm_la_LIBADD) : force
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index 25b99f18ab7..e16f8258690 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -90,7 +90,7 @@ struct poptOption options[] = {
"name of job's owner", "name"},
{"verbose", 'v', 0, 0, OPT_VERBOSE,
"verbose operation (multiple -v's increase verbosity)", },
- {"Version", 'V', POPT_ARG_NONE, NULL, OPT_VERSION,
+ {"version", 'V', POPT_ARG_NONE, NULL, OPT_VERSION,
"report the current version", },
POPT_AUTOHELP
POPT_TABLEEND
@@ -231,7 +231,7 @@ static uint16_t xlate_signal_name(const char *signal_name)
static void print_version (void)
{
- printf("%s %s\n", PACKAGE, VERSION);
+ printf("%s %s\n", PACKAGE, SLURM_VERSION);
}
/*
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 49752fcaba5..74b3450bd4d 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -883,7 +883,7 @@ _process_command (int argc, char *argv[])
"too many arguments for %s keyword\n",
argv[0]);
}
- printf ("%s Version %s\n", command_name, VERSION);
+ printf ("%s (%s %s)\n", command_name, PACKAGE, SLURM_VERSION);
}
else
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 305310e4ac4..1e89c7a19ad 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -357,7 +357,7 @@ int initialize_and_process_args(int argc, char *argv[])
static void _print_version(void)
{
- printf("%s %s\n", PACKAGE, VERSION);
+ printf("%s %s\n", PACKAGE, SLURM_VERSION);
}
/*
--
GitLab