Permalink
Browse files

Complete refactoring of couch_js.

In particular, the cURL bindings have been rewritten to be more useful
and easily applied in command line scripts.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@884672 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent c452048 commit 95ee619df135a4c8b3ecefe65503c6d1cc7c36da @davisp davisp committed Nov 26, 2009
View
@@ -58,7 +58,12 @@ src/couchdb/priv/.libs/
src/couchdb/priv/couch_icu_driver.la
src/couchdb/priv/couchjs
src/couchdb/priv/couchspawnkillable
+src/couchdb/priv/stat_descriptions.cfg
+src/erlang-oauth/oauth.app
+src/ibrowse/ibrowse.app
+src/mochiweb/mochiweb.app
test/local.ini
+test/etap/run
test/etap/test_util.erl
share/server/main.js
View
@@ -60,7 +60,7 @@ couchjs: couchjs.tpl
chmod +x $@
couchjs_dev: couchjs.tpl
- sed -e "s|%locallibbindir%|$(abs_top_builddir)/src/couchdb|g" \
+ sed -e "s|%locallibbindir%|$(abs_top_builddir)/src/couchdb/priv|g" \
-e "s|%bug_uri%|@bug_uri@|g" \
-e "s|%package_author_address%|@package_author_address@|g" \
-e "s|%package_author_name%|@package_author_name@|g" \
View
@@ -11,7 +11,7 @@
## the License.
couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
-devcouchprivlibdir = $(abs_top_builddir)/src/couchdb/.libs
+devcouchprivlibdir = $(abs_top_builddir)/src/couchdb/priv/.libs
localconf_DATA = default.ini
noinst_DATA = default_dev.ini local_dev.ini
@@ -15,11 +15,41 @@ couchprivdir = $(couchlibdir)/priv
couchprivlibdir = $(couchlibdir)/priv/lib
EXTRA_DIST = \
- couchspawnkillable.sh \
+ spawnkillable/couchspawnkillable.sh \
stat_descriptions.cfg.in
CLEANFILES = stat_descriptions.cfg
+ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS)
+if WINDOWS
+ICU_LOCAL_LIBS=-licuuc -licudt -licuin
+else
+ICU_LOCAL_LIBS=-licuuc -licudata -licui18n
+endif
+
+couchprivlib_LTLIBRARIES = couch_icu_driver.la
+couch_icu_driver_la_SOURCES = icu_driver/couch_icu_driver.c
+couch_icu_driver_la_LDFLAGS = -module -avoid-version $(ICU_LOCAL_FLAGS)
+couch_icu_driver_la_CFLAGS = $(ICU_LOCAL_FLAGS)
+couch_icu_driver_la_LIBADD = $(ICU_LOCAL_LIBS)
+
+if WINDOWS
+couch_icu_driver_la_LDFLAGS += -no-undefined
+endif
+
+COUCHJS_SRCS = \
+ couch_js/http.c \
+ couch_js/http.h \
+ couch_js/main.c \
+ couch_js/utf8.c \
+ couch_js/utf8.h
+
+locallibbin_PROGRAMS = couchjs
+couchjs_SOURCES = $(COUCHJS_SRCS)
+couchjs_LDFLAGS = $(CURL_LDFLAGS)
+couchjs_CFLAGS = $(CURL_CFLAGS)
+couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@
+
couchpriv_DATA = stat_descriptions.cfg
couchpriv_PROGRAMS = couchspawnkillable
Oops, something went wrong.

0 comments on commit 95ee619

Please sign in to comment.