Permalink
Browse files

- update makefile/configure scripts for tsung-plotter (TSUN-89)

- set vsn to 1.3.1a

SVN Revision: 909
  • Loading branch information...
1 parent fb11e0f commit e5674593f6d02c08c9da0a25cc7d89373cdd262d @nniclausse nniclausse committed Oct 15, 2008
Showing with 262 additions and 26 deletions.
  1. +26 −8 Makefile.in
  2. +49 −0 acinclude.m4
  3. +14 −0 aclocal.m4
  4. +77 −11 configure
  5. +6 −0 configure.in
  6. +77 −0 src/tsung-plotter/http.plots.en.conf
  7. +11 −6 src/tsung-plotter/{tsplot.py → tsplot.py.in}
  8. +1 −0 tsung.spec.in
  9. +1 −1 vsn.mk
View
@@ -24,6 +24,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
datadir=@datadir@
+datarootdir=@datarootdir@
TEMPLATES_SUBDIR=@TEMPLATES_SUBDIR@
CONFIGURE_DEPENDENCIES=@CONFIGURE_DEPENDENCIES@
@@ -69,7 +70,8 @@ endif
# installation path
BINDIR = $(bindir)
-LIBDIR = $(libdir)/tsung/bin/
+LIBDIR = $(libdir)/tsung/
+TOOLS_BINDIR = $(LIBDIR)/bin
CONFDIR = $(datadir)/doc/tsung/examples
SHARE_DIR = $(datadir)/tsung/
TEMPLATES_DIR = $(datadir)/$(TEMPLATES_SUBDIR)
@@ -106,9 +108,15 @@ TEST_CONFFILE = $(basename $(TEST_CONFFILE_SRC))
USERMANUAL = doc/user_manual.html doc/IDXDOC.css
USERMANUAL_IMG = $(wildcard doc/images/*.png)
USERMANUAL_SRC = doc/user_manual.tex
+MANPAGES = $(wildcard doc/*.1)
PERL_SCRIPTS_SRC = $(wildcard $(ESRC)/*.pl.in)
PERL_SCRIPTS = $(basename $(PERL_SCRIPTS_SRC))
+PYTHON_SCRIPTS_SRC = $(wildcard $(ESRC)/tsung-plotter/*.py.in)
+PYTHON_SCRIPTS = $(basename $(PYTHON_SCRIPTS_SRC))
+TSUNG_PLOTTER_LIB= $(wildcard $(ESRC)/tsung-plotter/tsung/*.py)
+TSUNG_PLOTTER_CONF= $(wildcard $(ESRC)/tsung-plotter/tsung/*.conf) $(wildcard $(ESRC)/tsung-plotter/*.conf)
+
TARGET = $(addsuffix .beam, $(basename \
$(addprefix $(EBIN)/, $(notdir $(SRC)))))
LIB_TARGET = $(addsuffix .beam, $(basename \
@@ -147,12 +155,12 @@ BUILD_OPTIONS_DOT = $(subst $(PWD)/temp/,./,$(BUILD_OPTIONS))
BUILD_OPTIONS_FILE = ./BUILD_OPTIONS
-DIST_COMMON=Makefile.in $(CONFFILE_SRC) $(PERL_SCRIPTS_SRC) tsung.sh.in tsung.spec.in
+DIST_COMMON=Makefile.in $(CONFFILE_SRC) $(PERL_SCRIPTS_SRC) $(PYTHON_SCRIPTS_SRC) tsung.sh.in tsung.spec.in
.PHONY: doc
-tsung: Makefile config.status $(PERL_SCRIPTS) tsung.sh tsung.spec $(TARGET) $(RECORDER_TARGET) $(CONTROLLER_TARGET) $(LIB_TARGET)
+tsung: Makefile config.status $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) tsung.sh tsung.spec $(TARGET) $(RECORDER_TARGET) $(CONTROLLER_TARGET) $(LIB_TARGET)
buildtest: $(TEST_TARGET)
@@ -189,7 +197,7 @@ deb:
clean:
-cd priv && rm -f $(shell ls priv | grep -v builder\.erl| grep -v CVS) && cd ..
-rm -f $(TARGET) $(TMP) $(BUILD_OPTIONS_FILE) builder.beam
- -rm -f $(TGT_APPFILES) tsung.sh $(PERL_SCRIPTS) $(CONFFILE)
+ -rm -f $(TGT_APPFILES) tsung.sh $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(CONFFILE)
-rm -f ebin/*.beam tsung.sh tsung.spec tsung.xml
install: doc boot install_recorder install_controller $(CONFFILE)
@@ -199,7 +207,7 @@ install: doc boot install_recorder install_controller $(CONFFILE)
install -d $(TARGETDIR)/ebin
install -d $(TARGETDIR)/src
install -d $(TARGETDIR)/include
- install -d $(LIBDIR)/
+ install -d $(TOOLS_BINDIR)/
install -d $(BINDIR)/
install -m 0644 $(INC_FILES) $(TARGETDIR)/include/
@@ -218,14 +226,20 @@ install: doc boot install_recorder install_controller $(CONFFILE)
# install the man page & user's manual
install -d $(MAN_DIR)
- install -m 0644 doc/tsung.1 $(MAN_DIR)
+ install -m 0644 $(MANPAGES) $(MAN_DIR)
install -d $(DOC_DIR)/images
install -m 0644 $(USERMANUAL) $(DOC_DIR)
install -m 0644 $(USERMANUAL_IMG) $(DOC_DIR)/images
# create startup script
install -m 0755 tsung.sh $(SCRIPT)
- install -m 0755 $(PERL_SCRIPTS) $(LIBDIR)/
+ install -m 0755 $(PERL_SCRIPTS) $(TOOLS_BINDIR)
+# tsung-plotter
+ install -m 0755 $(PYTHON_SCRIPTS) $(TOOLS_BINDIR)
+ install -d $(LIBDIR)/tsung_plotter
+ install -d $(SHARE_DIR)/tsung_plotter
+ install -m 0644 $(TSUNG_PLOTTER_LIB) $(LIBDIR)/tsung_plotter
+ install -m 0644 $(TSUNG_PLOTTER_CONF) $(SHARE_DIR)/tsung_plotter
install -d $(CONFDIR)
install -m 0644 $(CONFFILE) $(CONFDIR)/
@@ -327,6 +341,9 @@ Makefile: Makefile.in config.status
%.pl: %.pl.in vsn.mk
@$(SHELL) ./config.status --file=$@
+%.py: %.py.in vsn.mk
+ @$(SHELL) ./config.status --file=$@
+
%.spec: %.spec.in vsn.mk
@$(SHELL) ./config.status --file=$@
@@ -358,7 +375,8 @@ release: Makefile tsung.spec doc
COPYING README LISEZMOI TODO $(CONFFILE_SRC) $(TEST_CONFFILE_SRC) \
priv/builder.erl tsung.sh.in vsn.mk src/test/*.csv src/test/*.txt \
$(DEBIAN) $(PERL_SCRIPTS_SRC) CONTRIBUTORS CHANGES \
- configure configure.in config.guess config.sub Makefile.in \
+ $(PYTHON_SCRIPTS_SRC) $(TSUNG_PLOTTER_CONF) $(TSUNG_PLOTTER_LIB)\
+ configure configure.in config.guess *.m4 config.sub Makefile.in \
install-sh tsung.spec.in tsung.spec
tar -C $(distdir) -zxf tmp.tgz
mkdir $(distdir)/ebin
View
@@ -0,0 +1,49 @@
+dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+ EXP_VAR=[$1]
+ FROM_VAR=[$2]
+
+ dnl first expand prefix and exec_prefix if necessary
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
+
+ dnl if no prefix given, then use /usr/local, the default prefix
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ dnl if no exec_prefix given, then use prefix
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+
+ full_var="$FROM_VAR"
+ dnl loop until it doesn't change anymore
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ dnl clean up
+ full_var=$new_full_var
+ AC_SUBST([$1], "$full_var")
+
+ dnl restore prefix and exec_prefix
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+])
View
@@ -0,0 +1,14 @@
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([acinclude.m4])
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tsung 1.3.0.
+# Generated by GNU Autoconf 2.61 for tsung 1.3.1a.
#
# Report bugs to <tsung-users@process-one.net>.
#
@@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='tsung'
PACKAGE_TARNAME='tsung'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='tsung 1.3.0'
+PACKAGE_VERSION='1.3.1a'
+PACKAGE_STRING='tsung 1.3.1a'
PACKAGE_BUGREPORT='tsung-users@process-one.net'
ac_unique_file="src/tsung/tsung.erl"
@@ -641,6 +641,8 @@ SET_MAKE
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+EXPANDED_LIBDIR
+EXPANDED_SHAREDIR
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1152,7 +1154,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 tsung 1.3.0 to adapt to many kinds of systems.
+\`configure' configures tsung 1.3.1a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1213,7 +1215,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tsung 1.3.0:";;
+ short | recursive ) echo "Configuration of tsung 1.3.1a:";;
esac
cat <<\_ACEOF
@@ -1291,7 +1293,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tsung configure 1.3.0
+tsung configure 1.3.1a
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1307,7 +1309,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tsung $as_me 1.3.0, which was
+It was created by tsung $as_me 1.3.1a, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -3010,7 +3012,68 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-ac_config_files="$ac_config_files Makefile tsung.spec tsung.sh examples/*.xml src/tsung_stats.pl src/log2tsung.pl src/tsung_controller/tsung_controller.app.src src/tsung_recorder/tsung_recorder.app.src src/tsung/tsung.app.src"
+
+ EXP_VAR=EXPANDED_LIBDIR
+ FROM_VAR="$libdir/tsung"
+
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
+
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+
+ full_var="$FROM_VAR"
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ full_var=$new_full_var
+ EXPANDED_LIBDIR="$full_var"
+
+
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+
+{ echo "$as_me:$LINENO: Storing library files in $EXPANDED_LIBDIR" >&5
+echo "$as_me: Storing library files in $EXPANDED_LIBDIR" >&6;}
+
+ EXP_VAR=EXPANDED_SHAREDIR
+ FROM_VAR="$datadir/tsung"
+
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
+
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+
+ full_var="$FROM_VAR"
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ full_var=$new_full_var
+ EXPANDED_SHAREDIR="$full_var"
+
+
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+
+{ echo "$as_me:$LINENO: Storing data files in $EXPANDED_SHAREDIR" >&5
+echo "$as_me: Storing data files in $EXPANDED_SHAREDIR" >&6;}
+
+ac_config_files="$ac_config_files Makefile tsung.spec tsung.sh examples/*.xml src/tsung_stats.pl src/tsung-plotter/tsplot.py src/log2tsung.pl src/tsung_controller/tsung_controller.app.src src/tsung_recorder/tsung_recorder.app.src src/tsung/tsung.app.src"
cat >confcache <<\_ACEOF
@@ -3439,7 +3502,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tsung $as_me 1.3.0, which was
+This file was extended by tsung $as_me 1.3.1a, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3482,7 +3545,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tsung config.status 1.3.0
+tsung config.status 1.3.1a
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -3586,6 +3649,7 @@ do
"tsung.sh") CONFIG_FILES="$CONFIG_FILES tsung.sh" ;;
"examples/*.xml") CONFIG_FILES="$CONFIG_FILES examples/*.xml" ;;
"src/tsung_stats.pl") CONFIG_FILES="$CONFIG_FILES src/tsung_stats.pl" ;;
+ "src/tsung-plotter/tsplot.py") CONFIG_FILES="$CONFIG_FILES src/tsung-plotter/tsplot.py" ;;
"src/log2tsung.pl") CONFIG_FILES="$CONFIG_FILES src/log2tsung.pl" ;;
"src/tsung_controller/tsung_controller.app.src") CONFIG_FILES="$CONFIG_FILES src/tsung_controller/tsung_controller.app.src" ;;
"src/tsung_recorder/tsung_recorder.app.src") CONFIG_FILES="$CONFIG_FILES src/tsung_recorder/tsung_recorder.app.src" ;;
@@ -3710,11 +3774,13 @@ SET_MAKE!$SET_MAKE$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+EXPANDED_LIBDIR!$EXPANDED_LIBDIR$ac_delim
+EXPANDED_SHAREDIR!$EXPANDED_SHAREDIR$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
@@ -97,12 +97,18 @@ AC_SUBST(TEMPLATES_SUBDIR,[tsung/templates])
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AS_AC_EXPAND(EXPANDED_LIBDIR, "$libdir/tsung")
+AC_MSG_NOTICE(Storing library files in $EXPANDED_LIBDIR)
+AS_AC_EXPAND(EXPANDED_SHAREDIR, "$datadir/tsung")
+AC_MSG_NOTICE(Storing data files in $EXPANDED_SHAREDIR)
+
AC_CONFIG_FILES([\
Makefile \
tsung.spec \
tsung.sh \
examples/*.xml \
src/tsung_stats.pl \
+ src/tsung-plotter/tsplot.py \
src/log2tsung.pl \
src/tsung_controller/tsung_controller.app.src \
src/tsung_recorder/tsung_recorder.app.src \
Oops, something went wrong.

0 comments on commit e567459

Please sign in to comment.