Skip to content

Commit

Permalink
Documentation changes
Browse files Browse the repository at this point in the history
  • Loading branch information
saleyn committed May 28, 2010
1 parent a1c0f29 commit ae90817
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -12,6 +12,7 @@ config.h
config.h.in config.h.in
config.log config.log
config.status config.status
config.cache
configure configure
ebin/zmq.app ebin/zmq.app
m4/version m4/version
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -5,8 +5,8 @@ TARBALL_EXCLUDE=/tmp/exclude.xxx


SUBDIRS = c_src src SUBDIRS = c_src src


#docs: docs:
# @${MAKE} --directory=src $@ @${MAKE} --directory=src $@


gitdocs: docs gitdocs: docs
./bin/update_docs ./bin/update_docs
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -141,9 +141,9 @@ dnl ------------------------------------------------------------------


AC_ARG_WITH([zeromq], AC_ARG_WITH([zeromq],
AC_HELP_STRING([--with-zeromq=PATH], AC_HELP_STRING([--with-zeromq=PATH],
[set PATH to the installation of zeromq library]), [set PATH to the installation of zeromq library [[default=/usr]]]),
[ZEROMQ_LIB=${with_zeromq}], [ZEROMQ_LIB=${with_zeromq}],
[ZEROMQ_LIB=""]) [ZEROMQ_LIB="/usr"])


AC_CHECK_HEADER([${ZEROMQ_LIB}/include/zmq.h], [], [ AC_CHECK_HEADER([${ZEROMQ_LIB}/include/zmq.h], [], [
AC_MSG_ERROR([Could not find the 'zmq.h' header. AC_MSG_ERROR([Could not find the 'zmq.h' header.
Expand Down Expand Up @@ -173,8 +173,8 @@ AC_MSG_NOTICE([ C++ compiler: ${CXX}])
AC_MSG_NOTICE([ Erlang compiler: ${ERLC}]) AC_MSG_NOTICE([ Erlang compiler: ${ERLC}])
AC_MSG_NOTICE([ Erlang erts dir: ${ERLANG_ERTS_DIR}]) AC_MSG_NOTICE([ Erlang erts dir: ${ERLANG_ERTS_DIR}])
AC_MSG_NOTICE([ Erlang erts ver: ${ERLANG_ERTS_VER}]) AC_MSG_NOTICE([ Erlang erts ver: ${ERLANG_ERTS_VER}])
AC_MSG_NOTICE([ Erlang lib dir: ${ERLANG_INSTALL_LIB_DIR}])
AC_MSG_NOTICE([ erl_interface: ${ERLANG_LIB_DIR_erl_interface}]) AC_MSG_NOTICE([ erl_interface: ${ERLANG_LIB_DIR_erl_interface}])
AC_MSG_NOTICE([ ZeroMQ: ${ZEROMQ_LIB}])


echo echo
AC_MSG_NOTICE([ Debug/warnings: ${enable_debug}/${enable_warnings}]) AC_MSG_NOTICE([ Debug/warnings: ${enable_debug}/${enable_warnings}])
Expand Down
45 changes: 37 additions & 8 deletions src/overview.edoc
Expand Up @@ -11,11 +11,14 @@


<ol> <ol>
<li>{@section Overview}</li> <li>{@section Overview}</li>
<li>{@section Downloading}</li>
<li>{@section Building}</li> <li>{@section Building}</li>
<li>{@section Issue Tracking}</li> <li>{@section Issue Tracking}</li>
<li>{@section Contributing}</li>
<li>{@section Architecture}</li> <li>{@section Architecture}</li>
<li>{@section Known Limitations}</li> <li>{@section Known Limitations}</li>
<li>{@section Usage}</li> <li>{@section Usage}</li>
<li>{@section License}</li>
</ol> </ol>


== Overview == == Overview ==
Expand All @@ -27,6 +30,14 @@ ZeroMQ distributed clients that may be written in other languages.


ZeroMQ project is found here: [http://zeromq.org] ZeroMQ project is found here: [http://zeromq.org]


== Downloading ==

Project location and git origin:
<ul>
<li>[http://github.com/saleyn/erlzmq]</li>
<li>`git clone git://github.com/saleyn/erlzmq.git'</li>
</ul>

== Building == == Building ==


This implementation requires a feature of ZeroMQ that is This implementation requires a feature of ZeroMQ that is
Expand All @@ -48,22 +59,21 @@ to be patched by applying the `zeromq-2.0.6.poll.patch' patch.
$ ./configure --with-pgm --prefix=/opt/zeromq-2.0.6 $ ./configure --with-pgm --prefix=/opt/zeromq-2.0.6
$ make $ make
$ make install $ make install

''' '''


After applying the patch to ZeroMQ modify the path in `/tmp/erlzmq/c_src/Makefile' Erlzmq project comes with a bootstrap script that uses autotools to creare a
of the following variable to reflect location of ZeroMQ installation: configure script. Below are the steps needed to build erlzmq given the location
of ZeroMQ installation being `/opt/zeromq-2.0.6':


``` Make sure that Erlang is installed and `erl' is in the `PATH'. If it's not
ZMQ_DIR=/opt/zeromq-2.0.6 in the path, specify `--with-erlang=PATH' option for the configure script.
'''

Make sure that Erlang is installed and `erl' is in the `PATH'.


Run: Run:


``` ```
$ cd /tmp/erlzmq $ cd /tmp/erlzmq
$ ./bootstrap
$ ./configure --with-zeromq=/opt/zeromq-2.0.6
$ make $ make
$ make docs $ make docs
''' '''
Expand All @@ -72,6 +82,22 @@ Run:


[http://github.com/saleyn/erlzmq/issues] [http://github.com/saleyn/erlzmq/issues]


== Contributing ==

When you make any changes to documentation, run the following script to
update documentation on the [http://saleyn.github.com/erlzmq] site:

```
$ make gitdocs
'''

The following make target can be used to do a cleanup of all artifacts
of make and configure:

```
$ make clean-bootstrap
'''

== Architecture == == Architecture ==


A ZeroMQ context is created by calling zmq:start_link/0 or A ZeroMQ context is created by calling zmq:start_link/0 or
Expand Down Expand Up @@ -207,3 +233,6 @@ by using ^G, or in a separate OS shell:


''' '''


== License ==

The project is released under BSD license.

0 comments on commit ae90817

Please sign in to comment.