You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/10/04 16:05:53 UTC
[01/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Updated Branches:
refs/heads/build-system-fixes-1.5.x [created] db743ae66
add erlang-version.escript to noinst_SCRIPTS
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c89dfe3f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c89dfe3f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c89dfe3f
Branch: refs/heads/build-system-fixes-1.5.x
Commit: c89dfe3fadb01e7afb97f28d6aa18a11eca06f64
Parents: fba51db
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Oct 3 22:24:39 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Oct 3 22:24:39 2013 +0200
----------------------------------------------------------------------
bin/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c89dfe3f/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 5d722ac..7a868df 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -20,7 +20,7 @@ endif
man1dir = $(mandir)/man1
-noinst_SCRIPTS = couchjs_dev couch-config_dev
+noinst_SCRIPTS = couchjs_dev couch-config_dev erlang-version.escript
man_file = couchdb.1
[14/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/621a713f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/621a713f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/621a713f
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 621a713f30b7ea9493e208b3de36ba837778056a
Parents: c1ad087
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:11:43 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:11:43 2013 +0200
----------------------------------------------------------------------
src/my-first-couchdb-plugin/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/621a713f/src/my-first-couchdb-plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/Makefile.am b/src/my-first-couchdb-plugin/Makefile.am
index d15897f..d8021de 100644
--- a/src/my-first-couchdb-plugin/Makefile.am
+++ b/src/my-first-couchdb-plugin/Makefile.am
@@ -10,7 +10,7 @@
## License for the specific language governing permissions and limitations under
## the License.
-EXTRA_DIST =
+EXTRA_DIST = \
.gitignore \
Makefile.dist \
priv/default.d/my_first_couchdb_plugin.ini \
[05/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
set up couchjs-node with EXTRA_DIST
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/752be9a1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/752be9a1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/752be9a1
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 752be9a1a47abbd0e34d100420784e48fb528492
Parents: f9feff3
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:50:11 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:50:11 2013 +0200
----------------------------------------------------------------------
src/couchjs-node/Makefile.am | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/752be9a1/src/couchjs-node/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchjs-node/Makefile.am b/src/couchjs-node/Makefile.am
new file mode 100644
index 0000000..b7b5562
--- /dev/null
+++ b/src/couchjs-node/Makefile.am
@@ -0,0 +1,26 @@
+## 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 = \
+ couchjs-node/cli.js \
+ couchjs-node/console.js \
+ couchjs-node/couchdb.js \
+ couchjs-node/couchjs.js \
+ couchjs-node/inspector.js \
+ couchjs-node/Makefile.am \
+ couchjs-node/package.json \
+ couchjs-node/README.md \
+ couchjs-node/sandbox.js \
+ couchjs-node/stream.js \
+ couchjs-node/test/experiment.js \
+ couchjs-node/xml.js
[15/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
fix fauxton adds
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d63b9186
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d63b9186
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d63b9186
Branch: refs/heads/build-system-fixes-1.5.x
Commit: d63b91864765d49f6943dc182cff463ff504b584
Parents: 621a713
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:17:38 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:17:38 2013 +0200
----------------------------------------------------------------------
share/Makefile.am | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d63b9186/share/Makefile.am
----------------------------------------------------------------------
diff --git a/share/Makefile.am b/share/Makefile.am
index 3d9465f..4607d5e 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -71,29 +71,25 @@ nobase_dist_localdata_DATA = \
www/dialog/_save_view_as.html \
www/dialog/_upload_attachment.html \
www/document.html \
- share/www/fauxton \
- share/www/fauxton/css \
- share/www/fauxton/css/index.css \
- share/www/fauxton/img \
- share/www/fauxton/img/couchdb-site.png \
- share/www/fauxton/img/couchdblogo.png \
- share/www/fauxton/img/fontawesome-webfont.eot \
- share/www/fauxton/img/fontawesome-webfont.svg \
- share/www/fauxton/img/fontawesome-webfont.ttf \
- share/www/fauxton/img/fontawesome-webfont.woff \
- share/www/fauxton/img/FontAwesome.otf \
- share/www/fauxton/img/fontcustom_fauxton.eot \
- share/www/fauxton/img/fontcustom_fauxton.svg \
- share/www/fauxton/img/fontcustom_fauxton.ttf \
- share/www/fauxton/img/fontcustom_fauxton.woff \
- share/www/fauxton/img/glyphicons-halflings-white.png \
- share/www/fauxton/img/glyphicons-halflings.png \
- share/www/fauxton/img/linen.png \
- share/www/fauxton/img/loader.gif \
- share/www/fauxton/img/minilogo.png \
- share/www/fauxton/index.html \
- share/www/fauxton/js \
- share/www/fauxton/js/require.js \
+ www/fauxton/css/index.css \
+ www/fauxton/img/couchdb-site.png \
+ www/fauxton/img/couchdblogo.png \
+ www/fauxton/img/fontawesome-webfont.eot \
+ www/fauxton/img/fontawesome-webfont.svg \
+ www/fauxton/img/fontawesome-webfont.ttf \
+ www/fauxton/img/fontawesome-webfont.woff \
+ www/fauxton/img/FontAwesome.otf \
+ www/fauxton/img/fontcustom_fauxton.eot \
+ www/fauxton/img/fontcustom_fauxton.svg \
+ www/fauxton/img/fontcustom_fauxton.ttf \
+ www/fauxton/img/fontcustom_fauxton.woff \
+ www/fauxton/img/glyphicons-halflings-white.png \
+ www/fauxton/img/glyphicons-halflings.png \
+ www/fauxton/img/linen.png \
+ www/fauxton/img/loader.gif \
+ www/fauxton/img/minilogo.png \
+ www/fauxton/index.html \
+ www/fauxton/js/require.js \
www/favicon.ico \
www/image/add.png \
www/image/apply.gif \
[11/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
remove accidental edit
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1b994920
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1b994920
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1b994920
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 1b99492009787ab7f1d4b59070c2ecd908598171
Parents: 703d391
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:04:19 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:04:19 2013 +0200
----------------------------------------------------------------------
src/my-first-couchdb-plugin/Makefile.am | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1b994920/src/my-first-couchdb-plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/Makefile.am b/src/my-first-couchdb-plugin/Makefile.am
index cb3b70f..d15897f 100644
--- a/src/my-first-couchdb-plugin/Makefile.am
+++ b/src/my-first-couchdb-plugin/Makefile.am
@@ -13,7 +13,6 @@
EXTRA_DIST =
.gitignore \
Makefile.dist \
- Makefile.am \
priv/default.d/my_first_couchdb_plugin.ini \
README.md \
src/my_first_couchdb_plugin.app.src \
[03/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add plugins.html & pagination.rst to Makefiles
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/58584d7d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/58584d7d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/58584d7d
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 58584d7de0ad9292f8bc10b48ae744e879e8e4d7
Parents: 7b94b19
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:40:54 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:40:54 2013 +0200
----------------------------------------------------------------------
share/Makefile.am | 1 +
share/doc/build/Makefile.am | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/58584d7d/share/Makefile.am
----------------------------------------------------------------------
diff --git a/share/Makefile.am b/share/Makefile.am
index 135293d..fffcd69 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -105,6 +105,7 @@ nobase_dist_localdata_DATA = \
www/image/toggle-expand.gif \
www/image/twisty.gif \
www/index.html \
+ www/plugins.html \
www/replicator.html \
www/script/couch.js \
www/script/couch_tests.js \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/58584d7d/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 78558f4..30b933e 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -213,6 +213,7 @@ html_files = \
html/couchapp/views/intro.html \
html/couchapp/views/joins.html \
html/couchapp/views/nosql.html \
+ html/couchapp/views/pagination.html \
html/cve/2010-0009.html \
html/cve/2010-2234.html \
html/cve/2010-3854.html \
@@ -356,6 +357,7 @@ src_files = \
../src/couchapp/views/intro.rst \
../src/couchapp/views/joins.rst \
../src/couchapp/views/nosql.rst \
+ ../src/couchapp/views/pagination.rst \
../src/cve/2010-0009.rst \
../src/cve/2010-2234.rst \
../src/cve/2010-3854.rst \
[13/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add my-first-couchdb-plugin .gitignore
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c1ad0875
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c1ad0875
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c1ad0875
Branch: refs/heads/build-system-fixes-1.5.x
Commit: c1ad087535323c11cc36f61e5862f16440ae68c3
Parents: 3f455e8
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:11:36 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:11:36 2013 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
src/my-first-couchdb-plugin/.gitignore | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c1ad0875/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5f3c9df..2fdfb97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,11 +102,11 @@ src/fauxton/app/addons/*
!src/fauxton/app/addons/permissions
src/fauxton/settings.json*
!src/fauxton/settings.json.default
-
src/ibrowse/ibrowse.app
src/ibrowse/ibrowse.app
src/mochiweb/mochiweb.app
src/mochiweb/mochiweb.app
+!src/my-first-couchdb-plugin/.gitignore
src/snappy/.deps/
src/snappy/.libs/
src/snappy/google-snappy/.deps/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c1ad0875/src/my-first-couchdb-plugin/.gitignore
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/.gitignore b/src/my-first-couchdb-plugin/.gitignore
new file mode 100644
index 0000000..cfb2329
--- /dev/null
+++ b/src/my-first-couchdb-plugin/.gitignore
@@ -0,0 +1 @@
+ebin
[04/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add fauxton dist to Makefile
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f9feff35
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f9feff35
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f9feff35
Branch: refs/heads/build-system-fixes-1.5.x
Commit: f9feff35f8ad4ca7db54c003b90c9cfbae631916
Parents: 58584d7
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:42:38 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:42:42 2013 +0200
----------------------------------------------------------------------
share/Makefile.am | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f9feff35/share/Makefile.am
----------------------------------------------------------------------
diff --git a/share/Makefile.am b/share/Makefile.am
index fffcd69..3d9465f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -71,6 +71,29 @@ nobase_dist_localdata_DATA = \
www/dialog/_save_view_as.html \
www/dialog/_upload_attachment.html \
www/document.html \
+ share/www/fauxton \
+ share/www/fauxton/css \
+ share/www/fauxton/css/index.css \
+ share/www/fauxton/img \
+ share/www/fauxton/img/couchdb-site.png \
+ share/www/fauxton/img/couchdblogo.png \
+ share/www/fauxton/img/fontawesome-webfont.eot \
+ share/www/fauxton/img/fontawesome-webfont.svg \
+ share/www/fauxton/img/fontawesome-webfont.ttf \
+ share/www/fauxton/img/fontawesome-webfont.woff \
+ share/www/fauxton/img/FontAwesome.otf \
+ share/www/fauxton/img/fontcustom_fauxton.eot \
+ share/www/fauxton/img/fontcustom_fauxton.svg \
+ share/www/fauxton/img/fontcustom_fauxton.ttf \
+ share/www/fauxton/img/fontcustom_fauxton.woff \
+ share/www/fauxton/img/glyphicons-halflings-white.png \
+ share/www/fauxton/img/glyphicons-halflings.png \
+ share/www/fauxton/img/linen.png \
+ share/www/fauxton/img/loader.gif \
+ share/www/fauxton/img/minilogo.png \
+ share/www/fauxton/index.html \
+ share/www/fauxton/js \
+ share/www/fauxton/js/require.js \
www/favicon.ico \
www/image/add.png \
www/image/apply.gif \
[08/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add src/couchjs-node/Makedile to configure.ac
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6b48a9a9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6b48a9a9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6b48a9a9
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 6b48a9a950ece981496c9b5a2af66de9f1ae1418
Parents: d5cf182
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:58:07 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:58:07 2013 +0200
----------------------------------------------------------------------
configure.ac | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6b48a9a9/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8ebb602..321c651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -736,6 +736,7 @@ AC_CONFIG_FILES([src/couch_index/Makefile])
AC_CONFIG_FILES([src/couch_mrview/Makefile])
AC_CONFIG_FILES([src/couch_plugins/Makefile])
AC_CONFIG_FILES([src/couch_replicator/Makefile])
+AC_CONFIG_FILES([src/couchjs-node/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
AC_CONFIG_FILES([src/couchdb/priv/Makefile])
[17/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add erlang-version.escript to bin_SCRIPTS
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4a0044fa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4a0044fa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4a0044fa
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 4a0044fa3ad225ccd19b0bbba16eacc5ca7981f3
Parents: 812f67c
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:27:55 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:27:55 2013 +0200
----------------------------------------------------------------------
bin/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4a0044fa/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7a868df..59c69ba 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -15,12 +15,12 @@ MAKE_SAFE = $(MAKE)
if WINDOWS
bin_SCRIPTS = couchdb.bat
else
-bin_SCRIPTS = couchdb couch-config
+bin_SCRIPTS = couchdb couch-config erlang-version.escript
endif
man1dir = $(mandir)/man1
-noinst_SCRIPTS = couchjs_dev couch-config_dev erlang-version.escript
+noinst_SCRIPTS = couchjs_dev couch-config_dev
man_file = couchdb.1
[09/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
custom Makefile for my-first-couchdb-plugin
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/839beb04
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/839beb04
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/839beb04
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 839beb049de7815efe48aefe51aa57fb5e491dfb
Parents: 6b48a9a
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:02:04 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:02:04 2013 +0200
----------------------------------------------------------------------
configure.ac | 1 +
src/Makefile.am | 13 ++-------
src/my-first-couchdb-plugin/Makefile.am | 21 ++++++++++++++
src/my-first-couchdb-plugin/Makefile.dist | 38 ++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/839beb04/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 321c651..09c34dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -737,6 +737,7 @@ AC_CONFIG_FILES([src/couch_mrview/Makefile])
AC_CONFIG_FILES([src/couch_plugins/Makefile])
AC_CONFIG_FILES([src/couch_replicator/Makefile])
AC_CONFIG_FILES([src/couchjs-node/Makefile])
+AC_CONFIG_FILES([src/my-first-couchdb-plugin/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
AC_CONFIG_FILES([src/couchdb/priv/Makefile])
http://git-wip-us.apache.org/repos/asf/couchdb/blob/839beb04/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index d306cd5..13e73bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,14 +23,5 @@ SUBDIRS = \
ibrowse \
mochiweb \
snappy \
- couchjs-node
-
-EXTRA_DIST = \
- my-first-couchdb-plugin/.gitignore \
- my-first-couchdb-plugin/Makefile.dist \
- my-first-couchdb-plugin/Makefile.am \
- my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini \
- my-first-couchdb-plugin/README.md \
- my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src \
- my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl \
- my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl
+ couchjs-node \
+ my-first-couchdb-plugin
http://git-wip-us.apache.org/repos/asf/couchdb/blob/839beb04/src/my-first-couchdb-plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/Makefile.am b/src/my-first-couchdb-plugin/Makefile.am
new file mode 100644
index 0000000..cb3b70f
--- /dev/null
+++ b/src/my-first-couchdb-plugin/Makefile.am
@@ -0,0 +1,21 @@
+## 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 =
+ .gitignore \
+ Makefile.dist \
+ Makefile.am \
+ priv/default.d/my_first_couchdb_plugin.ini \
+ README.md \
+ src/my_first_couchdb_plugin.app.src \
+ src/my_first_couchdb_plugin.erl \
+ test/my_first_couchdb_plugin_tests.erl
http://git-wip-us.apache.org/repos/asf/couchdb/blob/839beb04/src/my-first-couchdb-plugin/Makefile.dist
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/Makefile.dist b/src/my-first-couchdb-plugin/Makefile.dist
new file mode 100644
index 0000000..7806bd7
--- /dev/null
+++ b/src/my-first-couchdb-plugin/Makefile.dist
@@ -0,0 +1,38 @@
+## 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.
+
+# Customize here
+NAME=my_first_couchdb_plugin
+VERSION=1.0.0
+# Stop customizing here
+
+ERL=$(shell couch-config --erl-bin)
+ERLANG_VERSION=$(shell couch-config --erlang-version)
+COUCHDB_VERSION=$(shell couch-config --couch-version | sed 's/\+.*//')
+PLUGIN_DIRS=ebin priv
+PLUGIN_VERSION_SLUG=$(NAME)-$(VERSION)-$(ERLANG_VERSION)-$(COUCHDB_VERSION)
+PLUGIN_DIST=$(PLUGIN_VERSION_SLUG)
+
+all: compile
+
+compile:
+ ERL_LIBS=$(shell couch-config --erl-libs-dir):$(ERL_LIBS) rebar compile
+
+dev:
+ @ERL_LIBS=$(shell pwd) couchdb -i -a priv/default.d/*.ini
+
+plugin: compile
+ @mkdir -p $(PLUGIN_DIRS)
+ @mkdir -p $(PLUGIN_DIST)
+ @cp -r $(PLUGIN_DIRS) $(PLUGIN_DIST)
+ @tar czf $(PLUGIN_VERSION_SLUG).tar.gz $(PLUGIN_DIST)
+ @$(ERL) -eval 'File = "$(PLUGIN_VERSION_SLUG).tar.gz", {ok, Data} = file:read_file(File),io:format("~s: ~s~n", [File, base64:encode(crypto:sha(Data))]),halt()' -noshell
[07/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
trailing spaces
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d5cf182c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d5cf182c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d5cf182c
Branch: refs/heads/build-system-fixes-1.5.x
Commit: d5cf182c3fe52a3700ceca18a6f8faf14c66a42d
Parents: cb1191e
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:57:43 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:57:43 2013 +0200
----------------------------------------------------------------------
configure.ac | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d5cf182c/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a5c7f86..8ebb602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ AS_IF([test x${ERL} = x], [
AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
])
-AC_ARG_WITH([erlang],
+AC_ARG_WITH([erlang],
[AS_HELP_STRING([--with-erlang=PATH],
[set PATH to the Erlang include directory])
], [
@@ -477,35 +477,35 @@ tests_enabled=yes
docs_enabled=yes
strictness_enabled=no
-AC_ARG_ENABLE([init],
+AC_ARG_ENABLE([init],
[AS_HELP_STRING([--disable-init],
[don't install init script where applicable])
], [
use_init=$enableval
], [])
-AC_ARG_ENABLE([launchd],
+AC_ARG_ENABLE([launchd],
[AS_HELP_STRING([--disable-launchd],
[don't install launchd configuration where applicable])
], [
use_launchd=$enableval
], [])
-AC_ARG_ENABLE([native-mochijson],
+AC_ARG_ENABLE([native-mochijson],
[AS_HELP_STRING([--enable-native-mochijson],
[compile mochijson to native code (EXPERIMENTAL)])
], [
native_mochijson_enabled=$enableval
], [])
-AC_ARG_ENABLE([tests],
+AC_ARG_ENABLE([tests],
[AS_HELP_STRING([--disable-tests],
[skip tests during build])
], [
tests_enabled=$enableval
], [])
-AC_ARG_ENABLE([docs],
+AC_ARG_ENABLE([docs],
[AS_HELP_STRING([--disable-docs],
[skip docs during build])
], [
@@ -615,7 +615,7 @@ if test x${docs_enabled} = xyes; then
build_html=yes
if test x${HAS_MAKEINFO} = xyes; then
build_info=yes
- fi
+ fi
if test x${HAS_PDFLATEX} = xyes; then
build_pdf=yes
fi
[18/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
move erlang-version.escript to EXTRA_DIST
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/db743ae6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/db743ae6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/db743ae6
Branch: refs/heads/build-system-fixes-1.5.x
Commit: db743ae66957294d4eb1e6d3b972463da00c1501
Parents: 4a0044f
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 16:00:39 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 16:00:39 2013 +0200
----------------------------------------------------------------------
bin/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/db743ae6/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 59c69ba..aeb0953 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -15,7 +15,7 @@ MAKE_SAFE = $(MAKE)
if WINDOWS
bin_SCRIPTS = couchdb.bat
else
-bin_SCRIPTS = couchdb couch-config erlang-version.escript
+bin_SCRIPTS = couchdb couch-config
endif
man1dir = $(mandir)/man1
@@ -32,7 +32,7 @@ endif
BUILT_SOURCES = $(man_file_build)
-EXTRA_DIST = $(man_file_build)
+EXTRA_DIST = $(man_file_build) erlang-version.escript
CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
[06/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
set up my-first-couchdb-plugin with EXTRA_DIST
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cb1191e3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cb1191e3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cb1191e3
Branch: refs/heads/build-system-fixes-1.5.x
Commit: cb1191e36712d90145738e8b21e707041b422078
Parents: 752be9a
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 14:50:25 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 14:57:01 2013 +0200
----------------------------------------------------------------------
src/Makefile.am | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb1191e3/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index c500e11..d306cd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,4 +22,15 @@ SUBDIRS = \
etap \
ibrowse \
mochiweb \
- snappy
+ snappy \
+ couchjs-node
+
+EXTRA_DIST = \
+ my-first-couchdb-plugin/.gitignore \
+ my-first-couchdb-plugin/Makefile.dist \
+ my-first-couchdb-plugin/Makefile.am \
+ my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini \
+ my-first-couchdb-plugin/README.md \
+ my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src \
+ my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl \
+ my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl
[12/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
remove more accidental edits
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3f455e89
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3f455e89
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3f455e89
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 3f455e891d0bd5cc65b5047f415309c999a2e83f
Parents: 1b99492
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:06:51 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:06:51 2013 +0200
----------------------------------------------------------------------
src/couchjs-node/Makefile.am | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f455e89/src/couchjs-node/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchjs-node/Makefile.am b/src/couchjs-node/Makefile.am
index b7b5562..2144970 100644
--- a/src/couchjs-node/Makefile.am
+++ b/src/couchjs-node/Makefile.am
@@ -10,17 +10,15 @@
## License for the specific language governing permissions and limitations under
## the License.
-
EXTRA_DIST = \
- couchjs-node/cli.js \
- couchjs-node/console.js \
- couchjs-node/couchdb.js \
- couchjs-node/couchjs.js \
- couchjs-node/inspector.js \
- couchjs-node/Makefile.am \
- couchjs-node/package.json \
- couchjs-node/README.md \
- couchjs-node/sandbox.js \
- couchjs-node/stream.js \
- couchjs-node/test/experiment.js \
- couchjs-node/xml.js
+ cli.js \
+ console.js \
+ couchdb.js \
+ couchjs.js \
+ inspector.js \
+ package.json \
+ README.md \
+ sandbox.js \
+ stream.js \
+ test/experiment.js \
+ xml.js
[02/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
add src/couch_plugins/README.md to EXTRA_DIST
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7b94b198
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7b94b198
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7b94b198
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 7b94b198140c6e4047cff98329eefd2d08df7376
Parents: c89dfe3
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Oct 3 22:27:42 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Oct 3 22:27:42 2013 +0200
----------------------------------------------------------------------
src/couch_plugins/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7b94b198/src/couch_plugins/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_plugins/Makefile.am b/src/couch_plugins/Makefile.am
index 91adfae..37cd9d5 100644
--- a/src/couch_plugins/Makefile.am
+++ b/src/couch_plugins/Makefile.am
@@ -26,7 +26,7 @@ compiled_files = \
ebin/couch_plugins.beam \
ebin/couch_plugins_httpd.beam
-EXTRA_DIST = $(source_files)
+EXTRA_DIST = $(source_files) README.md
CLEANFILES = $(compiled_files)
ebin/%.app: src/%.app.src
[16/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
update license.skip with generated files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/812f67c8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/812f67c8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/812f67c8
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 812f67c859e20b56f367777c6069ac85864e931f
Parents: d63b918
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:25:07 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:25:07 2013 +0200
----------------------------------------------------------------------
license.skip | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/812f67c8/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 13070db..686e032 100644
--- a/license.skip
+++ b/license.skip
@@ -112,6 +112,8 @@
^src/couchjs-node/package.json
^src/couchjs-node/sandbox.js
^src/couchjs-node/README.md
+^src/couchjs-node/Makefile
+^src/couchjs-node/Makefile.in
^src/erlang-oauth/.*
^src/couch_dbupdates
^src/ejson/.*
[10/18] git commit: updated refs/heads/build-system-fixes-1.5.x to
db743ae
Posted by ja...@apache.org.
advise renaming the Makefile
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/703d3912
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/703d3912
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/703d3912
Branch: refs/heads/build-system-fixes-1.5.x
Commit: 703d3912cad28666af1c82edae6775d7107de3fe
Parents: 839beb0
Author: Jan Lehnardt <ja...@apache.org>
Authored: Fri Oct 4 15:02:50 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Fri Oct 4 15:02:50 2013 +0200
----------------------------------------------------------------------
src/my-first-couchdb-plugin/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/703d3912/src/my-first-couchdb-plugin/README.md
----------------------------------------------------------------------
diff --git a/src/my-first-couchdb-plugin/README.md b/src/my-first-couchdb-plugin/README.md
index 814ef3b..bce2124 100644
--- a/src/my-first-couchdb-plugin/README.md
+++ b/src/my-first-couchdb-plugin/README.md
@@ -36,7 +36,7 @@ Next, install *rebar* from <https://github.com/rebar/rebar>. Rebar is a build to
It doesn’t do much, but you get your first module going. Let’s try to compile it.
-`my_first_couchdb_plugin` comes with a `Makefile` that helps you with common tasks.
+`my_first_couchdb_plugin` comes with a `Makefile.dist` that helps you with common tasks. To make your life easier, rename it from `Makefile.dist` to `Makefile`.
To compile your code, simply run: