Skip to content

Commit

Permalink
Merge branch '1843-feature-bigcouch'
Browse files Browse the repository at this point in the history
  • Loading branch information
rnewson committed Jul 10, 2014
2 parents ade9dae + 86f68c9 commit 6526051
Show file tree
Hide file tree
Showing 661 changed files with 1,908 additions and 199,617 deletions.
158 changes: 19 additions & 139 deletions .gitignore
@@ -1,142 +1,22 @@
!.gitignore
!.mailmap
*.beam
*.diff
*.gz
*.la
*.lo
config.erl
install.mk
rel/*.config
rel/dev*
rel/tmpdata
src/
/log

*.o
*.orig
*.pyc
*.rej
*.stamp
*.sw*
*.tpl
*~
.*
INSTALL
Makefile
Makefile.in
THANKS
acinclude.m4
aclocal.m4
apache-couchdb-*
autom4te.cache
__pycache__
bin/.deps/
bin/couch-config
bin/couch-config_dev
bin/couchdb
bin/couchdb.1
bin/couchjs_dev
bin/couchpw
build-aux/config.*
build-aux/depcomp
build-aux/compile
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
build-aux/texinfo.tex
config.h
config.h.in
config.log
config.status
configure
couchdb.stderr
couchdb.stdout
cover/*
erl_crash.dump
etc/couchdb/default.ini
etc/couchdb/default_dev.ini
etc/couchdb/local_dev.ini
etc/init/couchdb
etc/launchd/org.apache.couchdb.plist
etc/logrotate.d/couchdb
libtool
m4
share/doc/build/CouchDB.log
share/doc/build/doctrees
share/doc/build/html
share/doc/build/latex
share/doc/build/texinfo
*.so
ebin/

dev/boot_node.beam
dev/lib/
dev/logs/

share/server/main-coffee.js
share/server/main.js
src/couch_mrview/ebin/
src/couch_plugins/ebin/
src/couch_replicator/ebin/
src/couchdb/.deps/*
src/couchdb/.libs/*
src/couchdb/couch.app
src/couchdb/couchjs
src/couchdb/edoc-info
src/couchdb/erlang.png
src/couchdb/priv/.deps/
src/couchdb/priv/.libs/
src/couchdb/priv/couch_icu_driver.la
src/couchdb/priv/couchjs
src/couchdb/priv/couchjs.1
src/couchdb/priv/couchspawnkillable
src/couchdb/priv/stat_descriptions.cfg
src/couchdb/priv/stat_descriptions.cfg
src/couchdb/stylesheet.css
src/ejson/.deps/
src/ejson/.libs/
src/ejson/ejson.app
src/ejson/priv
src/erlang-oauth/oauth.app
src/erlang-oauth/oauth.app
src/fauxton/node_modules
src/fauxton/dist
src/fauxton/build
src/fauxton/app/load_addons.js
!src/fauxton/app/addons/
src/fauxton/app/addons/*
!src/fauxton/app/addons/activetasks
!src/fauxton/app/addons/config
!src/fauxton/app/addons/plugins
!src/fauxton/app/addons/logs
!src/fauxton/app/addons/stats
!src/fauxton/app/addons/replication
!src/fauxton/app/addons/contribute
!src/fauxton/app/addons/auth
!src/fauxton/app/addons/exampleAuth
!src/fauxton/app/addons/permissions
!src/fauxton/app/addons/verifyinstall
!src/fauxton/app/addons/compaction
!src/fauxton/app/addons/fauxton
!src/fauxton/app/addons/pouchdb
!src/fauxton/app/addons/databases
!src/fauxton/app/addons/documents
!src/fauxton/app/addons/styletests
src/fauxton/settings.json*
!src/fauxton/settings.json.default
!src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf
src/ibrowse/ibrowse.app
src/ibrowse/ibrowse.app
src/mochiweb/mochiweb.app
src/mochiweb/mochiweb.app
!src/my-first-couchdb-plugin/.gitignore
!src/my-first-couchdb-plugin/Makefile
src/snappy/.deps/
src/snappy/.libs/
src/snappy/google-snappy/.deps/
src/snappy/google-snappy/snappy-stubs-public.h
src/snappy/google-snappy/stamp-h2
src/snappy/priv
src/snappy/snappy.app
stamp-h1
test/.deps/
test/bench/run
test/etap/.deps/
test/etap/run
test/etap/run
test/etap/temp.*
test/etap/test_cfg_register
test/etap/test_util.erl
test/javascript/run
test/javascript/run_js_tests.sh
test/local.ini
tmp
utils/run
src/fauxton/test/test.config.js
src/fauxton/app/initialize.js

src/couch/priv/couch_js/config.h
src/couch/priv/couchjs
src/couch/priv/couchspawnkillable
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ before_install:
- sudo apt-get -y install texlive-latex-base texlive-latex-recommended
- sudo apt-get -y install texlive-latex-extra texlive-fonts-recommended texinfo
- sudo apt-get -y install python-pygments python-docutils python-sphinx
before_script: ./bootstrap && ./configure
before_script: ./configure
script:
- make distcheck
- cd src/fauxton
Expand Down
33 changes: 33 additions & 0 deletions Dockerfile
@@ -0,0 +1,33 @@
FROM debian:latest
MAINTAINER Robert Newson <rnewson@apache.org>
ENV DEBIAN_FRONTEND noninteractive

# Install prereqs
RUN echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list
RUN apt-get -qq update
RUN apt-get -y install build-essential git libmozjs185-dev libicu-dev erlang-nox rebar

# Set up user for the build
RUN useradd -m couchdb
USER couchdb

# Get the source
WORKDIR /home/couchdb
RUN git clone https://git-wip-us.apache.org/repos/asf/couchdb.git

# Switch branches
WORKDIR /home/couchdb/couchdb
RUN git checkout 1843-feature-bigcouch

# We don't to be so strict for simple testing.
RUN sed -i'' '/require_otp_vsn/d' rebar.config.script

# Expose nodes on external network interface
RUN sed -i'' 's/bind_address = 127.0.0.1/bind_address = 0.0.0.0/' rel/overlay/etc/default.ini

# Build
RUN ./configure
RUN make

EXPOSE 15984 25984 35984 15986 25986 35986
ENTRYPOINT ["/home/couchdb/couchdb/dev/run"]
4 changes: 2 additions & 2 deletions LICENSE
Expand Up @@ -449,7 +449,7 @@ For the src/ibrowse component:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

For the src/erlang-oauth component:
For the src/oauth component:

Copyright the authors and contributors. All rights reserved.

Expand All @@ -474,7 +474,7 @@ For the src/erlang-oauth component:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For the src/etap component:
For the test/etap/etap.erl component:

Copyright (c) 2008-2009 Nick Gerakines <nick@gerakines.net>

Expand Down
58 changes: 58 additions & 0 deletions Makefile
@@ -0,0 +1,58 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# 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.

all: compile

config.erl:
@echo "Apache CouchDB has not been configured."
@echo "Try \"./configure -h\" for help."
@echo
@false

compile: config.erl
@echo "==> couchjs (compile)"
@rebar compile

clean:
@echo "==> couchjs (clean)"
@rebar clean

check: eunit


dist: compile
@rm -rf rel/couchdb
@rebar generate

distclean: clean
@rm -rf rel/couchdb

include install.mk
install: dist
@mkdir -p $(prefix)
@cp -R rel/couchdb/* $(prefix)
@mkdir -p $(data_dir)
@chown $(user) $(data_dir)
@mkdir -p $(view_index_dir)
@chown $(user) $(view_index_dir)
@touch $(prefix)/var/log/couchdb.log
@chown $(user) $(prefix)/var/log/couchdb.log

install.mk:
@echo "No install.mk found. Run ./configure"
@exit 1

docker:
@docker build --no-cache --rm -t couchdb/1843-feature-bigcouch .

eunit:
@rebar eunit skip_deps=meck,mochiweb,lager

0 comments on commit 6526051

Please sign in to comment.