Module: xenomai-2.5
Branch: master
Commit: 027f2f1584741a2305039b0ac7f5b8b50904980a
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=027f2f1584741a2305039b0ac7f5b8b50904980a
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Feb 22 16:52:46 2010 +0100
scripts: add wrapper script to run standard Xenomai commands
Linux distributions or obvious naming conflicts may impose
non-standard locations for the Xenomai executables and scripts. This
patch introduces a simple "xeno" wrapper to be used to hide those
specifics when running Xenomai commands.
---
configure | 6 ++++--
configure.in | 2 ++
doc/man/Makefile.am | 2 +-
doc/man/Makefile.in | 11 +++++++----
doc/man/xeno.man.in | 24 ++++++++++++++++++++++++
scripts/Makefile.am | 2 +-
scripts/Makefile.in | 8 +++++---
scripts/xeno.in | 14 ++++++++++++++
8 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 13aee64..0c89b58 100755
--- a/configure
+++ b/configure
@@ -12880,11 +12880,11 @@ base=asm-generic
ac_config_links="$ac_config_links
src/include/$base/xenomai:$srcdir/include/$base"
-ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config scripts/xeno-load scripts/xeno-test src/Makefile
src/rtdk/Makefile src/skins/Makefile src/skins/common/Makefile
src/skins/posix/Makefile src/skins/native/Makefile src/skins/vxworks/Makefile
src/skins/psos+/Makefile src/skins/vrtx/Makefile src/skins/rtdm/Makefile
src/skins/rtai/Makefile src/skins/uitron/Makefile src/drvlib/Makefile
src/drvlib/analogy/Makefile src/include/Makefile src/testsuite/Makefile
src/testsuite/latency/Makefile src/testsuite/cyclic/Makefile
src/testsuite/switchtest/Makefile src/testsuite/irqbench/Makefile
src/testsuite/clocktest/Makefile src/testsuite/klatency/Makefile
src/testsuite/unit/Makefile src/testsuite/sigtest/Makefile src/utils/Makefile
src/utils/can/Makefile src/utils/analogy/Makefile src/utils/ps/Makefile
include/Makefile include/asm-generic/Makefile include/asm-generic/bits/Makefile
include/asm-blackfin/Makefile include/asm-blackfin/bits/Makefile
include/asm-x86/Makefile include/asm-x86/bits/Makefile
include/asm-powerpc/Makefile include/asm-powerpc/bits/Makefile
include/asm-arm/Makefile include/asm-arm/bits/Makefile
include/asm-nios2/Makefile include/asm-nios2/bits/Makefile
include/asm-sim/Makefile include/asm-sim/bits/Makefile include/native/Makefile
include/nucleus/Makefile include/posix/Makefile include/posix/sys/Makefile
include/psos+/Makefile include/rtai/Makefile include/rtdm/Makefile
include/analogy/Makefile include/uitron/Makefile include/vrtx/Makefile
include/vxworks/Makefile"
+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config scripts/xeno-load scripts/xeno-test scripts/xeno
src/Makefile src/rtdk/Makefile src/skins/Makefile src/skins/common/Makefile
src/skins/posix/Makefile src/skins/native/Makefile src/skins/vxworks/Makefile
src/skins/psos+/Makefile src/skins/vrtx/Makefile src/skins/rtdm/Makefile
src/skins/rtai/Makefile src/skins/uitron/Makefile src/drvlib/Makefile
src/drvlib/analogy/Makefile src/include/Makefile src/testsuite/Makefile
src/testsuite/latency/Makefile src/testsuite/cyclic/Makefile
src/testsuite/switchtest/Makefile src/testsuite/irqbench/Makefile
src/testsuite/clocktest/Makefile src/testsuite/klatency/Makefile
src/testsuite/unit/Makefile src/testsuite/sigtest/Makefile src/utils/Makefile
src/utils/can/Makefile src/utils/analogy/Makefile src/utils/ps/Makefile
include/Makefile include/asm-generic/Makefile include/asm-generic/bits/Makefile
include/asm-blackfin/Makefile include/asm-blackfin/bits/Makefile
include/asm-x86/Makefile include/asm-x86/bits/Makefile
include/asm-powerpc/Makefile include/asm-powerpc/bits/Makefile
include/asm-arm/Makefile include/asm-arm/bits/Makefile
include/asm-nios2/Makefile include/asm-nios2/bits/Makefile
include/asm-sim/Makefile include/asm-sim/bits/Makefile include/native/Makefile
include/nucleus/Makefile include/posix/Makefile include/posix/sys/Makefile
include/psos+/Makefile include/rtai/Makefile include/rtdm/Makefile
include/analogy/Makefile include/uitron/Makefile include/vrtx/Makefile
include/vxworks/Makefile"
if test \! x$XENO_MAYBE_DOCDIR = x ; then
- ac_config_files="$ac_config_files doc/Makefile doc/txt/Makefile
doc/man/Makefile doc/man/clocktest.man doc/man/cyclictest.man
doc/man/irqbench.man doc/man/irqloop.man doc/man/klatency.man
doc/man/latency.man doc/man/rtcanconfig.man doc/man/rtcanrecv.man
doc/man/rtcansend.man doc/man/switchbench.man doc/man/switchtest.man
doc/man/runinfo.man doc/man/xeno-config.man doc/man/xeno-info.man
doc/man/xeno-load.man doc/man/xeno-test.man doc/doxygen/Makefile
doc/doxygen/Doxyfile-common doc/doxygen/Doxyfile doc/doxygen/Doxyfile-native
doc/doxygen/Doxyfile-nucleus doc/doxygen/Doxyfile-posix
doc/doxygen/Doxyfile-rtdm doc/docbook/Makefile doc/docbook/catalog
doc/docbook/custom-stylesheets/Makefile
doc/docbook/custom-stylesheets/xsl/Makefile
doc/docbook/custom-stylesheets/xsl/common/Makefile
doc/docbook/custom-stylesheets/xsl/fo/Makefile
doc/docbook/custom-stylesheets/xsl/html/Makefile
doc/docbook/custom-stylesheets/xsl/html/chunk.xsl
doc/docbook/custom-stylesheets/xsl/html/onechunk.xsl
doc/docbook/xenomai/Makefile"
+ ac_config_files="$ac_config_files doc/Makefile doc/txt/Makefile
doc/man/Makefile doc/man/clocktest.man doc/man/cyclictest.man
doc/man/irqbench.man doc/man/irqloop.man doc/man/klatency.man
doc/man/latency.man doc/man/rtcanconfig.man doc/man/rtcanrecv.man
doc/man/rtcansend.man doc/man/switchbench.man doc/man/switchtest.man
doc/man/runinfo.man doc/man/xeno.man doc/man/xeno-config.man
doc/man/xeno-info.man doc/man/xeno-load.man doc/man/xeno-test.man
doc/doxygen/Makefile doc/doxygen/Doxyfile-common doc/doxygen/Doxyfile
doc/doxygen/Doxyfile-native doc/doxygen/Doxyfile-nucleus
doc/doxygen/Doxyfile-posix doc/doxygen/Doxyfile-rtdm doc/docbook/Makefile
doc/docbook/catalog doc/docbook/custom-stylesheets/Makefile
doc/docbook/custom-stylesheets/xsl/Makefile
doc/docbook/custom-stylesheets/xsl/common/Makefile
doc/docbook/custom-stylesheets/xsl/fo/Makefile
doc/docbook/custom-stylesheets/xsl/html/Makefile
doc/docbook/custom-stylesheets/xsl/html/chunk.xsl
doc/docbook/custom-stylesheets/xsl/html/onechunk.xsl
doc/docbook/xenomai/Makefile"
fi
@@ -13971,6 +13971,7 @@ do
"scripts/xeno-config") CONFIG_FILES="$CONFIG_FILES scripts/xeno-config" ;;
"scripts/xeno-load") CONFIG_FILES="$CONFIG_FILES scripts/xeno-load" ;;
"scripts/xeno-test") CONFIG_FILES="$CONFIG_FILES scripts/xeno-test" ;;
+ "scripts/xeno") CONFIG_FILES="$CONFIG_FILES scripts/xeno" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/rtdk/Makefile") CONFIG_FILES="$CONFIG_FILES src/rtdk/Makefile" ;;
"src/skins/Makefile") CONFIG_FILES="$CONFIG_FILES src/skins/Makefile" ;;
@@ -14040,6 +14041,7 @@ do
"doc/man/switchbench.man") CONFIG_FILES="$CONFIG_FILES
doc/man/switchbench.man" ;;
"doc/man/switchtest.man") CONFIG_FILES="$CONFIG_FILES
doc/man/switchtest.man" ;;
"doc/man/runinfo.man") CONFIG_FILES="$CONFIG_FILES doc/man/runinfo.man" ;;
+ "doc/man/xeno.man") CONFIG_FILES="$CONFIG_FILES doc/man/xeno.man" ;;
"doc/man/xeno-config.man") CONFIG_FILES="$CONFIG_FILES
doc/man/xeno-config.man" ;;
"doc/man/xeno-info.man") CONFIG_FILES="$CONFIG_FILES
doc/man/xeno-info.man" ;;
"doc/man/xeno-load.man") CONFIG_FILES="$CONFIG_FILES
doc/man/xeno-load.man" ;;
diff --git a/configure.in b/configure.in
index d160554..531243c 100644
--- a/configure.in
+++ b/configure.in
@@ -895,6 +895,7 @@ AC_CONFIG_FILES([ \
scripts/xeno-config \
scripts/xeno-load \
scripts/xeno-test \
+ scripts/xeno \
src/Makefile \
src/rtdk/Makefile \
src/skins/Makefile \
@@ -968,6 +969,7 @@ if test \! x$XENO_MAYBE_DOCDIR = x ; then
doc/man/switchbench.man \
doc/man/switchtest.man \
doc/man/runinfo.man \
+ doc/man/xeno.man \
doc/man/xeno-config.man \
doc/man/xeno-info.man \
doc/man/xeno-load.man \
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 5589978..493c861 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -2,6 +2,6 @@ man1_MANS = xeno-config.man xeno-info.man xeno-load.man
xeno-test.man \
clocktest.man cyclictest.man irqbench.man irqloop.man \
klatency.man latency.man rtcanconfig.man \
rtcanrecv.man rtcansend.man switchbench.man \
- switchtest.man
+ switchtest.man xeno.man
man5_MANS = runinfo.man
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 3c4eb60..a01d957 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -41,7 +41,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/rtcansend.man.in $(srcdir)/runinfo.man.in \
$(srcdir)/switchbench.man.in $(srcdir)/switchtest.man.in \
$(srcdir)/xeno-config.man.in $(srcdir)/xeno-info.man.in \
- $(srcdir)/xeno-load.man.in $(srcdir)/xeno-test.man.in
+ $(srcdir)/xeno-load.man.in $(srcdir)/xeno-test.man.in \
+ $(srcdir)/xeno.man.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
$(top_srcdir)/config/docbook.m4 \
@@ -58,8 +59,8 @@ CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h
CONFIG_CLEAN_FILES = clocktest.man cyclictest.man irqbench.man \
irqloop.man klatency.man latency.man rtcanconfig.man \
rtcanrecv.man rtcansend.man switchbench.man switchtest.man \
- runinfo.man xeno-config.man xeno-info.man xeno-load.man \
- xeno-test.man
+ runinfo.man xeno.man xeno-config.man xeno-info.man \
+ xeno-load.man xeno-test.man
SOURCES =
DIST_SOURCES =
man1dir = $(mandir)/man1
@@ -231,7 +232,7 @@ man1_MANS = xeno-config.man xeno-info.man xeno-load.man
xeno-test.man \
clocktest.man cyclictest.man irqbench.man irqloop.man \
klatency.man latency.man rtcanconfig.man \
rtcanrecv.man rtcansend.man switchbench.man \
- switchtest.man
+ switchtest.man xeno.man
man5_MANS = runinfo.man
all: all-am
@@ -290,6 +291,8 @@ switchtest.man: $(top_builddir)/config.status
$(srcdir)/switchtest.man.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
runinfo.man: $(top_builddir)/config.status $(srcdir)/runinfo.man.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+xeno.man: $(top_builddir)/config.status $(srcdir)/xeno.man.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
xeno-config.man: $(top_builddir)/config.status $(srcdir)/xeno-config.man.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
xeno-info.man: $(top_builddir)/config.status $(srcdir)/xeno-info.man.in
diff --git a/doc/man/xeno.man.in b/doc/man/xeno.man.in
new file mode 100644
index 0000000..ee36b7a
--- /dev/null
+++ b/doc/man/xeno.man.in
@@ -0,0 +1,24 @@
+'\" t
+.\" ** The above line should force tbl to be a preprocessor **
+.\" Man page for xeno
+.\"
+.\" Copyright (C) 2010 Roland Stigge <sti...@antcom.de>
+.\"
+.\" You may distribute under the terms of the GNU General Public
+.\" License as specified in the file COPYING that comes with the
+.\" Xenomai distribution.
+.\"
+.pc
+.TH CLOCKTEST 1 "2010-14-02" "@PACKAGE_VERSION@" "Xenomai"
+.SH NAME
+xeno \- Wrapper for Xenomai executables
+.SH SYNOPSIS
+xeno [xenomai command]
+.SH DESCRIPTION
+.B xeno
+is a wrapper script that hides distribution-specific installation
+prefixes when running standard Xenomai commands.
+.SH AUTHOR
+The wrapper script xeno and this manpage were initially written by
+Roland Stigge <sti...@antcom.de> for the Debian project but may be
+used elsewhere.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index bea9288..06afda9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
-bin_SCRIPTS=xeno-config xeno-load xeno-test xeno-info wrap-link.sh
+bin_SCRIPTS=xeno-config xeno-load xeno-test xeno-info xeno wrap-link.sh
install-exec-local:
@if test -r $(srcdir)/postinstall.sh ; then \
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 337801b..03e07d4 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -36,7 +36,7 @@ target_triplet = @target@
subdir = scripts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xeno-config.in $(srcdir)/xeno-load.in \
- $(srcdir)/xeno-test.in
+ $(srcdir)/xeno-test.in $(srcdir)/xeno.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
$(top_srcdir)/config/docbook.m4 \
@@ -50,7 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps)
$(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h
-CONFIG_CLEAN_FILES = xeno-config xeno-load xeno-test
+CONFIG_CLEAN_FILES = xeno-config xeno-load xeno-test xeno
am__installdirs = "$(DESTDIR)$(bindir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
@@ -216,7 +216,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-bin_SCRIPTS = xeno-config xeno-load xeno-test xeno-info wrap-link.sh
+bin_SCRIPTS = xeno-config xeno-load xeno-test xeno-info xeno wrap-link.sh
EXTRA_DIST = bootstrap prepare-kernel.sh xeno-info wrap-link.sh \
Kconfig.frag Modules.frag defconfig.frag \
help_from_kconfig.pl $(wildcard postinstall.sh)
@@ -259,6 +259,8 @@ xeno-load: $(top_builddir)/config.status
$(srcdir)/xeno-load.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
xeno-test: $(top_builddir)/config.status $(srcdir)/xeno-test.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+xeno: $(top_builddir)/config.status $(srcdir)/xeno.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff --git a/scripts/xeno.in b/scripts/xeno.in
new file mode 100644
index 0000000..d830a03
--- /dev/null
+++ b/scripts/xeno.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Wrapper script to hide distribution-specific installation
+# prefixes when running standard Xenomai commands.
+#
+# e.g. "xeno latency"
+#
+
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+BINDIR="@bindir@"
+unset prefix exec_prefix
+
+exec $BINDIR/$@
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
