couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dave Cottlehuber <d...@muse.net.nz>
Subject Re: git commit: Hardcode couchjs binary name
Date Sun, 23 Oct 2011 18:53:42 GMT
On 23 October 2011 19:37,  <davisp@apache.org> wrote:
> Updated Branches:
>  refs/heads/1.1.x 89f7faa6d -> af7a6ae52
>
>
> Hardcode couchjs binary name
>
> Windows doesn't have the libgen.h header or an easily identified
> basename function. Instead of playing games we just configure the name
> with autoconf and run with that.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/af7a6ae5
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/af7a6ae5
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/af7a6ae5
>
> Branch: refs/heads/1.1.x
> Commit: af7a6ae52890c6c158615068f2a48d40c52ec538
> Parents: 89f7faa
> Author: Paul Joseph Davis <davisp@apache.org>
> Authored: Sun Oct 23 12:27:35 2011 -0500
> Committer: Paul Joseph Davis <davisp@apache.org>
> Committed: Sun Oct 23 12:38:54 2011 -0500
>
> ----------------------------------------------------------------------
>  configure.ac                     |    5 +++++
>  src/couchdb/priv/couch_js/help.h |    4 +---
>  2 files changed, 6 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/af7a6ae5/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index 182e0eb..6a5d865 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -127,7 +127,12 @@ Is the Mozilla SpiderMonkey library installed?])])])])])])])
>
>  AC_SUBST(JS_LIB_BASE)
>
> +AC_DEFINE([COUCHJS_NAME], ["couchjs"], ["CouchJS executable name."])
> +
>  if test x${IS_WINDOWS} = xTRUE; then
> +
> +    AC_DEFINE([COUCHJS_NAME], ["couchjs.exe"], ["CouchJS executable name."])
> +
>     if test -f "$JS_LIB_DIR/$JS_LIB_BASE.dll"; then
>         # seamonkey 1.7- build layout on Windows
>         JS_LIB_BINARY="$JS_LIB_DIR/$JS_LIB_BASE.dll"
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/af7a6ae5/src/couchdb/priv/couch_js/help.h
> ----------------------------------------------------------------------
> diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
> index c42c9f5..4102594 100644
> --- a/src/couchdb/priv/couch_js/help.h
> +++ b/src/couchdb/priv/couch_js/help.h
> @@ -13,8 +13,6 @@
>  #ifndef COUCHJS_HELP_H
>  #define COUCHJS_HELP_H
>
> -#include <libgen.h>
> -
>  #include "config.h"
>
>  static const char VERSION_TEMPLATE[] =
> @@ -55,7 +53,7 @@ static const char USAGE_TEMPLATE[] =
>     "\n"
>     "Report bugs at <%s>.\n";
>
> -#define BASENAME basename((char*)argv[0])
> +#define BASENAME COUCHJS_NAME
>
>  #define couch_version(basename)  \
>     fprintf(                     \
>
>

Thanks,

@davisp thanks that did the trick. Couch builds & futon tests OK. Not
quite enough battery time to check further.
@rnewson I'm offline again for a few days so if another vote gets
rolled from this patch please consider my previous -1 forgiven.

Win7 x64

curl-7.21.7
OpenSSL-1.0.0d
icu-4.4.2
tracemonkey-57a6ad20eae9
wxMSW-2.8.11
Erlang R14B03

All futon tests pass using Safari version 5.1.1 (7534.51.22) on Mac OS X Lion

A+
Dave

Mime
View raw message