You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/12/01 23:25:38 UTC
git commit: Cleaning up @@ markers
Updated Branches:
refs/heads/docs 9c279a412 -> 07181d22d
Cleaning up @@ markers
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/07181d22
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/07181d22
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/07181d22
Branch: refs/heads/docs
Commit: 07181d22d401cd19d128904e22f60621a96b8a6d
Parents: 9c279a4
Author: Noah Slater <ns...@apache.org>
Authored: Sat Dec 1 22:25:33 2012 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sat Dec 1 22:25:33 2012 +0000
----------------------------------------------------------------------
DEVELOPERS | 2 +-
Makefile.am | 8 +-------
bootstrap | 2 --
configure.ac | 2 --
4 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/07181d22/DEVELOPERS
----------------------------------------------------------------------
diff --git a/DEVELOPERS b/DEVELOPERS
index 21d8e94..a56deff 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -97,7 +97,7 @@ Follow the instructions to get a working LaTeX install on your system.
Windows
~~~~~~~
-@@ This section is a work in progress.
+This section is a work in progress.
Bootstrapping
-------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/07181d22/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index c693c4d..3a667ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,11 +80,7 @@ NOTICE.gz: NOTICE
README.gz: README
gzip -9 < $< > $@
-# @@ This is a bodge and needs to be fixed. Additionally, attempting to build a
-# @@ distribution from a distribution will fail because there is no Git dir.
-# @@ This also means that THANKS.gz is not rebuilt properly. For now, until this
-# @@ is fixed, all distributions should be prepared from a pristine source. The
-# @@ proper way to do this is to build this file during the bootstrap.
+# Huge bodge that will be fixed with COUCHDB-1618
THANKS.gz: $(top_srcdir)/THANKS
@sed -e '/^#.*/d' $< > $(top_builddir)/THANKS.tmp
@git shortlog -se 6c976bd..HEAD \
@@ -176,8 +172,6 @@ distcheck-hook:
.PHONY: distsign
distsign: distcheck check
- @# @@ unpack archive and run diff -r to double check missing files
- @# @@ does automake have anything that does this?
gpg --armor --detach-sig $(GPG_ARGS) \
< $(top_srcdir)/$(distdir).tar.gz \
> $(top_srcdir)/$(distdir).tar.gz.asc
http://git-wip-us.apache.org/repos/asf/couchdb/blob/07181d22/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 8da3dd2..854a237 100755
--- a/bootstrap
+++ b/bootstrap
@@ -65,8 +65,6 @@ find_program() {
exit 1
}
-# @@ add dep on pkg-config and autoconf-archive
-
LIBTOOLIZE=`find_program glibtoolize libtoolize`
ACLOCAL=`find_program aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
AUTOHEADER=`find_program autoheader`
http://git-wip-us.apache.org/repos/asf/couchdb/blob/07181d22/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 44e45ed..f92a020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,6 @@ dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
dnl License for the specific language governing permissions and limitations
dnl under the License.
-dnl @@ ./configure --help output is badly formatted
-
AC_INIT(
[LOCAL_PACKAGE_NAME],
[LOCAL_VERSION],