Ack. Not tested to add anything to experimental and verify that it builds when --enable-experimental
Thanks Lennart > -----Original Message----- > From: Anders Widell > Sent: den 29 augusti 2017 13:18 > To: Hans Nordebäck <[email protected]>; Lennart Lund > <[email protected]> > Cc: [email protected]; Anders Widell > <[email protected]> > Subject: [PATCH 1/1] build: Add an experimental directory for new code and > features [#2563] > > Add an experimental directory where we can put code for testing purposes, > even > though it is not yet ready to be used in production enviromnets. The > experimental code is not built by default, and must be enabled by specifying > the > --enable-experimental option to the configure script. > --- > Makefile.am | 1 + > README | 1 + > configure.ac | 18 ++++++++++++++++++ > src/experimental/Makefile.am | 20 ++++++++++++++++++++ > src/experimental/README | 29 +++++++++++++++++++++++++++++ > 5 files changed, 69 insertions(+) > create mode 100644 src/experimental/Makefile.am > create mode 100644 src/experimental/README > > diff --git a/Makefile.am b/Makefile.am > index 26ee72cf4..7763f313c 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -154,6 +154,7 @@ dist_osaf_execbin_SCRIPTS += \ > include $(top_srcdir)/src/ais/Makefile.am > include $(top_srcdir)/src/base/Makefile.am > include $(top_srcdir)/src/osaf/Makefile.am > +include $(top_srcdir)/src/experimental/Makefile.am > include $(top_srcdir)/src/amf/Makefile.am > include $(top_srcdir)/src/ckpt/Makefile.am > include $(top_srcdir)/src/clm/Makefile.am > diff --git a/README b/README > index cb436eba8..13c0eb352 100644 > --- a/README > +++ b/README > @@ -534,6 +534,7 @@ available w.r.t enabling/disabling the build for a > particular OpenSAF service: > produced. > --disable-rpm-target disable support for the "make rpm" target > [default=no] > + --enable-experimental enable experimental code [default=no] > --enable-python enable the Python AIS bindings [default=yes] > --enable-java enable the Java AIS interface mapping [default=no] > --enable-am4j enable the AM4J agent [default=no] > diff --git a/configure.ac b/configure.ac > index dcc82cba2..74655ddce 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -171,6 +171,24 @@ AC_ARG_WITH([initscriptdir], > AC_SUBST([initscriptdir], ["$with_initscriptdir"]) > > # > +# Enable/disable experimental code > +# > +AC_MSG_CHECKING([whether to build experimental code]) > +AC_ARG_ENABLE([experimental], > + [AS_HELP_STRING([--enable-experimental], > + [enable experimental code [default=no]])], > + [], > + [enable_experimental=no]) > +AC_MSG_RESULT([$enable_experimental]) > + > +if test "$enable_experimental" = yes; then > + AC_DEFINE([HAVE_EXPERIMENTAL], 1, [Define if experimental code > is enabled]) > +fi > + > +AM_CONDITIONAL([ENABLE_EXPERIMENTAL], [test > "$enable_experimental" = yes]) > +AC_SUBST([EXPERIMENTAL_ENABLED], ["$enable_experimental"]) > + > +# > # Enable/disable the Python AIS bindings > # > AC_MSG_CHECKING([whether to enable the Python AIS bindings]) > diff --git a/src/experimental/Makefile.am b/src/experimental/Makefile.am > new file mode 100644 > index 000000000..1dd05784c > --- /dev/null > +++ b/src/experimental/Makefile.am > @@ -0,0 +1,20 @@ > +# -*- OpenSAF -*- > +# > +# Copyright Ericsson AB 2017 - All Rights Reserved. > +# > +# This program is distributed in the hope that it will be useful, but > +# WITHOUT ANY WARRANTY; without even the implied warranty of > MERCHANTABILITY > +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > licensed > +# under the GNU Lesser General Public License Version 2.1, February 1999. > +# The complete license can be accessed from the following location: > +# http://opensource.org/licenses/lgpl-license.php > +# See the Copying file included with the OpenSAF distribution for full > +# licensing terms. > +# > + > +EXTRA_DIST += \ > + src/experimental/README > + > +if ENABLE_EXPERIMENTAL > + > +endif > diff --git a/src/experimental/README b/src/experimental/README > new file mode 100644 > index 000000000..38bdaa72c > --- /dev/null > +++ b/src/experimental/README > @@ -0,0 +1,29 @@ > +# > +# -*- OpenSAF -*- > +# > +# Copyright Ericsson AB 2017 - All Rights Reserved. > +# > +# This program is distributed in the hope that it will be useful, but > +# WITHOUT ANY WARRANTY; without even the implied warranty of > MERCHANTABILITY > +# or FITNESS FOR A PARTICULAR PURPOSE. This file and program are > licensed > +# under the GNU Lesser General Public License Version 2.1, February 1999. > +# The complete license can be accessed from the following location: > +# http://opensource.org/licenses/lgpl-license.php > +# See the Copying file included with the OpenSAF distribution for full > +# licensing terms. > +# > + > +This directory contains experimental OpenSAF code and new features that > are not > +yet considered to be fully mature, and thus not recommended for use in a > +production environment. They are provided as "technology preview" or for > beta > +testing to anyone who might be interested. If and when a feature is > considered > +mature, it will be moved out of the experimental directory into the regular > +OpenSAF source code tree. > + > +By default, the experimental code is not built. To build the experimental > code > +in this directory and its subdirectories, you must provide the > +--enable-experimental option to the OpenSAF configure script. > + > +When adding new code into the experimental directory, please use an > appropriate > +subdirectory under the experimental directory, so that unrelated features > are > +not mixed in the same directory. > -- > 2.13.3 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
