Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 27FFD200B56 for ; Sat, 16 Jul 2016 00:47:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 26850160A79; Fri, 15 Jul 2016 22:47:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6CD31160A61 for ; Sat, 16 Jul 2016 00:47:16 +0200 (CEST) Received: (qmail 30202 invoked by uid 500); 15 Jul 2016 22:47:15 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 30193 invoked by uid 99); 15 Jul 2016 22:47:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 22:47:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68150E0A3F; Fri, 15 Jul 2016 22:47:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wohali@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 660c32f Date: Fri, 15 Jul 2016 22:47:15 +0000 (UTC) archived-at: Fri, 15 Jul 2016 22:47:17 -0000 Repository: couchdb Updated Branches: refs/heads/master 33c8ca61b -> 660c32f12 Remove unbuilt doc targets from Win build Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/660c32f1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/660c32f1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/660c32f1 Branch: refs/heads/master Commit: 660c32f122a47b2a4b09ee0480a558d110d52073 Parents: 33c8ca6 Author: Joan Touzet Authored: Fri Jul 15 18:47:08 2016 -0400 Committer: Joan Touzet Committed: Fri Jul 15 18:47:08 2016 -0400 ---------------------------------------------------------------------- Makefile.win | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/660c32f1/Makefile.win ---------------------------------------------------------------------- diff --git a/Makefile.win b/Makefile.win index bf41d57..6794bf9 100644 --- a/Makefile.win +++ b/Makefile.win @@ -76,8 +76,8 @@ fauxton: share\www .PHONY: check # target: check - Test everything check: all - @$(MAKE) eunit - @$(MAKE) javascript + @$(MAKE) -f Makefile.win eunit + @$(MAKE) -f Makefile.win javascript .PHONY: eunit @@ -200,13 +200,13 @@ ifeq ($(IN_RELEASE), true) -@mkdir rel\couchdb\share\www\docs -@mkdir rel\couchdb\share\docs @robocopy /E share\docs\html\* rel\couchdb\share\www\docs - @copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf +# @copy share\docs\pdf\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf @copy share\docs\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1 @copy share\docs\info\CouchDB.info rel\couchdb\share\docs\CouchDB.info else -@mkdir rel\couchdb\share\docs - @robocopy /E src\docs\build\html\ rel\couchdb\share\www\docs - @copy src\docs\build\latex\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf + @robocopy /E src\docs\build\html\* rel\couchdb\share\www\docs +# @copy src\docs\build\latex\CouchDB.pdf rel\couchdb\share\docs\CouchDB.pdf @copy src\docs\build\man\apachecouchdb.1 rel\couchdb\share\docs\couchdb.1 @copy src\docs\build\texinfo\CouchDB.info rel\couchdb\share\docs\CouchDB.info endif