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 3E060200B99 for ; Tue, 20 Sep 2016 19:04:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3CC89160AC5; Tue, 20 Sep 2016 17:04:06 +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 8234C160AC9 for ; Tue, 20 Sep 2016 19:04:05 +0200 (CEST) Received: (qmail 55392 invoked by uid 500); 20 Sep 2016 17:04:04 -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 55316 invoked by uid 99); 20 Sep 2016 17:04:04 -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; Tue, 20 Sep 2016 17:04:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75834E05D9; Tue, 20 Sep 2016 17:04:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 20 Sep 2016 17:04:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] couch commit: updated refs/heads/master to 2ad85bc archived-at: Tue, 20 Sep 2016 17:04:06 -0000 Remove rebar.config Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/30cc961a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/30cc961a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/30cc961a Branch: refs/heads/master Commit: 30cc961a34ecf30d4a721e07d4b0662ee5337db0 Parents: 0883e3f Author: ILYA Khlopotov Authored: Fri Sep 16 13:11:56 2016 -0700 Committer: ILYA Khlopotov Committed: Fri Sep 16 13:42:47 2016 -0700 ---------------------------------------------------------------------- rebar.config | 2 -- rebar.config.script | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/30cc961a/rebar.config ---------------------------------------------------------------------- diff --git a/rebar.config b/rebar.config deleted file mode 100644 index 43e2924..0000000 --- a/rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{erl_opts, [{platform_define, "win32", 'WINDOWS'}]}. -{eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}. http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/30cc961a/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index 8e4ea13..254dcc9 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -132,7 +132,13 @@ PortSpecs = case os:type() of BaseSpecs end, -AddConfig = [{port_specs, PortSpecs}]. +AddConfig = [ + {port_specs, PortSpecs}, + {erl_opts, [ + {platform_define, "win32", 'WINDOWS'} + ]}, + {eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]} +]. lists:foldl(fun({K, V}, CfgAcc) -> lists:keystore(K, 1, CfgAcc, {K, V})