Compare commits

...

6 Commits
master ... 4.0

Author SHA1 Message Date
bchristiansen
60b8206550 checking in configure script compiled with autoconf 2.57. 2.61 broke things.
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@123 3f5042e3-fb1d-0410-be18-d6ca2573e517
2010-02-06 20:12:23 +00:00
bchristiansen
1820100f41 updated configure.ac because RMNMHOST didn't exist. Fixed mkdirs and commented out links in src/server/Makefile
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@122 3f5042e3-fb1d-0410-be18-d6ca2573e517
2009-10-14 18:34:54 +00:00
bchristiansen
01ee36a6fd removed unreferenced src/mcom/Makefile.in
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@121 3f5042e3-fb1d-0410-be18-d6ca2573e517
2009-10-14 14:38:56 +00:00
bchristiansen
21cbfb125c INCR: more version updates
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@118 3f5042e3-fb1d-0410-be18-d6ca2573e517
2009-09-10 18:08:06 +00:00
bchristiansen
7edd0ccb30 INCR: updated version information
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@117 3f5042e3-fb1d-0410-be18-d6ca2573e517
2009-09-10 18:00:30 +00:00
bchristiansen
189329a8e7 creating 4.0 branch from trunk
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/4.0@116 3f5042e3-fb1d-0410-be18-d6ca2573e517
2009-09-10 17:22:12 +00:00
20 changed files with 43 additions and 96 deletions

View File

@ -3,7 +3,7 @@ Moab Scheduling System - End User Open Source License
This software is based on the Moab Scheduling System which was created by
Cluster Resources, Inc.
Copyright (C) 1999-2007 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Scheduling System is a trademark of Cluster Resources, Inc.

View File

@ -1,5 +1,5 @@
# Makefile @PACKAGE_NAME@ v @PACKAGE_VERSION@
# Copyright: (C) 2002-2006 Cluster Resources, Inc, All Rights Reserved
# Copyright: (C) 2002-2009 Cluster Resources, Inc, All Rights Reserved
#
# Generated by configure

2
README
View File

@ -1,4 +1,4 @@
Maui Scheduler, Release 3.2.6 (patch 21)
Maui Scheduler, Release 4.0
This package contains the Maui Scheduler, an advance reservation based HPC
batch scheduler with extensive job management and resource optimization

