From 266c56b79172ad0748241f6e0ecf74dbb89a645b Mon Sep 17 00:00:00 2001 From: Joan Touzet Date: Mon, 26 Mar 2018 18:14:49 -0400 Subject: Various top-level directory cleanups * Replace list of committers with link to ASF page showing committer list * Move introspect escript to build-aux/, update Makefiles to match * Remove unmaintained Vagrantfile, if a new maintainer steps up we can revisit * Remove obsolete license.skip file, was used for auto-header insertion --- COMMITTERS.md | 51 ++----------- Makefile | 2 +- Makefile.win | 2 +- Vagrantfile | 69 ----------------- build-aux/introspect | 73 ++++++++++++++++++ introspect | 73 ------------------ license.skip | 204 --------------------------------------------------- 7 files changed, 81 insertions(+), 393 deletions(-) delete mode 100644 Vagrantfile create mode 100755 build-aux/introspect delete mode 100755 introspect delete mode 100644 license.skip diff --git a/COMMITTERS.md b/COMMITTERS.md index 7412efcb5..3b25283e3 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -2,49 +2,10 @@ Apache CouchDB COMMITTERS ========================= Committers are given a binding vote in certain project decisions, as well as -write access to public project infrastructure. The following people were -elected as a committer in recognition of their commitment to the project. We -mean this in the sense of being loyal to the project and its interests. +write access to public project infrastructure. Committers are elected to the +project in recognition of their committment to Apache CouchDB. We mean this in +the sense of being loyal to the project and its interests. - * Damien Katz - * Jan Lehnardt - * Noah Slater - * Christopher Lenz - * J. Chris Anderson - * Paul Joseph Davis - * Adam Kocoloski - * Jason Davies - * Mark Hammond - * Benoît Chesneau - * Filipe Manana - * Robert Newson - * Randall Leeds - * Bob Dionne - * Dave Cottlehuber - * Jason Smith - * Joan Touzet - * Dale Harvey - * Dirkjan Ochtman - * Alexander Shorin - * Garren Smith - * Sue Lockwood - * Andy Wenk - * Klaus Trainer - * Benjamin Young - * Robert Kowalski - * Diana Thayer - * Gianugo Rabellino - * Jenn Schiffer - * Lena Reinhard - * Simon Metson - * Mike Wallace - * Nick North - * Ryan Ramage - * Sebastian Rothbucher - * Ted Leung - * Wendall Cada - * Benjamin Bastian - * Ben Keen - * Maria Andersson - * Michelle Phung - * Clemens Stolle +A full list of committers elected to the project is available at: + + https://people.apache.org/committers-by-project.html#couchdb diff --git a/Makefile b/Makefile index 006ad5496..1315dda8b 100644 --- a/Makefile +++ b/Makefile @@ -270,7 +270,7 @@ dialyze: .rebar # target: introspect - Check for commits difference between rebar.config and repository introspect: @$(REBAR) -r update-deps - @./introspect + @build-aux/introspect ################################################################################ # Distributing diff --git a/Makefile.win b/Makefile.win index 7ff0ab5c5..91f91a548 100644 --- a/Makefile.win +++ b/Makefile.win @@ -141,7 +141,7 @@ dialyze: .rebar # target: introspect - Check for commits difference between rebar.config and repository introspect: @$(REBAR) -r update-deps - @escript .\introspect + @escript build-aux\introspect ################################################################################ diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index b7634a212..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,69 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -BOX_NAME = ENV['BOX_NAME'] || "ubuntu" -BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box" -AWS_REGION = ENV['AWS_REGION'] || "us-east-1" -AWS_AMI = ENV['AWS_AMI'] || "ami-d0f89fb9" - -Vagrant::Config.run do |config| - # Setup virtual machine box. This VM configuration code is always executed. - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - - # Install couchdb dependencies if deployment was not done - if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty? - # install build-essential - pkg_cmd = "apt-get update -qq; apt-get install -q -y build-essential git " \ - "autoconf autoconf-archive gnu-standards help2man; " - - # Install erlang - pkg_cmd << "apt-get install -q -y erlang-base erlang-dev " \ - "erlang-manpages erlang-eunit erlang-nox erlang-xmerl erlang-inets; " - - # couchdb developper dependencies - pkg_cmd << "apt-get install -q -y libmozjs185-dev libicu-dev " \ - "curl libcurl4-gnutls-dev libtool; " - - # doc dependencies - pkg_cmd << "apt-get install -q -y help2man python-sphinx python-pip; " \ - "pip install -U pygments; " - - config.vm.provision :shell, :inline => pkg_cmd - end -end - - -# Providers were added on Vagrant >= 1.1.0 -Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config| - config.vm.provider :aws do |aws, override| - aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"] - aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"] - aws.keypair_name = ENV["AWS_KEYPAIR_NAME"] - override.ssh.private_key_path = ENV["AWS_SSH_PRIVKEY"] - override.ssh.username = "ubuntu" - aws.region = AWS_REGION - aws.ami = AWS_AMI - aws.instance_type = "t1.micro" - end - - config.vm.provider :rackspace do |rs| - config.ssh.private_key_path = ENV["RS_PRIVATE_KEY"] - rs.username = ENV["RS_USERNAME"] - rs.api_key = ENV["RS_API_KEY"] - rs.public_key_path = ENV["RS_PUBLIC_KEY"] - rs.flavor = /512MB/ - rs.image = /Ubuntu/ - end - - config.vm.provider :virtualbox do |vb| - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - end - - config.vm.provider :lxc do |lxc| - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - lxc.customize 'cgroup.memory.limit_in_bytes', '1024M' - end -end diff --git a/build-aux/introspect b/build-aux/introspect new file mode 100755 index 000000000..9b527455f --- /dev/null +++ b/build-aux/introspect @@ -0,0 +1,73 @@ +#!/usr/bin/env escript +%% -*- mode: erlang -*- + +main(_) -> + introspect("rebar.config.script"). + +introspect(File) -> + Bindings = [{'SCRIPT', File}, {'CONFIG', []}], + {ok, Config} = file:script(File, Bindings), + {deps, Deps} = lists:keyfind(deps, 1, Config), + introspect_deps(Deps). + +introspect_deps([]) -> + ok; +introspect_deps([Dep | Rest]) -> + introspect_dep(Dep), + introspect_deps(Rest). + +introspect_dep({App, VsnRegex, {git, Url, From}, _Raw}) -> + introspect_dep({App, VsnRegex, {git, Url, From}}); +introspect_dep({App, _VsnRegex, {git, _Url, From}}) -> + io:format(bold("~s~n"), [App]), + introspect_diff(App, From), + io:format("~n", []), + ok. + +revision({branch, Branch}) -> + Branch; +revision({tag, Tag}) -> + Tag; +revision(Rev) -> + Rev. + +introspect_diff(App, From) -> + introspect_diff(App, revision(From), "origin/master"). + +introspect_diff(App, From, ToBranch) -> + {ok, Log} = sh(App, io_lib:format("git log --pretty=oneline ~s..~s", [From, ToBranch])), + case Log of + [] -> + io:format(" up to date on ~s~n", [bold(ToBranch)]); + _ -> + io:format(" ~B commits behind ~s~n", [length(Log), bold(ToBranch)]), + io:format("~s~n~n", [string:join([" " ++ L || L <- Log], "\n")]) + end. + +sh(App, Cmd) -> + Dir = lists:flatten(["src/", atom_to_list(App)]), + Port = open_port({spawn, lists:flatten(Cmd)}, + [{cd, Dir}, + {line, 16384}, + exit_status, + stderr_to_stdout, + use_stdio]), + read_port(Port). + +read_port(Port) -> + read_port(Port, []). + +read_port(Port, Acc) -> + receive + {Port, {data, {eol, Line}}} -> + read_port(Port, [Line | Acc]); + {Port, {data, {noeol, Line}}} -> + read_port(Port, [Line | Acc]); + {Port, {exit_status, 0}} -> + {ok, lists:reverse(Acc)}; + {Port, {exit_status, Code}} -> + {error, Code, Acc} + end. + +bold(Text) -> + "\e[1m" ++ Text ++ "\e[0m". diff --git a/introspect b/introspect deleted file mode 100755 index 9b527455f..000000000 --- a/introspect +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env escript -%% -*- mode: erlang -*- - -main(_) -> - introspect("rebar.config.script"). - -introspect(File) -> - Bindings = [{'SCRIPT', File}, {'CONFIG', []}], - {ok, Config} = file:script(File, Bindings), - {deps, Deps} = lists:keyfind(deps, 1, Config), - introspect_deps(Deps). - -introspect_deps([]) -> - ok; -introspect_deps([Dep | Rest]) -> - introspect_dep(Dep), - introspect_deps(Rest). - -introspect_dep({App, VsnRegex, {git, Url, From}, _Raw}) -> - introspect_dep({App, VsnRegex, {git, Url, From}}); -introspect_dep({App, _VsnRegex, {git, _Url, From}}) -> - io:format(bold("~s~n"), [App]), - introspect_diff(App, From), - io:format("~n", []), - ok. - -revision({branch, Branch}) -> - Branch; -revision({tag, Tag}) -> - Tag; -revision(Rev) -> - Rev. - -introspect_diff(App, From) -> - introspect_diff(App, revision(From), "origin/master"). - -introspect_diff(App, From, ToBranch) -> - {ok, Log} = sh(App, io_lib:format("git log --pretty=oneline ~s..~s", [From, ToBranch])), - case Log of - [] -> - io:format(" up to date on ~s~n", [bold(ToBranch)]); - _ -> - io:format(" ~B commits behind ~s~n", [length(Log), bold(ToBranch)]), - io:format("~s~n~n", [string:join([" " ++ L || L <- Log], "\n")]) - end. - -sh(App, Cmd) -> - Dir = lists:flatten(["src/", atom_to_list(App)]), - Port = open_port({spawn, lists:flatten(Cmd)}, - [{cd, Dir}, - {line, 16384}, - exit_status, - stderr_to_stdout, - use_stdio]), - read_port(Port). - -read_port(Port) -> - read_port(Port, []). - -read_port(Port, Acc) -> - receive - {Port, {data, {eol, Line}}} -> - read_port(Port, [Line | Acc]); - {Port, {data, {noeol, Line}}} -> - read_port(Port, [Line | Acc]); - {Port, {exit_status, 0}} -> - {ok, lists:reverse(Acc)}; - {Port, {exit_status, Code}} -> - {error, Code, Acc} - end. - -bold(Text) -> - "\e[1m" ++ Text ++ "\e[0m". diff --git a/license.skip b/license.skip deleted file mode 100644 index 35f91e13c..000000000 --- a/license.skip +++ /dev/null @@ -1,204 +0,0 @@ -\/\.git\/ -\.gitignore -^.*.DS_Store -^.*.beam -^AUTHORS -^BUGS.md -^COMMITTERS.md -^CHANGES -^DEVELOPERS -^DEVELOPERS.gz -^INSTALL.md -^INSTALL.Unix.md -^INSTALL.Unix.md.gz -^INSTALL.Windows.md -^INSTALL.Windows.md.gz -^INSTALL.gz -^LICENSE.gz -^Makefile -^Makefile.in -^NEWS -^NOTICE -^README -^README.rst -^README-DEV.md -^THANKS -^aclocal.m4 -^apache-couchdb-.* -^autom4te.cache/.* -^bin/Makefile -^bin/Makefile.in -^bin/couchdb.1 -^bin/couchjs.1 -^bin/erlang-version.escript -^build-aux/.* -^config..* -^configure -^couchdb.stderr -^couchdb.stdout -^cover/.*.coverdata -^cover/.*.html -^erl_crash.dump -^dev/lib/.* -^dev/logs/.* -^etc/Makefile -^etc/Makefile.in -^etc/couchdb/Makefile -^etc/couchdb/Makefile.in -^etc/couchdb/default.* -^etc/couchdb/local.* -^etc/default/Makefile -^etc/default/Makefile.in -^etc/default/couchdb -^etc/init/Makefile -^etc/init/Makefile.in -^etc/launchd/Makefile -^etc/launchd/Makefile.in -^etc/launchd/org.apache.couchdb.plist -^etc/logrotate.d/Makefile -^etc/logrotate.d/Makefile.in -^etc/logrotate.d/couchdb.* -^etc/windows/Makefile -^etc/windows/README.txt.tpl -^libtool -^license.skip -^m4/.* -^rel/overlay/etc/default.* -^rel/overlay/etc/local.* -^share/Makefile -^share/Makefile.in -^share/server/json2.js -^share/server/mimeparse.js -^share/server/coffee-script.js -^share/www/favicon.ico -^share/www/image/.* -^share/www/script/jquery..* -^share/www/script/json2.js -^share/www/script/jspec/.* -^share/www/script/sha1.js -^share/www/script/base64.js -^share/www/script/test/lorem.* -^share/www/style/jquery-ui-1.8.11.custom.css -^share/www/fauxton/img/.* -^share/www/fauxton/js/ace/mode-javascript.js -^share/www/fauxton/js/ace/mode-json.js -^share/www/fauxton/js/ace/theme-crimson_editor.js -^share/www/fauxton/js/ace/worker-javascript.js -^share/www/fauxton/js/ace/worker-json.js -^src/Makefile -^src/Makefile.in -^src/chttpd/ebin/chttpd.app -^src/config/ebin/config.app -^src/couch/ebin/couch.app -^src/couch/ebin/.*.beam -^src/couch/priv/.*.so -^src/couch/priv/couch_js/.*.o -^src/couch/priv/icu_driver/.*.o -^src/couch/priv/couchjs -^src/couch/priv/couchspawnkillable -^src/couch/priv/stat_descriptions.cfg -^src/couch_index/Makefile -^src/couch_index/Makefile.in -^src/couch_index/ebin/.*.beam -^src/couch_index/ebin/couch_index.app -^src/couch_mrview/Makefile -^src/couch_mrview/Makefile.in -^src/couch_mrview/ebin/.*.beam -^src/couch_mrview/ebin/couch_mrview.app -^src/couch_plugins/README.md -^src/couch_plugins/Makefile -^src/couch_plugins/Makefile.in -^src/couch_plugins/ebin/.*.beam -^src/couch_replicator/Makefile -^src/couch_replicator/Makefile.in -^src/couch_replicator/README.md -^src/couch_replicator/ebin/.*.beam -^src/couch/.*.beam -^src/couch/.deps/.* -^src/couch/Makefile -^src/couch/Makefile.in -^src/couch/couch.app.* -^src/couch/priv/.*.o -^src/couch/priv/.deps/.* -^src/couch/priv/Makefile -^src/couch/priv/Makefile.in -^src/couch/priv/couch_icu_driver.la -^src/couch/priv/couchjs -^src/couch/priv/couchspawnkillable -^src/couch/priv/stat_descriptions.cfg -^src/couch/priv/icu_driver/.deps/.dirstamp -^src/couch/priv/icu_driver/.dirstamp -^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/couch_dbupdates -^src/ejson/.* -^src/fauxton/app/addons/config/assets/less/config.less -^src/fauxton/assets/css/codemirror.css -^src/fauxton/assets/css/nv.d3.css -^src/fauxton/assets/img/.* -^src/fauxton/assets/js/libs/.*.js -^src/fauxton/assets/js/libs/ace/.*.js -^src/fauxton/assets/js/libs/ace/snippets/.*.js -^src/fauxton/assets/js/plugins/.*.js -^src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf -^src/fauxton/assets/less/bootstrap/.*.less -^src/fauxton/assets/less/bootstrap/tests/css-tests.css -^src/fauxton/assets/less/bootstrap/tests/buttons.html -^src/fauxton/favicon.ico -^src/fauxton/package.json -^src/fauxton/extensions.md -^src/fauxton/readme.md -^src/fauxton/writing_addons.md -^src/fauxton/TODO.md -^src/fauxton/CONTRIBUTING.md -^src/fauxton/settings.json.* -^src/fauxton/test/test.config.underscore -^src/fauxton/test/mocha/chai.js -^src/fauxton/test/mocha/mocha.css -^src/fauxton/test/mocha/mocha.js -^src/fauxton/test/mocha/sinon.js -^src/fauxton/test/mocha/sinon-chai.js -^src/fauxton/tasks/addon/rename.json -^src/fauxton/assets/lib/ace/.* -^src/fauxton/app/addons/pouchdb/pouch.collate.js -^src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js -^src/couch_replicator/ebin/couch_replicator.app -^src/ddoc_cache/ebin/ddoc_cache.app -^src/ddoc_cache/README.md -^src/ets_lru/ebin/.*.beam -^src/ets_lru/ebin/ets_lru.app -^src/ejson/.* -^src/fabric/ebin/.*.beam -^src/fabric/ebin/fabric.app -^src/ibrowse/.* -^src/jiffy/.* -^src/mem3/ebin/mem3.app -^src/mochiweb/.* -^src/rexi/ebin/.*.beam -^src/rexi/ebin/rexi.app -^src/snappy/.* -^src/twig/ebin/.*.beam -^src/twig/ebin/twig.app -^src/twig/README.md -^src/twig/src/trunc_io.erl -^stamp-h1 -^test/Makefile -^test/Makefile.in -^test/javascript/Makefile -^test/javascript/Makefile.in -^test/local.ini -^test/view_server/Makefile -^test/view_server/Makefile.in -^tmp/.* -^utils/Makefile -^utils/Makefile.in -^var/Makefile -^var/Makefile.in -^Vagrantfile -^share/www/fauxton/Makefile -^share/www/fauxton/Makefile.in -^share/www/Makefile -^share/www/Makefile.in -- cgit v1.2.1