You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/08/01 18:07:42 UTC
[1/2] git commit: updated refs/heads/1867-feature-plugins to 373b4ee
Updated Branches:
refs/heads/1867-feature-plugins 5f8bf0e7c -> 373b4ee8b
teach `couch-config` `--erlang-version`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/12ca531f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/12ca531f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/12ca531f
Branch: refs/heads/1867-feature-plugins
Commit: 12ca531f2860e607c720754e71b54c21eedb490e
Parents: 5f8bf0e
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Aug 1 17:57:36 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Aug 1 17:57:36 2013 +0200
----------------------------------------------------------------------
bin/Makefile.am | 2 ++
bin/couch-config.tpl.in | 5 +++++
bin/erlang-version.escript | 3 +++
configure.ac | 6 ++++++
license.skip | 1 +
5 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/12ca531f/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c1913d0..65f9ab5 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -95,6 +95,7 @@ couch-config: couch-config.tpl
-e "s|%package_author_name%|@package_author_name@|g" \
-e "s|%package_name%|@package_name@|g" \
-e "s|%version%|@version@|g" \
+ -e "s|%erlangversion%|@erlangversion@|g" \
-e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
$@ < $<
chmod +x $@
@@ -118,6 +119,7 @@ couch-config_dev: couch-config.tpl
-e "s|%package_author_name%|@package_author_name@|g" \
-e "s|%package_name%|@package_name@|g" \
-e "s|%version%|@version@|g" \
+ -e "s|%erlangversion%|@erlangversion@|g" \
-e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
$@ < $<
chmod +x $@
http://git-wip-us.apache.org/repos/asf/couchdb/blob/12ca531f/bin/couch-config.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couch-config.tpl.in b/bin/couch-config.tpl.in
index 22ae548..50b5724 100644
--- a/bin/couch-config.tpl.in
+++ b/bin/couch-config.tpl.in
@@ -22,6 +22,7 @@ viewdir="%localstatelibdir%"
confdir="%localconfdir%"
urifile="%localstaterundir%/couch.uri"
logdir="%localstatelogdir%"
+erlangversion="%erlangversion%"
version () {
cat << EOF
@@ -60,6 +61,7 @@ Options:
--log-dir log directory
--uri-file daemon sockets file
--couch-version version of Apache CouchDB
+ --erlang-version version of Erlang that CouchDB was built with
--version version of $basename
--help Print usage
@@ -108,6 +110,9 @@ do
--couch-version)
echo $couchversion
;;
+ --erlang-version)
+ echo $erlangversion
+ ;;
--version)
version
exit 0
http://git-wip-us.apache.org/repos/asf/couchdb/blob/12ca531f/bin/erlang-version.escript
----------------------------------------------------------------------
diff --git a/bin/erlang-version.escript b/bin/erlang-version.escript
new file mode 100644
index 0000000..66aae1c
--- /dev/null
+++ b/bin/erlang-version.escript
@@ -0,0 +1,3 @@
+
+main(_) ->
+ io:format("~s~n", [erlang:system_info(otp_release)]).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/12ca531f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 88f94f7..8a75a78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ else
fi
AC_PATH_PROG([ERL], [erl])
+AC_PATH_PROG([ESCRIPT], [escript])
AS_IF([test x${ERL} = x], [
AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
@@ -648,6 +649,9 @@ else
fi
fi
+ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript"
+erlangversion=`${ERL_VERSION_COMMAND}`
+
AC_ARG_VAR([ERL], [path to the `erl' executable])
AC_ARG_VAR([ERLC], [path to the `erlc' executable])
@@ -686,6 +690,8 @@ AC_SUBST([locallibdir], [${libdir}/${package_identifier}])
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
+AC_SUBST([erlangversion], [${erlangversion}])
+
# On Windows we install directly into our erlang distribution.
if test x${IS_WINDOWS} = xTRUE; then
http://git-wip-us.apache.org/repos/asf/couchdb/blob/12ca531f/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index cd0468e..6bf64a3 100644
--- a/license.skip
+++ b/license.skip
@@ -24,6 +24,7 @@
^bin/Makefile.in
^bin/couchdb.1
^bin/couchjs.1
+^bin/erlang-version.escript
^build-aux/.*
^config..*
^configure
[2/2] git commit: updated refs/heads/1867-feature-plugins to 373b4ee
Posted by ja...@apache.org.
teach `couch-config` `--erl-bin`
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/373b4ee8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/373b4ee8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/373b4ee8
Branch: refs/heads/1867-feature-plugins
Commit: 373b4ee8b328a187808eb337ad4f0561bf50d773
Parents: 12ca531
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Aug 1 18:06:28 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Aug 1 18:06:28 2013 +0200
----------------------------------------------------------------------
bin/Makefile.am | 2 ++
bin/couch-config.tpl.in | 5 +++++
configure.ac | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/373b4ee8/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 65f9ab5..5d722ac 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -96,6 +96,7 @@ couch-config: couch-config.tpl
-e "s|%package_name%|@package_name@|g" \
-e "s|%version%|@version@|g" \
-e "s|%erlangversion%|@erlangversion@|g" \
+ -e "s|%erlangbin%|@erlangbin@|g" \
-e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
$@ < $<
chmod +x $@
@@ -120,6 +121,7 @@ couch-config_dev: couch-config.tpl
-e "s|%package_name%|@package_name@|g" \
-e "s|%version%|@version@|g" \
-e "s|%erlangversion%|@erlangversion@|g" \
+ -e "s|%erlangbin%|@erlangbin@|g" \
-e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
$@ < $<
chmod +x $@
http://git-wip-us.apache.org/repos/asf/couchdb/blob/373b4ee8/bin/couch-config.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couch-config.tpl.in b/bin/couch-config.tpl.in
index 50b5724..dee337d 100644
--- a/bin/couch-config.tpl.in
+++ b/bin/couch-config.tpl.in
@@ -23,6 +23,7 @@ confdir="%localconfdir%"
urifile="%localstaterundir%/couch.uri"
logdir="%localstatelogdir%"
erlangversion="%erlangversion%"
+erlangbin="%erlangbin%"
version () {
cat << EOF
@@ -53,6 +54,7 @@ script.
Options:
--erl-libs-dir Erlang library directory
+ --erl-bin Erlang binary
--config-dir configuration directory
--db-dir database dirrectory
--view-dir view index directory
@@ -86,6 +88,9 @@ do
--erl-libs-dir)
echo $erlanglibdir
;;
+ --erl-bin)
+ echo $erlangbin
+ ;;
--config-dir)
echo $confdir
;;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/373b4ee8/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8a75a78..6a553db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -691,6 +691,7 @@ AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
AC_SUBST([erlangversion], [${erlangversion}])
+AC_SUBST([erlangbin], [${ERL}])
# On Windows we install directly into our erlang distribution.