couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [1/2] git commit: Hardcode couchjs binary name
Date Sun, 23 Oct 2011 17:36:40 GMT
Updated Branches:
  refs/heads/1.2.x 78cbdb93b -> ac12b4788
  refs/heads/master 47598c85a -> 0f8c86d93


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/ac12b478
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ac12b478
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ac12b478

Branch: refs/heads/1.2.x
Commit: ac12b4788fcb4c2f4e7391884fc8263242666a01
Parents: 78cbdb9
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:29:02 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/ac12b478/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 42c64e1..d68106f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,12 @@ AC_CHECK_LIB([$JS_LIB_BASE], [JS_GetStringCharsAndLength],
 # Else, hope that 1.7.0 works
 LIBS="$OLD_LIBS"
 
+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/ac12b478/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(                     \


Mime
View raw message