diff options
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | license.skip | 10 | ||||
-rw-r--r-- | share/Makefile.am | 2 | ||||
-rw-r--r-- | share/examples/Makefile.am | 22 | ||||
-rw-r--r-- | share/examples/my-first-couchdb-plugin/README.md (renamed from src/my-first-couchdb-plugin/README.md) | 0 | ||||
-rw-r--r-- | share/examples/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini (renamed from src/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini) | 0 | ||||
-rw-r--r-- | share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src (renamed from src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src) | 0 | ||||
-rw-r--r-- | share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl (renamed from src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl) | 0 | ||||
-rw-r--r-- | share/examples/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl (renamed from src/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl) | 0 | ||||
-rw-r--r-- | src/Makefile.am | 13 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/.gitignore | 1 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/Makefile | 38 |
12 files changed, 31 insertions, 58 deletions
diff --git a/configure.ac b/configure.ac index 6c5ef5b63..1f2dce76c 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h]) -AM_INIT_AUTOMAKE([1.6.3 foreign]) +AM_INIT_AUTOMAKE([1.6.3 foreign tar-ustar]) AC_USE_SYSTEM_EXTENSIONS AC_ENABLE_SHARED @@ -730,6 +730,7 @@ AC_CONFIG_FILES([etc/Makefile]) AC_CONFIG_FILES([share/Makefile]) AC_CONFIG_FILES([share/doc/Makefile]) AC_CONFIG_FILES([share/doc/build/Makefile]) +AC_CONFIG_FILES([share/examples/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/couch_dbupdates/Makefile]) AC_CONFIG_FILES([src/couch_index/Makefile]) diff --git a/license.skip b/license.skip index 0895cf860..800957dcc 100644 --- a/license.skip +++ b/license.skip @@ -68,6 +68,11 @@ ^share/doc/src/conf.pyc ^share/doc/static/rtd.css ^share/doc/templates/couchdb/domainindex.html +^share/examples/my-first-couchdb-plugin/priv/*/* +^share/examples/my-first-couchdb-plugin/README.md +^share/examples/my-first-couchdb-plugin/.gitignore +^share/examples/my-first-couchdb-plugin/Makefile +^share/examples/my-first-couchdb-plugin/Makefile.in ^share/server/json2.js ^share/server/mimeparse.js ^share/server/coffee-script.js @@ -154,11 +159,6 @@ ^src/fauxton/assets/lib/ace/.* ^src/ibrowse/.* ^src/mochiweb/.* -^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 84b91cb9a..8c03ba434 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -10,7 +10,7 @@ ## License for the specific language governing permissions and limitations under ## the License. -SUBDIRS = doc +SUBDIRS = doc examples JS_FILE = server/main.js diff --git a/share/examples/Makefile.am b/share/examples/Makefile.am new file mode 100644 index 000000000..e947028b4 --- /dev/null +++ b/share/examples/Makefile.am @@ -0,0 +1,22 @@ +## 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 = $(MY_FIRST_COUCHDB_PLUGIN_FILES) + +MY_FIRST_COUCHDB_PLUGIN_FILES = \ + 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/my-first-couchdb-plugin/README.md b/share/examples/my-first-couchdb-plugin/README.md index 814ef3b88..814ef3b88 100644 --- a/src/my-first-couchdb-plugin/README.md +++ b/share/examples/my-first-couchdb-plugin/README.md diff --git a/src/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini b/share/examples/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini index e69de29bb..e69de29bb 100644 --- a/src/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini +++ b/share/examples/my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini diff --git a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src b/share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src index 9a24bf8e6..9a24bf8e6 100644 --- a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src +++ b/share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src diff --git a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl b/share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl index 64d728c5b..64d728c5b 100644 --- a/src/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl +++ b/share/examples/my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl diff --git a/src/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl b/share/examples/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl index 53d75df32..53d75df32 100644 --- a/src/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl +++ b/share/examples/my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl diff --git a/src/Makefile.am b/src/Makefile.am index 378f82b1e..fc0e62d3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,18 +25,7 @@ SUBDIRS = \ snappy \ couchjs-node -EXTRA_DIST = \ - $(MY_FIRST_COUCHDB_PLUGIN_FILES) \ - $(FAUXTON_FILES) - -MY_FIRST_COUCHDB_PLUGIN_FILES = \ - 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 +EXTRA_DIST = $(FAUXTON_FILES) FAUXTON_FILES = \ fauxton/app/addons/activetasks/assets/less/activetasks.less \ diff --git a/src/my-first-couchdb-plugin/.gitignore b/src/my-first-couchdb-plugin/.gitignore deleted file mode 100644 index cfb232981..000000000 --- a/src/my-first-couchdb-plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ebin diff --git a/src/my-first-couchdb-plugin/Makefile b/src/my-first-couchdb-plugin/Makefile deleted file mode 100644 index 7806bd7b4..000000000 --- a/src/my-first-couchdb-plugin/Makefile +++ /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. - -# 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 |