You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2008/06/22 17:01:11 UTC
svn commit: r670364 - in /incubator/couchdb/branches/runtimeconfig: doc/
src/couchdb/Makefile.am src/mochiweb/Makefile.am
Author: nslater
Date: Sun Jun 22 08:01:11 2008
New Revision: 670364
URL: http://svn.apache.org/viewvc?rev=670364&view=rev
Log:
full documentation generation now working
Removed:
incubator/couchdb/branches/runtimeconfig/doc/
Modified:
incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am
incubator/couchdb/branches/runtimeconfig/src/mochiweb/Makefile.am
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am?rev=670364&r1=670363&r2=670364&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am Sun Jun 22 08:01:11 2008
@@ -7,12 +7,15 @@
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations
-## under the License.
+## License for the specific language governing permissions and limitations under
+## the License.
ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS)
+devdocdir = $(localdocdir)/developer/couchdb
couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
+couchincludedir = $(localerlanglibdir)/couch-$(version)/include
+couchebindir = $(localerlanglibdir)/couch-$(version)/ebin
couchprivlib_LTLIBRARIES = couch_erl_driver.la
couch_erl_driver_la_SOURCES = couch_erl_driver.c
@@ -23,10 +26,17 @@
locallibbin_PROGRAMS = couchjs
couchjs_SOURCES = couch_js.c
-couchebindir = $(localerlanglibdir)/couch-$(version)/ebin
-couchincludedir = $(localerlanglibdir)/couch-$(version)/include
+couchinclude_DATA = couch_db.hrl
+
+couchebin_DATA = $(compiled_files)
+
+dist_devdoc_DATA = $(doc_base) $(doc_modules)
-couch_file_collection = \
+EXTRA_DIST = $(couch_files)
+
+CLEANFILES = $(compiled_files) $(doc_base) $(doc_modules) edoc-info
+
+source_files = \
cjson.erl \
couch_btree.erl \
couch_config.erl \
@@ -48,7 +58,7 @@
couch_util.erl \
couch_view.erl
-couchebin_DATA = \
+compiled_files = \
cjson.beam \
couch.app \
couch_btree.beam \
@@ -71,11 +81,35 @@
couch_util.beam \
couch_view.beam
-couchinclude_DATA = couch_db.hrl
-
-EXTRA_DIST = $(couch_file_collection) $(couchinclude_DATA)
-
-CLEANFILES = $(couchebin_DATA)
+doc_base = \
+ erlang.png \
+ index.html \
+ modules-frame.html \
+ overview-summary.html \
+ packages-frame.html \
+ stylesheet.css
+
+doc_modules = \
+ cjson.html \
+ couch_btree.html \
+ couch_config.html \
+ couch_config_writer.html \
+ couch_db.html \
+ couch_db_update_notifier.html \
+ couch_doc.html \
+ couch_event_sup.html \
+ couch_file.html \
+ couch_ft_query.html \
+ couch_httpd.html \
+ couch_key_tree.html \
+ couch_log.html \
+ couch_query_servers.html \
+ couch_rep.html \
+ couch_server.html \
+ couch_server_sup.html \
+ couch_stream.html \
+ couch_util.html \
+ couch_view.html
couch.app: couch.app.tpl
sed -e "s|%package_name%|@package_name@|g" \
@@ -83,16 +117,12 @@
$@ < $<
chmod +x $@
-nobase_dist_localdata_DATA = doc
-
-doc: $(couch_file_collection)
- mkdir -p doc
- cd doc && \
- for file in $(couch_file_collection); do \
+$(dist_devdoc_DATA): $(source_files)
+ for file in $(source_files); do \
if test -n "$$edoc_files"; then \
edoc_files="$$edoc_files, "; \
fi; \
- edoc_files="$$edoc_files \"../$$file\""; \
+ edoc_files="$$edoc_files \"$$file\""; \
done; \
erl -noshell -run edoc_run files ["$$edoc_files"]
Modified: incubator/couchdb/branches/runtimeconfig/src/mochiweb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/mochiweb/Makefile.am?rev=670364&r1=670363&r2=670364&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/mochiweb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/src/mochiweb/Makefile.am Sun Jun 22 08:01:11 2008
@@ -10,9 +10,21 @@
## License for the specific language governing permissions and limitations under
## the License.
+devdocdir = $(localdocdir)/developer/mochiweb
+
mochiwebebindir = $(localerlanglibdir)/mochiweb-r76/ebin
-mochiweb_file_collection = \
+mochiwebebin_DATA = $(static_files) $(compiled_files)
+
+dist_devdoc_DATA = $(doc_base) $(doc_modules)
+
+EXTRA_DIST = $(static_files) $(source_files)
+
+CLEANFILES = $(compiled_files) $(doc_base) $(doc_modules) edoc-info
+
+static_files = mochiweb.app
+
+source_files = \
mochifmt.erl \
mochifmt_records.erl \
mochifmt_std.erl \
@@ -37,9 +49,7 @@
mochiweb_util.erl \
reloader.erl
-mochiwebebin_static_file = mochiweb.app
-
-mochiwebebin_make_generated_file_list = \
+compiled_files = \
mochifmt.beam \
mochifmt_records.beam \
mochifmt_std.beam \
@@ -64,16 +74,47 @@
mochiweb_util.beam \
reloader.beam
-mochiwebebin_DATA = \
- $(mochiwebebin_static_file) \
- $(mochiwebebin_make_generated_file_list)
-
-EXTRA_DIST = \
- $(mochiweb_file_collection) \
- $(mochiwebebin_static_file)
-
-CLEANFILES = \
- $(mochiwebebin_make_generated_file_list)
+doc_base = \
+ erlang.png \
+ index.html \
+ modules-frame.html \
+ overview-summary.html \
+ packages-frame.html \
+ stylesheet.css
+
+doc_modules = \
+ mochifmt.html \
+ mochifmt_records.html \
+ mochifmt_std.html \
+ mochihex.html \
+ mochijson.html \
+ mochijson2.html \
+ mochinum.html \
+ mochiweb.html \
+ mochiweb_app.html \
+ mochiweb_charref.html \
+ mochiweb_cookies.html \
+ mochiweb_echo.html \
+ mochiweb_headers.html \
+ mochiweb_html.html \
+ mochiweb_http.html \
+ mochiweb_multipart.html \
+ mochiweb_request.html \
+ mochiweb_response.html \
+ mochiweb_skel.html \
+ mochiweb_socket_server.html \
+ mochiweb_sup.html \
+ mochiweb_util.html \
+ reloader.html
+
+$(dist_devdoc_DATA): $(source_files)
+ for file in $(source_files); do \
+ if test -n "$$edoc_files"; then \
+ edoc_files="$$edoc_files, "; \
+ fi; \
+ edoc_files="$$edoc_files \"$$file\""; \
+ done; \
+ erl -noshell -run edoc_run files ["$$edoc_files"]
%.beam: %.erl
$(ERLC) $<