Updated Branches:
  refs/heads/1843-feature-bigcouch d68f4defa -> ba152cb21 (forced update)


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/src/snappy/src/snappy.app.src
----------------------------------------------------------------------
diff --git a/src/snappy/src/snappy.app.src b/src/snappy/src/snappy.app.src
new file mode 100644
index 0000000..9f3f9a3
--- /dev/null
+++ b/src/snappy/src/snappy.app.src
@@ -0,0 +1,12 @@
+{application, snappy,
+ [
+  {description, "snappy compressor/decompressor Erlang NIF wrapper"},
+  {vsn, git},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib
+                 ]},
+  {env, []},
+  {modules, [snappy]}
+ ]}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/src/twig/.gitignore
----------------------------------------------------------------------
diff --git a/src/twig/.gitignore b/src/twig/.gitignore
deleted file mode 100644
index 6308d7c..0000000
--- a/src/twig/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ebin
-src/.*.swp
-.project

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/src/twig/Makefile.am
----------------------------------------------------------------------
diff --git a/src/twig/Makefile.am b/src/twig/Makefile.am
deleted file mode 100644
index 8832ce1..0000000
--- a/src/twig/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-## 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.
-
-twigebindir = $(localerlanglibdir)/twig/ebin
-
-twigebin_DATA = $(compiled_files)
-
-include_files = \
-       twig_int.hrl
-
-source_files = \
-       src/twig.app.src \
-    src/twig.erl \
-       src/twig_app.erl \
-       src/twig_event_handler.erl \
-       src/twig_monitor.erl \
-       src/twig_sup.erl \
-       src/twig_util.erl \
-       src/trunc_io.erl
-
-compiled_files = \
-       ebin/twig.app \
-    ebin/twig.beam \
-       ebin/twig_app.beam \
-       ebin/twig_event_handler.beam \
-       ebin/twig_monitor.beam \
-       ebin/twig_sup.beam \
-       ebin/twig_util.beam \
-       ebin/trunc_io.beam
-
-EXTRA_DIST = $(include_files) $(source_files)
-CLEANFILES = $(compiled_files)
-
-ebin/%.app: src/%.app.src
-       @mkdir -p ebin/
-       sed -e "s|%version%|@version@|g" < $< > $@
-
-ebin/%.beam: src/%.erl
-       @mkdir -p ebin/
-       $(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) $<

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/test/Makefile.am
----------------------------------------------------------------------
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 7c70a5a..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-## 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.
-
-SUBDIRS = bench etap javascript view_server
-EXTRA_DIST = random_port.ini
-

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/test/bench/Makefile.am
----------------------------------------------------------------------
diff --git a/test/bench/Makefile.am b/test/bench/Makefile.am
deleted file mode 100644
index ce39c4b..0000000
--- a/test/bench/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## 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.
-
-EXTRA_DIST = benchbulk.sh bench_marks.js run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-               -e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-       < $< > $@
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/test/etap/Makefile.am
----------------------------------------------------------------------
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
deleted file mode 100644
index c092805..0000000
--- a/test/etap/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-## 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.
-
-noinst_SCRIPTS = run
-noinst_DATA = etap.beam test_util.beam test_web.beam
-
-noinst_PROGRAMS = test_cfg_register
-test_cfg_register_SOURCES = test_cfg_register.c
-test_cfg_register_CFLAGS = -D_BSD_SOURCE
-
-%.beam: %.erl
-       $(ERLC) $<
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|@abs_top_srcdir@|g" \
-           -e "s|%abs_top_builddir%|@abs_top_builddir@|g" > \
-       $@ < $<
-       chmod +x $@
-
-# @@ wildcards are NOT portable, please replace with clean-local rules
-CLEANFILES = run *.beam
-DISTCLEANFILES = temp.*
-
-EXTRA_DIST = \
-    run.tpl \
-    test_web.erl \
-    001-load.t \
-    002-icu-driver.t \
-    010-file-basics.t \
-    011-file-headers.t \
-    020-btree-basics.t \
-    021-btree-reductions.t \
-    030-doc-from-json.t \
-    031-doc-to-json.t \
-    040-util.t \
-    041-uuid-gen-id.ini \
-    041-uuid-gen-seq.ini \
-    041-uuid-gen-utc.ini \
-    041-uuid-gen.t \
-    042-work-queue.t \
-    050-stream.t \
-    060-kt-merging.t \
-    061-kt-missing-leaves.t \
-    062-kt-remove-leaves.t \
-    063-kt-get-leaves.t \
-    064-kt-counting.t \
-    065-kt-stemming.t \
-    070-couch-db.t \
-    072-cleanup.t \
-    073-changes.t \
-    074-doc-update-conflicts.t \
-    075-auth-cache.t \
-    076-file-compression.t \
-    080-config-get-set.t \
-    081-config-override.1.ini \
-    081-config-override.2.ini \
-    081-config-override.t \
-    082-config-register.t \
-    083-config-no-files.t \
-    090-task-status.t \
-    100-ref-counter.t \
-    120-stats-collect.t \
-    121-stats-aggregates.cfg \
-    121-stats-aggregates.ini \
-    121-stats-aggregates.t \
-    130-attachments-md5.t \
-    140-attachment-comp.t \
-    150-invalid-view-seq.t \
-    160-vhosts.t \
-    170-os-daemons.es \
-    170-os-daemons.t \
-    171-os-daemons-config.es \
-    171-os-daemons-config.t \
-    172-os-daemon-errors.1.sh \
-    172-os-daemon-errors.2.sh \
-    172-os-daemon-errors.3.sh \
-    172-os-daemon-errors.4.sh \
-    172-os-daemon-errors.t \
-    173-os-daemon-cfg-register.t \
-    180-http-proxy.ini \
-    180-http-proxy.t \
-    190-json-stream-parse.t \
-    200-view-group-no-db-leaks.t \
-    201-view-group-shutdown.t \
-    210-os-proc-pool.t \
-    220-compaction-daemon.t \
-    231-cors.t

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/test/javascript/Makefile.am
----------------------------------------------------------------------
diff --git a/test/javascript/Makefile.am b/test/javascript/Makefile.am
deleted file mode 100644
index d7367e0..0000000
--- a/test/javascript/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## 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.
-
-EXTRA_DIST = \
-       cli_runner.js \
-       couch_http.js \
-       run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-       sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-               -e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-               -e "s|%localstaterundir%|$(abs_top_builddir)/tmp/run|g" \
-       < $< > $@
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/test/view_server/Makefile.am
----------------------------------------------------------------------
diff --git a/test/view_server/Makefile.am b/test/view_server/Makefile.am
deleted file mode 100644
index 11e7feb..0000000
--- a/test/view_server/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-## 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.
-
-EXTRA_DIST = \
-       query_server_spec.rb \
-       run_native_process.es

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index eb8ec43..0000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-## 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.
-
-noinst_SCRIPTS = run
-
-CLEANFILES = $(noinst_SCRIPTS)
-
-transform = @program_transform_name@
-couchdb_command_name = `echo couchdb | sed '$(transform)'`
-
-run: ../bin/couchdb.tpl
-       sed -e "s|%ERL%|$(ERL)|g" \
-           -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-           -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-           -e "s|%defaultini%|default_dev.ini|g" \
-           -e "s|%localini%|local_dev.ini|g" \
-           -e "s|%localerlanglibdir%|$(abs_top_builddir)\/src|g" \
-           -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-           -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-           -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
-           -e "s|%localstatedir%|$(abs_top_builddir)/tmp|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" \
-           -e "s|%package_name%|@package_name@|g" \
-           -e "s|%version%|@version@|g" \
-           -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
-       $@ < $<
-       chmod +x $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba152cb2/var/Makefile.am
----------------------------------------------------------------------
diff --git a/var/Makefile.am b/var/Makefile.am
deleted file mode 100644
index 901ab2b..0000000
--- a/var/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-## 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.
-
-install-data-hook:
-       if test ! "$(mkdir_p)" = ""; then \
-           $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
-           $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
-           $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \
-       else \
-           echo "WARNING: You may have to create these directories by hand."; \
-           mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
-           mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
-           mkdir -p "$(DESTDIR)$(localstaterundir)"; \
-       fi

Reply via email to