[Orca-checkins] r295 - in trunk/orca: . data_gatherers data_gatherers/aix data_gatherers/hp
Blair Zajac
blair at orcaware.com
Tue Apr 6 21:31:35 PDT 2004
Author: blair
Date: Tue Apr 6 21:31:03 2004
New Revision: 295
Added:
trunk/orca/data_gatherers/aix/Makefile.in
trunk/orca/data_gatherers/aix/orca-aix-stat.pl.in
- copied, changed from r294, trunk/orca/data_gatherers/aix/orca-aix-stat.pl
trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl.in
- copied, changed from r294, trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl
trunk/orca/data_gatherers/hp/Makefile.in
trunk/orca/data_gatherers/hp/orca-hp-stat.pl.in
- copied, changed from r294, trunk/orca/data_gatherers/hp/orca-hp-stat.pl
Removed:
trunk/orca/data_gatherers/aix/orca-aix-stat.pl
trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl
trunk/orca/data_gatherers/hp/orca-hp-stat.pl
Modified:
trunk/orca/configure.in
trunk/orca/data_gatherers/Makefile.in
Log:
Integrate the new AIX and HP data gatherers into the Orca build and
install system.
* configure.in:
Take two new command line options, --disable-aixallator and
--disable-hpallator, which disable building the AIX and the HP data
gathering tools.
* data_gatherers/Makefile.in:
Descend into the aix and hp directories if instructed to.
* data_gatherers/aix/Makefile.in:
New file to build the AIX data gatherers.
* data_gatherers/hp/Makefile.in:
New file to build the HP data gatherer.
* data_gatherers/aix/orca-aix-stat.pl.in:
Renamed from data_gatherers/aix/orca-aix-stat.pl.
* data_gatherers/aix/orca-aixtsm-stat.pl.in:
Renamed from data_gatherers/aix/orca-aixtsm-stat.pl.
* data_gatherers/hp/orca-hp-stat.pl.in:
Renamed from data_gatherers/hp/orca-hp-stat.pl.
* data_gatherers/aix/orca-aix-stat.pl.in:
* data_gatherers/aix/orca-aixtsm-stat.pl.in:
* data_gatherers/hp/orca-hp-stat.pl.in:
Enable configure to perform variable substitutions on this file.
Use the COMPRESSOR variable determined by configure instead of a
hardwired path to gzip.
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Tue Apr 6 21:31:03 2004
@@ -217,6 +217,36 @@
)
AC_SUBST(INSTALL_LIB_RRDTOOL)
+BUILD_AIXALLATOR=yes
+AIXALLATOR_SUBDIR=aix
+AC_ARG_ENABLE(aixallator,
+ AC_HELP_STRING([--disable-aixallator],
+ [Do not enable building and installing aixallator]),
+ [
+ if test "$enableval" = no; then
+ BUILD_AIXALLATOR=no
+ AIXALLATOR_SUBDIR=
+ fi
+ ]
+)
+AC_SUBST(BUILD_AIXALLATOR)
+AC_SUBST(AIXALLATOR_SUBDIR)
+
+BUILD_HPALLATOR=yes
+HPALLATOR_SUBDIR=hp
+AC_ARG_ENABLE(hpallator,
+ AC_HELP_STRING([--disable-hpallator],
+ [Do not enable building and installing hpallator]),
+ [
+ if test "$enableval" = no; then
+ BUILD_HPALLATOR=no
+ HPALLATOR_SUBDIR=
+ fi
+ ]
+)
+AC_SUBST(BUILD_HPALLATOR)
+AC_SUBST(HPALLATOR_SUBDIR)
+
BUILD_ORCALLATOR=yes
ORCALLATOR_SUBDIR=orcallator
AC_ARG_ENABLE(orcallator,
@@ -529,6 +559,17 @@
# Generate the Makefiles and shell scripts with the
# variable substitutions.
#--------------------------------------------------------------------
+if test "$BUILD_AIXALLATOR" = yes; then
+ OUTPUT_AIXALLATOR="data_gatherers/aix/Makefile
+ data_gatherers/aix/orca-aix-stat.pl
+ data_gatherers/aix/orca-aixtsm-stat.pl"
+fi
+
+if test "$BUILD_HPALLATOR" = yes; then
+ OUTPUT_HPALLATOR="data_gatherers/hp/Makefile
+ data_gatherers/hp/orca-hp-stat.pl"
+fi
+
if test "$BUILD_ORCALLATOR" = yes; then
OUTPUT_ORCALLATOR="data_gatherers/orcallator/Makefile
data_gatherers/orcallator/orcallator.cfg
@@ -564,6 +605,8 @@
contrib/rotate_orca_graphs/Makefile
contrib/rotate_orca_graphs/rotate_orca_graphs.sh
data_gatherers/Makefile
+ $OUTPUT_HPALLATOR
+ $OUTPUT_AIXALLATOR
$OUTPUT_ORCALLATOR
$OUTPUT_ORCA_SERVICES
$OUTPUT_PROCALLATOR
Modified: trunk/orca/data_gatherers/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/Makefile.in (original)
+++ trunk/orca/data_gatherers/Makefile.in Tue Apr 6 21:31:03 2004
@@ -1,10 +1,14 @@
@SET_MAKE@
+AIXALLATOR_SUBDIR = @AIXALLATOR_SUBDIR@
+HPALLATOR_SUBDIR = @HPALLATOR_SUBDIR@
ORCALLATOR_SUBDIR = @ORCALLATOR_SUBDIR@
ORCA_SERVICES_SUBDIR = @ORCA_SERVICES_SUBDIR@
PROCALLATOR_SUBDIR = @PROCALLATOR_SUBDIR@
-SUBDIRS = $(ORCALLATOR_SUBDIR) \
+SUBDIRS = $(AIXALLATOR_SUBDIR) \
+ $(HPALLATOR_SUBDIR) \
+ $(ORCALLATOR_SUBDIR) \
$(ORCA_SERVICES_SUBDIR) \
$(PROCALLATOR_SUBDIR)
Added: trunk/orca/data_gatherers/aix/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/orca/data_gatherers/aix/Makefile.in Tue Apr 6 21:31:03 2004
@@ -0,0 +1,66 @@
+ at SET_MAKE@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+PERL_HEAD = @PERL_HEAD@
+RRD_DIR = @RRD_DIR@
+VAR_DIR = @VAR_DIR@
+RAW_ORCALLATOR_DIR = $(VAR_DIR)/orcallator
+
+BIN_PERL_SCRIPTS = orca-aix-stat orca-aixtsm-stat
+LIBEXEC_PERL_SCRIPTS =
+NOINST_PERL_SCRIPTS =
+PERL_SCRIPTS = $(BIN_PERL_SCRIPTS) \
+ $(LIBEXEC_PERL_SCRIPTS) \
+ $(NOINST_PERL_SCRIPTS)
+
+BIN_SHELL_SCRIPTS =
+LIBEXEC_SHELL_SCRIPTS =
+NOINST_SHELL_SCRIPTS =
+SHELL_SCRIPTS = $(BIN_SHELL_SCRIPTS) \
+ $(LIBEXEC_SHELL_SCRIPTS) \
+ $(NOINST_SHELL_SCRIPTS)
+
+TARGETS = $(PERL_SCRIPTS) \
+ $(SHELL_SCRIPTS)
+BIN_TARGETS = $(BIN_PERL_SCRIPTS) \
+ $(BIN_SHELL_SCRIPTS)
+LIBEXEC_TARGETS = $(LIBEXEC_PERL_SCRIPTS) \
+ $(LIBEXEC_SHELL_SCRIPTS)
+
+all: Makefile $(TARGETS)
+
+install: all
+ $(MKDIR) $(bindir)
+ @for file in $(BIN_TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
+
+clean:
+ $(RM) $(TARGETS)
+
+distclean: clean
+ $(RM) *.sh orca-aix-stat.pl orca-aixtsm-stat.pl Makefile
+
+.SUFFIXES: .pl .sh
+
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
+
+.sh:
+ cp $< $@
+ chmod 0755 $@
+
+Makefile: Makefile.in
+ cd ../.. && CONFIG_FILES=data_gatherers/aix/Makefile ./config.status
+
+orca-aix-stat.pl: orca-aix-stat.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/aix/orca-aix-stat.pl ./config.status
+
+orca-aixtsm-stat.pl: orca-aixtsm-stat.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/aix/orca-aixtsm-stat.pl ./config.status
Copied: trunk/orca/data_gatherers/aix/orca-aix-stat.pl.in (from r294, trunk/orca/data_gatherers/aix/orca-aix-stat.pl)
==============================================================================
--- trunk/orca/data_gatherers/aix/orca-aix-stat.pl (original)
+++ trunk/orca/data_gatherers/aix/orca-aix-stat.pl.in Tue Apr 6 21:31:03 2004
@@ -41,6 +41,8 @@
# $LastChangedBy$
# $LastChangedRevision$
+my $COMPRESS = '@COMPRESSOR@';
+
# Note: Execution speed is more important than cleanliness here.
# Explicitly set PATH to prevent odd problems if run manually.
@@ -540,7 +542,7 @@
}
close OUT;
- at args = ( "/usr/bin/gzip", "-f", "$stat_file" );
+ at args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
@@ -548,7 +550,7 @@
# This subroutine is called by the signal handler.
sub exit_nicely {
close OUT;
- @args = ( "/usr/bin/gzip", "-f", "$stat_file" );
+ @args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
}
Copied: trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl.in (from r294, trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl)
==============================================================================
--- trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl (original)
+++ trunk/orca/data_gatherers/aix/orca-aixtsm-stat.pl.in Tue Apr 6 21:31:03 2004
@@ -41,6 +41,8 @@
# $LastChangedBy$
# $LastChangedRevision$
+my $COMPRESS = '@COMPRESSOR@';
+
# Note: Execution speed is more important than cleanliness here.
# Explicitly set PATH to prevent odd problems if run manually.
@@ -616,7 +618,7 @@
}
close OUT;
- at args = ( "/usr/local/bin/gzip", "-f", "$stat_file" );
+ at args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
@@ -624,7 +626,7 @@
# This subroutine is called by the signal handler.
sub exit_nicely {
close OUT;
- @args = ( "/usr/local/bin/gzip", "-f", "$stat_file" );
+ @args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
}
Added: trunk/orca/data_gatherers/hp/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/orca/data_gatherers/hp/Makefile.in Tue Apr 6 21:31:03 2004
@@ -0,0 +1,63 @@
+ at SET_MAKE@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+INSTALL = @INSTALL@
+MKDIR = @MKDIR@
+PERL_HEAD = @PERL_HEAD@
+RRD_DIR = @RRD_DIR@
+VAR_DIR = @VAR_DIR@
+RAW_ORCALLATOR_DIR = $(VAR_DIR)/orcallator
+
+BIN_PERL_SCRIPTS = orca-hp-stat
+LIBEXEC_PERL_SCRIPTS =
+NOINST_PERL_SCRIPTS =
+PERL_SCRIPTS = $(BIN_PERL_SCRIPTS) \
+ $(LIBEXEC_PERL_SCRIPTS) \
+ $(NOINST_PERL_SCRIPTS)
+
+BIN_SHELL_SCRIPTS =
+LIBEXEC_SHELL_SCRIPTS =
+NOINST_SHELL_SCRIPTS =
+SHELL_SCRIPTS = $(BIN_SHELL_SCRIPTS) \
+ $(LIBEXEC_SHELL_SCRIPTS) \
+ $(NOINST_SHELL_SCRIPTS)
+
+TARGETS = $(PERL_SCRIPTS) \
+ $(SHELL_SCRIPTS)
+BIN_TARGETS = $(BIN_PERL_SCRIPTS) \
+ $(BIN_SHELL_SCRIPTS)
+LIBEXEC_TARGETS = $(LIBEXEC_PERL_SCRIPTS) \
+ $(LIBEXEC_SHELL_SCRIPTS)
+
+all: Makefile $(TARGETS)
+
+install: all
+ $(MKDIR) $(bindir)
+ @for file in $(BIN_TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
+
+clean:
+ $(RM) $(TARGETS)
+
+distclean: clean
+ $(RM) *.sh orca-hp-stat.pl Makefile
+
+.SUFFIXES: .pl .sh
+
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
+
+.sh:
+ cp $< $@
+ chmod 0755 $@
+
+Makefile: Makefile.in
+ cd ../.. && CONFIG_FILES=data_gatherers/hp/Makefile ./config.status
+
+orca-hp-stat.pl: orca-hp-stat.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/hp/orca-hp-stat.pl ./config.status
Copied: trunk/orca/data_gatherers/hp/orca-hp-stat.pl.in (from r294, trunk/orca/data_gatherers/hp/orca-hp-stat.pl)
==============================================================================
--- trunk/orca/data_gatherers/hp/orca-hp-stat.pl (original)
+++ trunk/orca/data_gatherers/hp/orca-hp-stat.pl.in Tue Apr 6 21:31:03 2004
@@ -94,6 +94,9 @@
#
#
#
+
+my $COMPRESS = '@COMPRESSOR@';
+
# Explicitly set PATH to prevent odd problems if run manually.
$ENV{PATH} = '/usr/bin:/etc:/usr/sbin:/usr/ucb:/sbin';
@@ -428,7 +431,7 @@
}
close OUT;
- at args = ( "gzip", "-f", "$stat_file" );
+ at args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
@@ -436,7 +439,7 @@
# This subroutine is called by the signal handler.
sub exit_nicely {
close OUT;
- @args = ( "gzip", "-f", "$stat_file" );
+ @args = ($COMPRESS, "-f", $stat_file);
system(@args);
exit 0;
}
More information about the Orca-checkins
mailing list