diff options
author | Jan Lehnardt <jan@apache.org> | 2013-10-07 18:19:15 +0200 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2013-10-07 18:19:15 +0200 |
commit | 659699def483c4cd59e273bfe130fe1bde067245 (patch) | |
tree | a695855dd85f8c5d391ad790e62e60b2425e545e | |
parent | f7a18d3d5a10b460f4fe4d7d00f86275d5257190 (diff) | |
parent | 100b18216df81ba2a41d5528bc81ff5b8443364d (diff) | |
download | couchdb-659699def483c4cd59e273bfe130fe1bde067245.tar.gz |
Merge branch 'build-system-fixes-1.5.x'
* build-system-fixes-1.5.x: (22 commits)
the last line is intentionally left blank to appease POSIX gods
[my-first-couchdb-plugin] remove note about ex-Makefile.dist
move build system edits for my-first-couchdb-plugin to src/
[my-first-couchdb-plugin] use Apache 2 License
move erlang-version.escript to EXTRA_DIST
add erlang-version.escript to bin_SCRIPTS
update license.skip with generated files
fix fauxton adds
fix typo
add my-first-couchdb-plugin .gitignore
remove more accidental edits
remove accidental edit
advise renaming the Makefile
custom Makefile for my-first-couchdb-plugin
add src/couchjs-node/Makedile to configure.ac
trailing spaces
set up my-first-couchdb-plugin with EXTRA_DIST
set up couchjs-node with EXTRA_DIST
add fauxton dist to Makefile
add plugins.html & pagination.rst to Makefiles
...
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | bin/Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | license.skip | 8 | ||||
-rw-r--r-- | share/Makefile.am | 20 | ||||
-rw-r--r-- | share/doc/build/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 12 | ||||
-rw-r--r-- | src/couch_plugins/Makefile.am | 2 | ||||
-rw-r--r-- | src/couchjs-node/Makefile.am | 24 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/.gitignore | 1 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/Makefile | 38 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src | 12 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl | 12 |
13 files changed, 139 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 5f3c9df2a..cc2398bab 100644 --- a/.gitignore +++ b/.gitignore @@ -102,11 +102,12 @@ 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/my-first-couchdb-plugin/Makefile src/snappy/.deps/ src/snappy/.libs/ src/snappy/google-snappy/.deps/ diff --git a/bin/Makefile.am b/bin/Makefile.am index 5d722ac55..aeb095369 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -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) diff --git a/configure.ac b/configure.ac index 7ab4e66be..6c5ef5b63 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 @@ -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]) diff --git a/license.skip b/license.skip index 13070dba5..3321a6d7b 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/.* @@ -135,7 +137,11 @@ ^src/fauxton/app/addons/permissions/assets/less/permissions.less ^src/ibrowse/.* ^src/mochiweb/.* -^src/my-first-couchdb-plugin/.* +^src/my-first-couchdb-plugin/priv/*/* +^src/my-first-couchdb-plugin/README.md +^src/my-first-couchdb-plugin/.gitignore +^src/my-first-couchdb-plugin/Makefile +^src/my-first-couchdb-plugin/Makefile.in ^src/snappy/.* ^stamp-h1 ^test/Makefile diff --git a/share/Makefile.am b/share/Makefile.am index 135293d58..4607d5ec1 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -71,6 +71,25 @@ nobase_dist_localdata_DATA = \ www/dialog/_save_view_as.html \ www/dialog/_upload_attachment.html \ www/document.html \ + 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 \ @@ -105,6 +124,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 \ diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am index 78558f438..30b933e6b 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 \ diff --git a/src/Makefile.am b/src/Makefile.am index c500e1189..f8466b0ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,4 +22,14 @@ SUBDIRS = \ etap \ ibrowse \ mochiweb \ - snappy + snappy \ + couchjs-node + +EXTRA_DIST = \ + my-first-couchdb-plugin/.gitignore \ + my-first-couchdb-plugin/Makefile \ + 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 diff --git a/src/couch_plugins/Makefile.am b/src/couch_plugins/Makefile.am index 91adfae91..37cd9d5c1 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 diff --git a/src/couchjs-node/Makefile.am b/src/couchjs-node/Makefile.am new file mode 100644 index 000000000..21449702a --- /dev/null +++ b/src/couchjs-node/Makefile.am @@ -0,0 +1,24 @@ +## 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.js \ + console.js \ + couchdb.js \ + couchjs.js \ + inspector.js \ + package.json \ + README.md \ + sandbox.js \ + stream.js \ + test/experiment.js \ + xml.js diff --git a/src/my-first-couchdb-plugin/.gitignore b/src/my-first-couchdb-plugin/.gitignore new file mode 100644 index 000000000..cfb232981 --- /dev/null +++ b/src/my-first-couchdb-plugin/.gitignore @@ -0,0 +1 @@ +ebin diff --git a/src/my-first-couchdb-plugin/Makefile b/src/my-first-couchdb-plugin/Makefile new file mode 100644 index 000000000..7806bd7b4 --- /dev/null +++ b/src/my-first-couchdb-plugin/Makefile @@ -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 diff --git a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src b/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src index 01ce89756..9a24bf8e6 100644 --- a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src +++ b/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src @@ -1,3 +1,15 @@ +% 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. + %% -*- mode: erlang -*- {application, my_first_couchdb_plugin, [ {description, "My First CouchDB Plugin"}, diff --git a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl b/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl index b1bdd04bc..64d728c5b 100644 --- a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl +++ b/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl @@ -1,3 +1,15 @@ +% 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. + -module(my_first_couchdb_plugin). -export([my_func/0]). |