Skip to content

Commit

Permalink
removed svn2cl from the build
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@664366 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Noah Slater committed Jun 7, 2008
1 parent 69929bd commit 2f07941
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 68 deletions.
50 changes: 21 additions & 29 deletions README
Expand Up @@ -13,43 +13,37 @@ To build Apache CouchDB from checkout you need some of the following installed:
* [GNU Automake][01] (>=1.6.3) (required)
* [GNU Autoconf][02] (>=2.59) (required)
* [GNU Libtool][03] (required)
* [svn2cl][04] (optional)
* [xsltproc][05] (optional)
* [help2man][06] (optional)
* [help2man][04] (optional)

If you are running a Debian GNU/Linux system (or a derivative such as Ubuntu
GNU/Linux) you can install these dependencies using the `apt-get` command:

apt-get install automake autoconf libtool subversion-tools help2man
apt-get install automake autoconf libtool help2man

The OS X version of these dependencies may be out of date so it is recommended
that you use [MacPorts][07] to install newer versions using the `port` command:
that you use [MacPorts][05] to install newer versions using the `port` command:

port install automake autoconf libtool help2man

Note: MacPorts users will need to install svn2cl by hand if they wish to use it.

### Bootstrapping ###

Note: You must repeat this step every time you update your Subversion checkout.

Follow the [check out instructions][08] and bootstrap the pristine source by
Follow the [check out instructions][06] and bootstrap the pristine source by
running the following command:

./bootstrap

You can use the `-C` option to generate a dummy `ChangeLog` file.

Installation And First Run
--------------------------

You will need the following installed:

* [Erlang OTP][09] (>=R11B) (required)
* [ICU][10] (required)
* [Mozilla SpiderMonkey][11] (required)
* [GNU Make][12] (required)
* [GNU Compiler Collection][13] (required)
* [Erlang OTP][07] (>=R11B) (required)
* [ICU][08] (required)
* [Mozilla SpiderMonkey][09] (required)
* [GNU Make][10] (required)
* [GNU Compiler Collection][11] (required)

### UNIX-like Operating Systems (inc. OS X) ###

Expand Down Expand Up @@ -134,7 +128,7 @@ On many UNIX-like systems you can run the following command:

OS X provides the standard Accounts option from the System Preferences
application or you can optionally use the Workgroup Manager application which
can be downloaded as part of the [Server Admin Tools][14].
can be downloaded as part of the [Server Admin Tools][12].

You should make sure that the `couchdb` user has a working POSIX shell and set
the home directory to `/usr/local/var/lib/couchdb` which is the Apache CouchDB
Expand All @@ -161,7 +155,7 @@ When Apache CouchDB starts it should eventually display the following message:
Relax.

To check that everything has worked point your web browser to
[http://localhost:5984/_utils/index.html][15] and run the test suite.
[http://localhost:5984/_utils/index.html][13] and run the test suite.

##### OS X #####

Expand Down Expand Up @@ -276,15 +270,13 @@ sitting in the root directory ready for distribution.
[01]: http://www.gnu.org/software/automake/
[02]: http://www.gnu.org/software/autoconf/
[03]: http://www.gnu.org/software/libtool/
[04]: http://ch.tudelft.nl/~arthur/svn2cl/
[05]: http://xmlsoft.org/XSLT/xsltproc2.html
[06]: http://www.gnu.org/software/help2man/
[07]: http://www.macports.org/
[08]: http://incubator.apache.org/couchdb/community/code.html
[09]: http://erlang.org/
[10]: http://icu.sourceforge.net/
[11]: http://www.mozilla.org/js/spidermonkey/
[12]: http://www.gnu.org/software/make/
[13]: http://gcc.gnu.org/
[14]: http://www.apple.com/support/downloads/serveradmintools1047.html
[15]: http://localhost:5984/_utils/index.html
[04]: http://www.gnu.org/software/help2man/
[05]: http://www.macports.org/
[06]: http://incubator.apache.org/couchdb/community/code.html
[07]: http://erlang.org/
[08]: http://icu.sourceforge.net/
[09]: http://www.mozilla.org/js/spidermonkey/
[10]: http://www.gnu.org/software/make/
[11]: http://gcc.gnu.org/
[12]: http://www.apple.com/support/downloads/serveradmintools1047.html
[13]: http://localhost:5984/_utils/index.html
39 changes: 0 additions & 39 deletions bootstrap
Expand Up @@ -17,14 +17,11 @@
SCRIPT_OK=0
SCRIPT_ERROR=1

CHANGELOG_PREDICATE=true

ACINCLUDE_FILE="acinclude.m4"
ACINCLUDE_IN_FILE="acinclude.m4.in"
AC_CHECK_ICU_COMPRESSED_FILE="build-contrib/ac_check_icu.m4_2007-09-12.gz"
AUTHORS_FILE="authors.xml"
BUILD_AUX_DIRECTORY="build-aux"
CHANGELOG_FILE="ChangeLog"
CONFIG_GUESS_COMPRESSED_FILE="build-contrib/config.guess_2007-09-12.gz"
CONFIG_GUESS_FILE="build-aux/config.guess"
CONFIG_SUB_COMPRESSED_FILE="build-contrib/config.sub_2007-09-12.gz"
Expand All @@ -40,7 +37,6 @@ AUTOMAKE_EXECUTABLE=$(which automake || true)
GLIBTOOLIZE_EXECUTABLE=$(which glibtoolize || true)
LIBTOOLIZE_EXECUTABLE=$(which libtoolize || true)
SVN_EXECUTABLE=$(which svn || true)
SVN2CL_EXECUTABLE=$(which svn2cl || true)

basename=$(basename $0)

Expand Down Expand Up @@ -96,7 +92,6 @@ Options:
-h display a short help message and exit
-v display version information and exit
-C do not generate a ChangeLog from Subversion
Environment variables:
Expand All @@ -117,13 +112,6 @@ display_error () {
exit $SCRIPT_ERROR
}

generate_dummy_changelog () {
# Generate a dummy ChangLog file.

echo "Warning: Generating a dummy ChangeLog file."
touch $CHANGELOG_FILE
}

check_svn_environment () {
# Check the Subversion environment for sanity.

Expand All @@ -142,27 +130,6 @@ check_svn_environment () {
fi
}

generate_changelog () {
# Generate the ChangLog file using the Subversion repository.

if test "$SVN_CHECKOUT_BOOLEAN" = "true"; then
SVN2CL_COMMAND_ARGUMENT="."
fi
if test -n "$REPOSITORY_REVISION"; then
SVN2CL_COMMAND_ARGUMENT="--revision $REPOSITORY_REVISION:1 $REPOSITORY_URI"
fi
if test -z "$SVN2CL_COMMAND_ARGUMENT"; then
return
fi
if test ! -x "$SVN2CL_EXECUTABLE"; then
echo "Warning: Unable to find the svn2cl command."
generate_dummy_changelog
else
echo "Generating \`"$CHANGELOG_FILE"' (may take a while)"
$SVN2CL_EXECUTABLE --authors=$AUTHORS_FILE $SVN2CL_COMMAND_ARGUMENT
fi
}

generate_acinclude () {
# Generate the acinclude.m4 file using the Subversion repository.

Expand Down Expand Up @@ -298,19 +265,13 @@ parse_script_option_list () {
case "$1" in
-v) shift; display_version; exit $SCRIPT_OK;;
-h) shift; display_help; exit $SCRIPT_OK;;
-C) shift; CHANGELOG_PREDICATE=false;;
--) shift; break;;
*) display_error "Unknown option: $1" >&2;;
esac
done
cd $(dirname $0)
process_file_collection
check_svn_environment || true
if test "$CHANGELOG_PREDICATE" = "true"; then
generate_changelog
else
generate_dummy_changelog
fi
generate_acinclude
run_command_collection
}
Expand Down

0 comments on commit 2f07941

Please sign in to comment.