24
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for maui 3.2.6p20.
# Generated by GNU Autoconf 2.57 for maui 4.0.
#
# Report bugs to <help@supercluster.org>.
#
@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='maui'
PACKAGE_TARNAME='maui'
PACKAGE_VERSION='3.2.6p20'
PACKAGE_STRING='maui 3.2.6p20'
PACKAGE_VERSION='4.0'
PACKAGE_STRING='maui 4.0'
PACKAGE_BUGREPORT='help@supercluster.org'
ac_unique_file="src/mcom/MConst.c"
@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS PBSCFLAGS PBSLDFLAGS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMSERVER AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS PBSCFLAGS PBSLDFLAGS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMHOST AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
ac_subst_files='rm_config ll_definitions sdr_definitions pbs_definitions sge_definitions lsf_definitions mx_definitions pcre_definitions'
# Initialize some variables set by options.
@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures maui 3.2.6p20 to adapt to many kinds of systems.
\`configure' configures maui 4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -837,7 +837,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of maui 3.2.6p20:";;
short | recursive ) echo "Configuration of maui 4.0:";;
esac
cat <<\_ACEOF
@ -938,7 +938,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
maui configure 3.2.6p20
maui configure 4.0
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@ -953,7 +953,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by maui $as_me 3.2.6p20, which was
It was created by maui $as_me 4.0, which was
generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@ -2601,7 +2601,7 @@ fi;
if test "$USEWAREHOUSE" != 'FALSE'; then
if test "$NMTYPE" = ''; then
RMNMPORT=" NMPORT=12321"
RMNMSERVER=" NMSERVER=$HOSTNAME"
RMNMHOST=" NMHOST=$HOSTNAME"
fi
fi
@ -6935,7 +6935,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by maui $as_me 3.2.6p20, which was
This file was extended by maui $as_me 4.0, which was
generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -6990,7 +6990,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
maui config.status 3.2.6p20
maui config.status 4.0
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -7224,7 +7224,7 @@ s,@RMSOCKETPROTOCOL@,$RMSOCKETPROTOCOL,;t t
s,@RMWIREPROTOCOL@,$RMWIREPROTOCOL,;t t
s,@RMVERSION@,$RMVERSION,;t t
s,@RMNMPORT@,$RMNMPORT,;t t
s,@RMNMSERVER@,$RMNMSERVER,;t t
s,@RMNMHOST@,$RMNMHOST,;t t
s,@AMTYPE@,$AMTYPE,;t t
s,@AMHOST@,$AMHOST,;t t
s,@AMPORT@,$AMPORT,;t t

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT(maui, 3.2.6p21, help@supercluster.org)
AC_INIT(maui, 4.0, help@supercluster.org)
AC_CONFIG_SRCDIR([src/mcom/MConst.c])
#AC_CONFIG_HEADER([config.h])
@ -350,7 +350,7 @@ AC_ARG_WITH(warehouse,
if test "$USEWAREHOUSE" != 'FALSE'; then
if test "$NMTYPE" = ''; then
RMNMPORT=" NMPORT=12321"
RMNMSERVER=" NMSERVER=$HOSTNAME"
RMNMHOST=" NMHOST=$HOSTNAME"
fi
fi
@ -361,7 +361,7 @@ AC_SUBST(RMSOCKETPROTOCOL)
AC_SUBST(RMWIREPROTOCOL)
AC_SUBST(RMVERSION)
AC_SUBST(RMNMPORT)
AC_SUBST(RMNMSERVER)
AC_SUBST(RMNMHOST)
# END RM CONFIG --------------------------------------

View File

@ -1,10 +1,10 @@
VERSION 3.2.6p21
VERSION 4.0
PACKAGE moab
AUTHOR Cluster Resources, Inc
FILETYPE Module
COPYRIGHT Copyright (C) 1999-2007 Cluster Resources, Inc
COPYRIGHT Copyright (C) 1999-2009 Cluster Resources, Inc
DISCLAIMER
-----------------------------------------------------------------------------
@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
This software is based on the Moab Scheduling System which was created by
Cluster Resources, Inc.
Copyright (C) 1999-2007 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Scheduling System is a trademark of Cluster Resources, Inc.

View File

@ -13,7 +13,7 @@ Moab Workload Manager - End User License
This product was created by Cluster Resources, Inc. and is protected by
copyright and patent law.
Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
are trademarks of Cluster Resources, Inc.

View File

@ -7,7 +7,7 @@
#include "moab-local.h"
#include "mcom.h"
#define MOAB_VERSION "3.2.6p20"
#define MOAB_VERSION "4.0"
/* elemental objects */

View File

@ -1 +1 @@
#define MSCHED_VERSION "maui-3.2.6p21"
#define MSCHED_VERSION "4.0"

View File

@ -1,5 +1,5 @@
# Makefile for libmcom
# Copyright 1999 - 2006 Cluster Resources, Inc, All Rights Reserved
# Copyright 1999 - 2009 Cluster Resources, Inc, All Rights Reserved
TOP =../..
BIN =$(TOP)/bin/

View File

@ -1,53 +0,0 @@
# Makefile for GridSuite: MCom 4.2.2
# Copyright 1999 - 2006 Cluster Resources, Inc, All Rights Reserved
prefix=$(ROOT)@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
libdir=@libdir@
includedir=@includedir@
mandir=@mandir@
CC=@CC@
CFLAGS=@CFLAGS@
SEED=@seed@
moab_defs=@moab_defs@ -D__MGRIDENABLE
moab_ip=@moab_ip@
moab_lp=@moab_lp@
moab_libs=@moab_libs@
LD=$(CC)
CP=cp
RM=rm -f
AR=ar rcs
TOP =../..
BIN =$(TOP)/bin
INC =$(TOP)/include
LIB =$(TOP)/lib
LP =-L$(LIB) $(moab_lp)
IP =-I$(INC) $(moab_ip)
DEFS =$(moab_defs)
LIBS = $(moab_libs)
LIBMCOM =$(LIB)/libmcom.a
OBJS =MSU.o MSec.o MXML.o MSSSI.o MConst.o MComm.o MTComm.o
DEPS =$(INC)/moab.h $(INC)/moab-proto.h $(INC)/mcom.h $(INC)/mg2.h
all: $(LIBMCOM)
.c.o: $(DEPS)
$(CC) $(CFLAGS) $(IP) $(DEFS) -c $<
$(LIBMCOM): $(OBJS)
$(AR) $(LIBMCOM) $(OBJS)
clean:
$(RM) *.o $(LIBMCOM)

View File

@ -1,10 +1,10 @@
VERSION 3.2.6p21
VERSION 4.0
PACKAGE moab
AUTHOR Cluster Resources, Inc
FILETYPE Module
COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
COPYRIGHT Copyright (C) 1999-2009 Cluster Resources, Inc
DISCLAIMER
-----------------------------------------------------------------------------
@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
This software is based on the Moab Scheduling System which was created by
Cluster Resources, Inc.
Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Scheduling System is a trademark of Cluster Resources, Inc.

View File

@ -13,7 +13,7 @@ Moab Workload Manager - End User License
This product was created by Cluster Resources, Inc. and is protected by
copyright and patent law.
Copyright (C) 1999-2005 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
are trademarks of Cluster Resources, Inc.

View File

@ -4902,7 +4902,7 @@ int MUShowCopy()
fprintf(stderr,"This software utilizes the Moab Scheduling Library, version %s\n",
MOAB_VERSION);
fprintf(stderr,"Copyright 2000-2006 Cluster Resources, Inc, All Rights Reserved\n");
fprintf(stderr,"Copyright 2000-2009 Cluster Resources, Inc, All Rights Reserved\n");
return(SUCCESS);
} /* END MUShowCopy() */

View File

@ -1,5 +1,5 @@
# Makefile for Moab 2.2.3
# Copyright 1999 - 2006 Cluster Resources Inc, All Rights Reserved
# Copyright 1999 - 2009 Cluster Resources Inc, All Rights Reserved
TOP =../..
BIN =$(TOP)/bin/

View File

@ -1,10 +1,10 @@
VERSION 3.2.6p21
VERSION 4.0
PACKAGE moab
AUTHOR Cluster Resources, Inc
FILETYPE Module
COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
COPYRIGHT Copyright (C) 1999-2009 Cluster Resources, Inc
DISCLAIMER
-----------------------------------------------------------------------------
@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
This software is based on the Moab Scheduling System which was created by
Cluster Resources, Inc.
Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Scheduling System is a trademark of Cluster Resources, Inc.

View File

@ -13,7 +13,7 @@ Moab Workload Manager - End User License
This product was created by Cluster Resources, Inc. and is protected by
copyright and patent law.
Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
Copyright (C) 1999-2009 Cluster Resources, Inc., all rights reserved.
Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
are trademarks of Cluster Resources, Inc.

View File

@ -1,5 +1,5 @@
# Makefile for Maui v3.2.6
# Copyright 1999 - 2006 Cluster Resources, Inc, All Rights Reserved
# Makefile for Maui 4.0
# Copyright 1999 - 2009 Cluster Resources, Inc, All Rights Reserved
TOP =../..
BIN =$(TOP)/bin
@ -47,8 +47,8 @@ CFLAGS = $(OSCCFLAGS)
all: $(MBINS)
install: all
mkdir -p $(INST_DIR)/{bin,sbin,include,lib}
mkdir -p $(MSCHED_HOME)/{log,traces,stats,spool,tools}
mkdir -p $(INST_DIR)/bin $(INST_DIR)/sbin $(INST_DIR)/include $(INST_DIR)/lib
mkdir -p $(MSCHED_HOME)/log $(MSCHED_HOME)/traces $(MSCHED_HOME)/stats $(MSCHED_HOME)/spool $(MSCHED_HOME)/tools
chmod 1777 $(MSCHED_HOME)/spool
@ -74,7 +74,7 @@ install: all
then cp $(TOP)/maui-private.cfg.dist $(MSCHED_HOME)/maui-private.cfg; \
fi
(cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)
# (cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)
uninstall:
rm -f $(INST_DIR)/include/moab.h

View File

@ -1062,7 +1062,7 @@ int ServerProcessArgs(
int ServerShowCopy()
{
fprintf(stderr,"Copyright 2000-2006 Cluster Resources, Inc, All Rights Reserved\n");
fprintf(stderr,"Copyright 2000-2009 Cluster Resources, Inc, All Rights Reserved\n");
fprintf(stderr," for the latest release, see http://clusterresources.com/maui\n");
fprintf(stderr,"This software includes the Maui Server Module, Copyright 1996 MHPCC, All Rights Reserved\n");

View File

@ -1,10 +1,10 @@
VERSION 3.2.6p21
VERSION 4.0
PACKAGE maui
AUTHOR Cluster Resources, Inc
FILETYPE Module
COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
COPYRIGHT Copyright (C) 1999-2009 Cluster Resources, Inc
DISCLAIMER
------------------------------------------------------------------------------